--- kdelibs-3.5.7.orig/acinclude.m4
+++ kdelibs-3.5.7/acinclude.m4
@@ -1689,15 +1689,6 @@
        KDE_USE_CLOSURE_TRUE="#"
        KDE_USE_CLOSURE_FALSE=""
        KDE_NO_UNDEFINED=""
-       case $host in 
-         *-*-linux-gnu)
-           KDE_CHECK_COMPILER_FLAG([Wl,--no-undefined],
-                [KDE_CHECK_COMPILER_FLAG([Wl,--allow-shlib-undefined],
-		[KDE_NO_UNDEFINED="-Wl,--no-undefined -Wl,--allow-shlib-undefined"],
-		[KDE_NO_UNDEFINED=""])],
-	    [KDE_NO_UNDEFINED=""])
-           ;;
-       esac
   fi
   AC_SUBST(KDE_USE_CLOSURE_TRUE)
   AC_SUBST(KDE_USE_CLOSURE_FALSE)
@@ -2144,9 +2135,6 @@
 save_CXXFLAGS="$CXXFLAGS"
 kde_safe_LIBS="$LIBS"
 LIBS="$LIBS $X_EXTRA_LIBS"
-if test "$GXX" = "yes"; then
-CXXFLAGS="$CXXFLAGS -pedantic-errors"
-fi
 AC_TRY_COMPILE([
 $2
 ],
@@ -5971,30 +5959,15 @@
   fi
 ])
 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-## Copyright 1996, 1997, 1998, 1999, 2000, 2001
+## Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005
 ## Free Software Foundation, Inc.
 ## Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
 ##
-## This program is free software; you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2 of the License, or
-## (at your option) any later version.
-##
-## This program is distributed in the hope that it will be useful, but
-## WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-## General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-##
-## As a special exception to the GNU General Public License, if you
-## distribute this file as part of a program that contains a
-## configuration script generated by Autoconf, you may include it under
-## the same distribution terms that you use for the rest of that program.
+## This file is free software; the Free Software Foundation gives
+## unlimited permission to copy and/or distribute it, with or without
+## modifications, as long as this notice is preserved.
 
-# serial 47 AC_PROG_LIBTOOL
+# serial 48 Debian 1.5.22-4 AC_PROG_LIBTOOL
 
 
 # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
@@ -6054,7 +6027,7 @@
 LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
 
 # Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool --silent'
+LIBTOOL='$(SHELL) $(top_builddir)/libtool'
 AC_SUBST(LIBTOOL)dnl
 
 # Prevent multiple expansion
@@ -6104,7 +6077,7 @@
 
 # Sed substitution that helps us do robust quoting.  It backslashifies
 # metacharacters that are still active within double-quoted strings.
-Xsed='sed -e s/^X//'
+Xsed='sed -e 1s/^X//'
 [sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
 
 # Same as above, but do not quote variable references.
@@ -6124,7 +6097,7 @@
 default_ofile=libtool
 can_build_shared=yes
 
-# All known linkers require a `.a' archive for static linking (except M$VC,
+# All known linkers require a `.a' archive for static linking (except MSVC,
 # which needs '.lib').
 libext=a
 ltmain="$ac_aux_dir/ltmain.sh"
@@ -6144,6 +6117,7 @@
 test -z "$AS" && AS=as
 test -z "$CC" && CC=cc
 test -z "$LTCC" && LTCC=$CC
+test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
 test -z "$DLLTOOL" && DLLTOOL=dlltool
 test -z "$LD" && LD=ld
 test -z "$LN_S" && LN_S="ln -s"
@@ -6163,15 +6137,17 @@
 if test -n "$RANLIB"; then
   case $host_os in
   openbsd*)
-    old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
     ;;
   *)
-    old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
     ;;
   esac
   old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
 fi
 
+_LT_CC_BASENAME([$compiler])
+
 # Only perform the check for file, if the check method requires it
 case $deplibs_check_method in
 file_magic*)
@@ -6212,11 +6188,56 @@
 # If no C compiler was specified, use CC.
 LTCC=${LTCC-"$CC"}
 
+# If no C compiler flags were specified, use CFLAGS.
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+
 # Allow CC to be a program name with arguments.
 compiler=$CC
 ])# _LT_AC_SYS_COMPILER
 
 
+# _LT_CC_BASENAME(CC)
+# -------------------
+# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
+AC_DEFUN([_LT_CC_BASENAME],
+[for cc_temp in $1""; do
+  case $cc_temp in
+    compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
+    distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
+    \-*) ;;
+    *) break;;
+  esac
+done
+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+])
+
+
+# _LT_COMPILER_BOILERPLATE
+# ------------------------
+# Check for compiler boilerplate output or warnings with
+# the simple compiler test code.
+AC_DEFUN([_LT_COMPILER_BOILERPLATE],
+[ac_outfile=conftest.$ac_objext
+printf "$lt_simple_compile_test_code" >conftest.$ac_ext
+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_compiler_boilerplate=`cat conftest.err`
+$rm conftest*
+])# _LT_COMPILER_BOILERPLATE
+
+
+# _LT_LINKER_BOILERPLATE
+# ----------------------
+# Check for linker boilerplate output or warnings with
+# the simple link test code.
+AC_DEFUN([_LT_LINKER_BOILERPLATE],
+[ac_outfile=conftest.$ac_objext
+printf "$lt_simple_link_test_code" >conftest.$ac_ext
+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_linker_boilerplate=`cat conftest.err`
+$rm conftest*
+])# _LT_LINKER_BOILERPLATE
+
+
 # _LT_AC_SYS_LIBPATH_AIX
 # ----------------------
 # Links a minimal program and checks the executable
@@ -6289,15 +6310,15 @@
 
 # The HP-UX ksh and POSIX shell print the target directory to stdout
 # if CDPATH is set.
-if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
 if test -z "$ECHO"; then
 if test "X${echo_test_string+set}" != Xset; then
 # find a string as large as possible, as long as the shell can cope with it
   for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
     # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
-    if (echo_test_string="`eval $cmd`") 2>/dev/null &&
-       echo_test_string="`eval $cmd`" &&
+    if (echo_test_string=`eval $cmd`) 2>/dev/null &&
+       echo_test_string=`eval $cmd` &&
        (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
     then
       break
@@ -6466,14 +6487,13 @@
   # Find out which ABI we are using.
   echo 'int i;' > conftest.$ac_ext
   if AC_TRY_EVAL(ac_compile); then
-    case "`/usr/bin/file conftest.o`" in
+    case `/usr/bin/file conftest.o` in
     *32-bit*)
-      LINUX_64_MODE="32"
       case $host in
         x86_64-*linux*)
           LD="${LD-ld} -m elf_i386"
           ;;
-        ppc64-*linux*)
+        ppc64-*linux*|powerpc64-*linux*)
           LD="${LD-ld} -m elf32ppclinux"
           ;;
         s390x-*linux*)
@@ -6485,7 +6505,6 @@
       esac
       ;;
     *64-bit*)
-      LINUX_64_MODE="64"
       case $host in
         x86_64-*linux*)
           LD="${LD-ld} -m elf_x86_64"
@@ -6519,6 +6538,22 @@
     CFLAGS="$SAVE_CFLAGS"
   fi
   ;;
+sparc*-*solaris*)
+  # Find out which ABI we are using.
+  echo 'int i;' > conftest.$ac_ext
+  if AC_TRY_EVAL(ac_compile); then
+    case `/usr/bin/file conftest.o` in
+    *64-bit*)
+      case $lt_cv_prog_gnu_ld in
+      yes*) LD="${LD-ld} -m elf64_sparc" ;;
+      *)    LD="${LD-ld} -64" ;;
+      esac
+      ;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+
 AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
 [*-*-cygwin* | *-*-mingw* | *-*-pw32*)
   AC_CHECK_TOOL(DLLTOOL, dlltool, false)
@@ -6550,7 +6585,7 @@
    # with a dollar sign (not a hyphen), so the echo should work correctly.
    # The option is referenced via a variable to avoid confusing sed.
    lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
    (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
@@ -6560,8 +6595,10 @@
    echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     if test ! -s conftest.err; then
+     # So say no if there are warnings other than the usual output.
+     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
        $2=yes
      fi
    fi
@@ -6587,11 +6624,16 @@
    LDFLAGS="$LDFLAGS $3"
    printf "$lt_simple_link_test_code" > conftest.$ac_ext
    if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
-     # The compiler can only warn and ignore the option if not recognized
+     # The linker can only warn and ignore the option if not recognized
      # So say no if there are warnings
      if test -s conftest.err; then
        # Append any errors to the config.log.
        cat conftest.err 1>&AS_MESSAGE_LOG_FD
+       $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
+       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+       if diff conftest.exp conftest.er2 >/dev/null; then
+         $2=yes
+       fi
      else
        $2=yes
      fi
@@ -6615,7 +6657,7 @@
 AC_MSG_CHECKING([the maximum length of command line arguments])
 AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
   i=0
-  testring="ABCD"
+  teststring="ABCD"
 
   case $build_os in
   msdosdjgpp*)
@@ -6644,20 +6686,70 @@
     lt_cv_sys_max_cmd_len=8192;
     ;;
 
- *)
+  amigaos*)
+    # On AmigaOS with pdksh, this test takes hours, literally.
+    # So we just punt and use a minimum line length of 8192.
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
+  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
+    # This has been around since 386BSD, at least.  Likely further.
+    if test -x /sbin/sysctl; then
+      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
+    elif test -x /usr/sbin/sysctl; then
+      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
+    else
+      lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
+    fi
+    # And add a safety zone
+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+    ;;
+
+  interix*)
+    # We know the value 262144 and hardcode it with a safety zone (like BSD)
+    lt_cv_sys_max_cmd_len=196608
+    ;;
+
+  osf*)
+    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
+    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
+    # nice to cause kernel panics so lets avoid the loop below.
+    # First set a reasonable default.
+    lt_cv_sys_max_cmd_len=16384
+    #
+    if test -x /sbin/sysconfig; then
+      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
+        *1*) lt_cv_sys_max_cmd_len=-1 ;;
+      esac
+    fi
+    ;;
+  sco3.2v5*)
+    lt_cv_sys_max_cmd_len=102400
+    ;;
+  sysv5* | sco5v6* | sysv4.2uw2*)
+    kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
+    if test -n "$kargmax"; then
+      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ 	]]//'`
+    else
+      lt_cv_sys_max_cmd_len=32768
+    fi
+    ;;
+  *)
     # If test is not a shell built-in, we'll probably end up computing a
     # maximum length that is only half of the actual maximum length, but
     # we can't tell.
-    while (test "X"`$CONFIG_SHELL [$]0 --fallback-echo "X$testring" 2>/dev/null` \
-	       = "XX$testring") >/dev/null 2>&1 &&
-	    new_result=`expr "X$testring" : ".*" 2>&1` &&
+    SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
+    while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \
+	       = "XX$teststring") >/dev/null 2>&1 &&
+	    new_result=`expr "X$teststring" : ".*" 2>&1` &&
 	    lt_cv_sys_max_cmd_len=$new_result &&
 	    test $i != 17 # 1/2 MB should be enough
     do
       i=`expr $i + 1`
-      testring=$testring$testring
+      teststring=$teststring$teststring
     done
-    testring=
+    teststring=
     # Add a significant safety factor because C++ compilers can tack on massive
     # amounts of additional arguments before passing them to the linker.
     # It appears as though 1/2 is a usable value.
@@ -6674,7 +6766,7 @@
 
 
 # _LT_AC_CHECK_DLFCN
-# --------------------
+# ------------------
 AC_DEFUN([_LT_AC_CHECK_DLFCN],
 [AC_CHECK_HEADERS(dlfcn.h)dnl
 ])# _LT_AC_CHECK_DLFCN
@@ -6682,7 +6774,7 @@
 
 # _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
 #                           ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
-# ------------------------------------------------------------------
+# ---------------------------------------------------------------------
 AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF],
 [AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
 if test "$cross_compiling" = yes; then :
@@ -6748,17 +6840,19 @@
       else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
       /* dlclose (self); */
     }
+  else
+    puts (dlerror ());
 
     exit (status);
 }]
 EOF
   if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
-    (./conftest; exit; ) 2>/dev/null
+    (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null
     lt_status=$?
     case x$lt_status in
       x$lt_dlno_uscore) $1 ;;
       x$lt_dlneed_uscore) $2 ;;
-      x$lt_unknown|x*) $3 ;;
+      x$lt_dlunknown|x*) $3 ;;
     esac
   else :
     # compilation failed
@@ -6770,7 +6864,7 @@
 
 
 # AC_LIBTOOL_DLOPEN_SELF
-# -------------------
+# ----------------------
 AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF],
 [AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
 if test "x$enable_dlopen" != xyes; then
@@ -6807,7 +6901,7 @@
     lt_cv_dlopen_self=yes
     ])
    ;;
-    
+
   *)
     AC_CHECK_FUNC([shl_load],
 	  [lt_cv_dlopen="shl_load"],
@@ -6841,7 +6935,7 @@
     test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
 
     save_LDFLAGS="$LDFLAGS"
-    eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
+    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
 
     save_LIBS="$LIBS"
     LIBS="$lt_cv_dlopen_libs $LIBS"
@@ -6854,7 +6948,7 @@
     ])
 
     if test "x$lt_cv_dlopen_self" = xyes; then
-      LDFLAGS="$LDFLAGS $link_static_flag"
+      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
       AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
     	  lt_cv_dlopen_self_static, [dnl
 	  _LT_AC_TRY_DLOPEN_SELF(
@@ -6896,20 +6990,13 @@
    mkdir out
    printf "$lt_simple_compile_test_code" > conftest.$ac_ext
 
-   # According to Tom Tromey, Ian Lance Taylor reported there are C compilers
-   # that will create temporary files in the current directory regardless of
-   # the output directory.  Thus, making CWD read-only will cause this test
-   # to fail, enabling locking or at least warning the user not to do parallel
-   # builds.
-   chmod -w .
-
    lt_compiler_flag="-o out/conftest2.$ac_objext"
    # Insert the option either (1) after the last *FLAGS variable, or
    # (2) before a word containing "conftest.", or (3) at the end.
    # Note that $ac_compile itself does not contain backslashes and begins
    # with a dollar sign (not a hyphen), so the echo should work correctly.
    lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
    (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
@@ -6921,13 +7008,18 @@
    then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
-     if test ! -s out/conftest.err; then
+     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
+     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
        _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
      fi
    fi
-   chmod u+w .
-   $rm conftest* out/*
-   rmdir out
+   chmod u+w . 2>&AS_MESSAGE_LOG_FD
+   $rm conftest*
+   # SGI C++ compiler will create directory out/ii_files/ for
+   # template instantiation
+   test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
+   $rm out/* && rmdir out
    cd ..
    rmdir conftest
    $rm conftest*
@@ -6986,8 +7078,8 @@
 [AC_MSG_CHECKING([how to hardcode library paths into programs])
 _LT_AC_TAGVAR(hardcode_action, $1)=
 if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \
-   test -n "$_LT_AC_TAGVAR(runpath_var $1)" || \
-   test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)"="Xyes" ; then
+   test -n "$_LT_AC_TAGVAR(runpath_var, $1)" || \
+   test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
 
   # We can hardcode non-existant directories.
   if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no &&
@@ -7044,7 +7136,7 @@
    *)
   AC_MSG_RESULT([no])
     ;;
-  esac  
+  esac
 fi
 ])# AC_LIBTOOL_SYS_LIB_STRIP
 
@@ -7057,7 +7149,7 @@
 library_names_spec=
 libname_spec='lib$name'
 soname_spec=
-shrext=".so"
+shrext_cmds=".so"
 postinstall_cmds=
 postuninstall_cmds=
 finish_cmds=
@@ -7067,7 +7159,20 @@
 version_type=none
 dynamic_linker="$host_os ld.so"
 sys_lib_dlsearch_path_spec="/lib /usr/lib"
-sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+if test "$GCC" = yes; then
+  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
+    # if the path contains ";" then we assume it to be the separator
+    # otherwise default to the standard path separator (i.e. ":") - it is
+    # assumed that no part of a normal pathname contains ";" but that should
+    # okay in the real world where ";" in dirpaths is itself problematic.
+    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+  else
+    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
+  fi
+else
+  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+fi
 need_lib_prefix=unknown
 hardcode_into_libs=no
 
@@ -7132,7 +7237,7 @@
 amigaos*)
   library_names_spec='$libname.ixlibrary $libname.a'
   # Create ${libname}_ixlibrary.a entries in /sys/libs.
-  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done'
+  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
   ;;
 
 beos*)
@@ -7141,7 +7246,7 @@
   shlibpath_var=LIBRARY_PATH
   ;;
 
-bsdi4*)
+bsdi[[45]]*)
   version_type=linux
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -7157,7 +7262,7 @@
 
 cygwin* | mingw* | pw32*)
   version_type=windows
-  shrext=".dll"
+  shrext_cmds=".dll"
   need_version=no
   need_lib_prefix=no
 
@@ -7169,7 +7274,8 @@
       dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
       dldir=$destdir/`dirname \$dlpath`~
       test -d \$dldir || mkdir -p \$dldir~
-      $install_prog $dir/$dlname \$dldir/$dlname'
+      $install_prog $dir/$dlname \$dldir/$dlname~
+      chmod a+x \$dldir/$dlname'
     postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
       dlpath=$dir/\$dldll~
        $rm \$dlpath'
@@ -7199,7 +7305,7 @@
       ;;
     pw32*)
       # pw32 DLLs use 'pw' prefix rather than 'lib'
-      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
       ;;
     esac
     ;;
@@ -7222,7 +7328,7 @@
   soname_spec='${libname}${release}${major}$shared_ext'
   shlibpath_overrides_runpath=yes
   shlibpath_var=DYLD_LIBRARY_PATH
-  shrext='$(test .$module = .yes && echo .so || echo .dylib)'
+  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
   # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
   if test "$GCC" = yes; then
     sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
@@ -7245,20 +7351,17 @@
   dynamic_linker=no
   ;;
 
-kfreebsd*-gnu*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='GNU ld.so'
-  ;;
-
-freebsd*)
-  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
+freebsd* | dragonfly*)
+  # DragonFly does not have aout.  When/if they implement a new
+  # versioning mechanism, adjust this.
+  if test -x /usr/bin/objformat; then
+    objformat=`/usr/bin/objformat`
+  else
+    case $host_os in
+    freebsd[[123]]*) objformat=aout ;;
+    *) objformat=elf ;;
+    esac
+  fi
   version_type=freebsd-$objformat
   case $version_type in
     freebsd-elf*)
@@ -7276,14 +7379,19 @@
   freebsd2*)
     shlibpath_overrides_runpath=yes
     ;;
-  freebsd3.[01]* | freebsdelf3.[01]*)
+  freebsd3.[[01]]* | freebsdelf3.[[01]]*)
     shlibpath_overrides_runpath=yes
     hardcode_into_libs=yes
     ;;
-  *) # from 3.2 on
+  freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \
+  freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1)
     shlibpath_overrides_runpath=no
     hardcode_into_libs=yes
     ;;
+  freebsd*) # from 4.6 on
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
   esac
   ;;
 
@@ -7303,9 +7411,9 @@
   version_type=sunos
   need_lib_prefix=no
   need_version=no
-  case "$host_cpu" in
+  case $host_cpu in
   ia64*)
-    shrext='.so'
+    shrext_cmds='.so'
     hardcode_into_libs=yes
     dynamic_linker="$host_os dld.so"
     shlibpath_var=LD_LIBRARY_PATH
@@ -7320,7 +7428,7 @@
     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
     ;;
    hppa*64*)
-     shrext='.sl'
+     shrext_cmds='.sl'
      hardcode_into_libs=yes
      dynamic_linker="$host_os dld.sl"
      shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
@@ -7331,7 +7439,7 @@
      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
      ;;
    *)
-    shrext='.sl'
+    shrext_cmds='.sl'
     dynamic_linker="$host_os dld.sl"
     shlibpath_var=SHLIB_PATH
     shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
@@ -7343,6 +7451,18 @@
   postinstall_cmds='chmod 555 $lib'
   ;;
 
+interix3*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
 irix5* | irix6* | nonstopux*)
   case $host_os in
     nonstopux*) version_type=nonstopux ;;
@@ -7386,29 +7506,26 @@
   ;;
 
 # This must be Linux ELF.
-linux*)
+linux* | k*bsd*-gnu)
   version_type=linux
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
   finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-  libsuff=
-  if test "x$LINUX_64_MODE" = x64; then
-    # Some platforms are per default 64-bit, so there's no /lib64
-    if test -d /lib64 -a ! -h /lib64; then
-      libsuff=64
-    fi
-  fi
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=no
-  sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}"
-  sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
   # This implies no fast_install, which is unacceptable.
   # Some rework will be needed to allow for fast_install
   # before this can be enabled.
   hardcode_into_libs=yes
 
+  # Append ld.so.conf contents to the search path
+  if test -f /etc/ld.so.conf; then
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+  fi
+
   # We used to test for /lib/ld.so.1 and disable shared libraries on
   # powerpc, because MkLinux only supported shared libraries with the
   # GNU dynamic linker.  Since this was broken with cross compilers,
@@ -7418,6 +7535,18 @@
   dynamic_linker='GNU/Linux ld.so'
   ;;
 
+netbsdelf*-gnu)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='NetBSD ld.elf_so'
+  ;;
+
 netbsd*)
   version_type=sunos
   need_lib_prefix=no
@@ -7427,7 +7556,7 @@
     finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
     dynamic_linker='NetBSD (a.out) ld.so'
   else
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} ${libname}${shared_ext}'
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
     soname_spec='${libname}${release}${shared_ext}$major'
     dynamic_linker='NetBSD ld.elf_so'
   fi
@@ -7455,8 +7584,13 @@
 
 openbsd*)
   version_type=sunos
+  sys_lib_dlsearch_path_spec="/usr/lib"
   need_lib_prefix=no
-  need_version=no
+  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
+  case $host_os in
+    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
+    *)                         need_version=no  ;;
+  esac
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
   finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
   shlibpath_var=LD_LIBRARY_PATH
@@ -7476,7 +7610,7 @@
 
 os2*)
   libname_spec='$name'
-  shrext=".dll"
+  shrext_cmds=".dll"
   need_lib_prefix=no
   library_names_spec='$libname${shared_ext} $libname.a'
   dynamic_linker='OS/2 ld.exe'
@@ -7494,13 +7628,6 @@
   sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
   ;;
 
-sco3.2v5*)
-  version_type=osf
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
 solaris*)
   version_type=linux
   need_lib_prefix=no
@@ -7526,7 +7653,7 @@
   need_version=yes
   ;;
 
-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+sysv4 | sysv4.3*)
   version_type=linux
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
@@ -7559,6 +7686,29 @@
   fi
   ;;
 
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+  version_type=freebsd-elf
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  hardcode_into_libs=yes
+  if test "$with_gnu_ld" = yes; then
+    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
+    shlibpath_overrides_runpath=no
+  else
+    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
+    shlibpath_overrides_runpath=yes
+    case $host_os in
+      sco3.2v5*)
+        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
+	;;
+    esac
+  fi
+  sys_lib_dlsearch_path_spec='/usr/lib'
+  ;;
+
 uts4*)
   version_type=linux
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -7572,6 +7722,11 @@
 esac
 AC_MSG_RESULT([$dynamic_linker])
 test "$dynamic_linker" = no && can_build_shared=no
+
+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+if test "$GCC" = yes; then
+  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+fi
 ])# AC_LIBTOOL_SYS_DYNAMIC_LINKER
 
 
@@ -7596,6 +7751,9 @@
       AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile'])
     fi
   fi
+  if test -z "$LTCFLAGS"; then
+    eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`"
+  fi
 
   # Extract list of available tagged configurations in $ofile.
   # Note that this assumes the entire list is on one line.
@@ -7622,7 +7780,9 @@
 
       case $tagname in
       CXX)
-	if test -n "$CXX" && test "X$CXX" != "Xno"; then
+	if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
+	    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
+	    (test "X$CXX" != "Xg++"))) ; then
 	  AC_LIBTOOL_LANG_CXX_CONFIG
 	else
 	  tagname=""
@@ -7684,7 +7844,7 @@
 
 # AC_LIBTOOL_WIN32_DLL
 # --------------------
-# declare package support for building win32 dll's
+# declare package support for building win32 DLLs
 AC_DEFUN([AC_LIBTOOL_WIN32_DLL],
 [AC_BEFORE([$0], [AC_LIBTOOL_SETUP])
 ])# AC_LIBTOOL_WIN32_DLL
@@ -7722,7 +7882,7 @@
 
 # AC_DISABLE_SHARED
 # -----------------
-#- set the default shared flag to --disable-shared
+# set the default shared flag to --disable-shared
 AC_DEFUN([AC_DISABLE_SHARED],
 [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
 AC_ENABLE_SHARED(no)
@@ -7858,7 +8018,7 @@
       if test -n "$file_magic_test_file"; then
 	case $deplibs_check_method in
 	"file_magic "*)
-	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
+	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
 	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
 	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
 	    $EGREP "$file_magic_regex" > /dev/null; then
@@ -7968,7 +8128,7 @@
     if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
       lt_cv_path_LD="$ac_dir/$ac_prog"
       # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some GNU ld's only accept -v.
+      # but apparently some variants of GNU ld only accept -v.
       # Break only if it was the GNU/non-GNU ld that we prefer.
       case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
       *GNU* | *'with BFD'*)
@@ -8000,7 +8160,7 @@
 AC_DEFUN([AC_PROG_LD_GNU],
 [AC_REQUIRE([AC_PROG_EGREP])dnl
 AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
-[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
+[# I'd rather use --version here, but apparently some GNU lds only accept -v.
 case `$LD -v 2>&1 </dev/null` in
 *GNU* | *'with BFD'*)
   lt_cv_prog_gnu_ld=yes
@@ -8027,6 +8187,15 @@
 *) reload_flag=" $reload_flag" ;;
 esac
 reload_cmds='$LD$reload_flag -o $output$reload_objs'
+case $host_os in
+  darwin*)
+    if test "$GCC" = yes; then
+      reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
+    else
+      reload_cmds='$LD$reload_flag -o $output$reload_objs'
+    fi
+    ;;
+esac
 ])# AC_PROG_LD_RELOAD_FLAG
 
 
@@ -8060,44 +8229,36 @@
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-bsdi4*)
+bsdi[[45]]*)
   lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
   lt_cv_file_magic_cmd='/usr/bin/file -L'
   lt_cv_file_magic_test_file=/shlib/libc.so
   ;;
 
 cygwin*)
-  lt_cv_deplibs_check_method=pass_all
+  # func_win32_libid is a shell function defined in ltmain.sh
+  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+  lt_cv_file_magic_cmd='func_win32_libid'
   ;;
-  
+
 mingw* | pw32*)
-  # win32_libid is a shell function defined in ltmain.sh
-  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-  lt_cv_file_magic_cmd='win32_libid'
+  # Base MSYS/MinGW do not provide the 'file' command needed by
+  # func_win32_libid shell function, so use a weaker test based on 'objdump'.
+  lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
+  lt_cv_file_magic_cmd='$OBJDUMP -f'
   ;;
 
 darwin* | rhapsody*)
-  # this will be overwritten by pass_all, but leave it in just in case
-  lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library'
-  lt_cv_file_magic_cmd='/usr/bin/file -L'
-  case "$host_os" in
-  rhapsody* | darwin1.[[012]])
-    lt_cv_file_magic_test_file=`/System/Library/Frameworks/System.framework/System`
-    ;;
-  *) # Darwin 1.3 on
-    lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib'
-    ;;
-  esac
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-freebsd* | kfreebsd*-gnu)
+freebsd* | dragonfly*)
   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
     case $host_cpu in
     i*86 )
       # Not sure whether the presence of OpenBSD here was a mistake.
       # Let's accept both of them until this is cleared up.
-      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[[3-9]]86 (compact )?demand paged shared library'
+      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library'
       lt_cv_file_magic_cmd=/usr/bin/file
       lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
       ;;
@@ -8113,7 +8274,7 @@
 
 hpux10.20* | hpux11*)
   lt_cv_file_magic_cmd=/usr/bin/file
-  case "$host_cpu" in
+  case $host_cpu in
   ia64*)
     lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
     lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
@@ -8129,43 +8290,27 @@
   esac
   ;;
 
+interix3*)
+  # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
+  lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
+  ;;
+
 irix5* | irix6* | nonstopux*)
-  case $host_os in
-  irix5* | nonstopux*)
-    # this will be overridden with pass_all, but let us keep it just in case
-    lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1"
-    ;;
-  *)
-    case $LD in
-    *-32|*"-32 ") libmagic=32-bit;;
-    *-n32|*"-n32 ") libmagic=N32;;
-    *-64|*"-64 ") libmagic=64-bit;;
-    *) libmagic=never-match;;
-    esac
-    # this will be overridden with pass_all, but let us keep it just in case
-    lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[[1234]] dynamic lib MIPS - version 1"
-    ;;
+  case $LD in
+  *-32|*"-32 ") libmagic=32-bit;;
+  *-n32|*"-n32 ") libmagic=N32;;
+  *-64|*"-64 ") libmagic=64-bit;;
+  *) libmagic=never-match;;
   esac
-  lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*`
   lt_cv_deplibs_check_method=pass_all
   ;;
 
 # This must be Linux ELF.
-linux*)
-  case $host_cpu in
-  alpha* | hppa* | i*86 | ia64* | m68* | mips* | powerpc* | sparc* | s390* | sh* | x86_64* )
-    lt_cv_deplibs_check_method=pass_all ;;
-  # the debian people say, arm and glibc 2.3.1 works for them with pass_all
-  arm* )
-    lt_cv_deplibs_check_method=pass_all ;;
-  *)
-    # glibc up to 2.1.1 does not perform some relocations on ARM
-    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' ;;
-  esac
-  lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
+linux* | k*bsd*-gnu)
+  lt_cv_deplibs_check_method=pass_all
   ;;
 
-netbsd*)
+netbsd* | netbsdelf*-gnu)
   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
     lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
   else
@@ -8184,32 +8329,22 @@
   ;;
 
 openbsd*)
-  lt_cv_file_magic_cmd=/usr/bin/file
-  lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
   if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB shared object'
+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
   else
-    lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library'
+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
   fi
   ;;
 
 osf3* | osf4* | osf5*)
-  # this will be overridden with pass_all, but let us keep it just in case
-  lt_cv_deplibs_check_method='file_magic COFF format alpha shared library'
-  lt_cv_file_magic_test_file=/shlib/libc.so
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sco3.2v5*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
 solaris*)
   lt_cv_deplibs_check_method=pass_all
-  lt_cv_file_magic_test_file=/lib/libc.so
   ;;
 
-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+sysv4 | sysv4.3*)
   case $host_vendor in
   motorola)
     lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
@@ -8230,10 +8365,13 @@
   siemens)
     lt_cv_deplibs_check_method=pass_all
     ;;
+  pc)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
   esac
   ;;
 
-sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7* | sysv4*uw2*)
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 esac
@@ -8253,36 +8391,43 @@
   # Let the user override the test.
   lt_cv_path_NM="$NM"
 else
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-  for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
-    IFS="$lt_save_ifs"
-    test -z "$ac_dir" && ac_dir=.
-    tmp_nm="$ac_dir/${ac_tool_prefix}nm"
-    if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
-      # Check to see if the nm accepts a BSD-compat flag.
-      # Adding the `sed 1q' prevents false positives on HP-UX, which says:
-      #   nm: unknown option "B" ignored
-      # Tru64's nm complains that /dev/null is an invalid object file
-      case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
-      */dev/null* | *'Invalid file or object type'*)
-	lt_cv_path_NM="$tmp_nm -B"
-	break
-        ;;
-      *)
-	case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
-	*/dev/null*)
-	  lt_cv_path_NM="$tmp_nm -p"
+  lt_nm_to_check="${ac_tool_prefix}nm"
+  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then 
+    lt_nm_to_check="$lt_nm_to_check nm"
+  fi
+  for lt_tmp_nm in $lt_nm_to_check; do
+    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
+      IFS="$lt_save_ifs"
+      test -z "$ac_dir" && ac_dir=.
+      tmp_nm="$ac_dir/$lt_tmp_nm"
+      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
+	# Check to see if the nm accepts a BSD-compat flag.
+	# Adding the `sed 1q' prevents false positives on HP-UX, which says:
+	#   nm: unknown option "B" ignored
+	# Tru64's nm complains that /dev/null is an invalid object file
+	case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
+	*/dev/null* | *'Invalid file or object type'*)
+	  lt_cv_path_NM="$tmp_nm -B"
 	  break
 	  ;;
 	*)
-	  lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
-	  continue # so that we can try to find one that supports BSD flags
+	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
+	  */dev/null*)
+	    lt_cv_path_NM="$tmp_nm -p"
+	    break
+	    ;;
+	  *)
+	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
+	    continue # so that we can try to find one that supports BSD flags
+	    ;;
+	  esac
 	  ;;
 	esac
-      esac
-    fi
+      fi
+    done
+    IFS="$lt_save_ifs"
   done
-  IFS="$lt_save_ifs"
   test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
 fi])
 NM="$lt_cv_path_NM"
@@ -8314,13 +8459,13 @@
 # -----------------------------------
 # sets LIBLTDL to the link flags for the libltdl convenience library and
 # LTDLINCL to the include flags for the libltdl header and adds
-# --enable-ltdl-convenience to the configure arguments.  Note that LIBLTDL
-# and LTDLINCL are not AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called.  If
-# DIRECTORY is not provided, it is assumed to be `libltdl'.  LIBLTDL will
-# be prefixed with '${top_builddir}/' and LTDLINCL will be prefixed with
-# '${top_srcdir}/' (note the single quotes!).  If your package is not
-# flat and you're not using automake, define top_builddir and
-# top_srcdir appropriately in the Makefiles.
+# --enable-ltdl-convenience to the configure arguments.  Note that
+# AC_CONFIG_SUBDIRS is not called here.  If DIRECTORY is not provided,
+# it is assumed to be `libltdl'.  LIBLTDL will be prefixed with
+# '${top_builddir}/' and LTDLINCL will be prefixed with '${top_srcdir}/'
+# (note the single quotes!).  If your package is not flat and you're not
+# using automake, define top_builddir and top_srcdir appropriately in
+# the Makefiles.
 AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
 [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
   case $enable_ltdl_convenience in
@@ -8339,13 +8484,13 @@
 # -----------------------------------
 # sets LIBLTDL to the link flags for the libltdl installable library and
 # LTDLINCL to the include flags for the libltdl header and adds
-# --enable-ltdl-install to the configure arguments.  Note that LIBLTDL
-# and LTDLINCL are not AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called.  If
-# DIRECTORY is not provided and an installed libltdl is not found, it is
-# assumed to be `libltdl'.  LIBLTDL will be prefixed with '${top_builddir}/'
-# and LTDLINCL will be prefixed with '${top_srcdir}/' (note the single
-# quotes!).  If your package is not flat and you're not using automake,
-# define top_builddir and top_srcdir appropriately in the Makefiles.
+# --enable-ltdl-install to the configure arguments.  Note that
+# AC_CONFIG_SUBDIRS is not called here.  If DIRECTORY is not provided,
+# and an installed libltdl is not found, it is assumed to be `libltdl'.
+# LIBLTDL will be prefixed with '${top_builddir}/'# and LTDLINCL with
+# '${top_srcdir}/' (note the single quotes!).  If your package is not
+# flat and you're not using automake, define top_builddir and top_srcdir
+# appropriately in the Makefiles.
 # 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
@@ -8383,10 +8528,21 @@
 # ---------------
 AC_DEFUN([_LT_AC_LANG_CXX],
 [AC_REQUIRE([AC_PROG_CXX])
-AC_REQUIRE([AC_PROG_CXXCPP])
+AC_REQUIRE([_LT_AC_PROG_CXXCPP])
 _LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}CXX])
 ])# _LT_AC_LANG_CXX
 
+# _LT_AC_PROG_CXXCPP
+# ------------------
+AC_DEFUN([_LT_AC_PROG_CXXCPP],
+[
+AC_REQUIRE([AC_PROG_CXX])
+if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
+    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
+    (test "X$CXX" != "Xg++"))) ; then
+  AC_PROG_CXXCPP
+fi
+])# _LT_AC_PROG_CXXCPP
 
 # AC_LIBTOOL_F77
 # --------------
@@ -8426,7 +8582,7 @@
 
 
 # AC_LIBTOOL_RC
-# --------------
+# -------------
 # enable support for Windows resource files
 AC_DEFUN([AC_LIBTOOL_RC],
 [AC_REQUIRE([LT_AC_PROG_RC])
@@ -8459,36 +8615,9 @@
 
 _LT_AC_SYS_COMPILER
 
-#
-# Check for any special shared library compilation flags.
-#
-_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)=
-if test "$GCC" = no; then
-  case $host_os in
-  sco3.2v5*)
-    _LT_AC_TAGVAR(lt_prog_cc_shlib, $1)='-belf'
-    ;;
-  esac
-fi
-if test -n "$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)"; then
-  AC_MSG_WARN([`$CC' requires `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to build shared libraries])
-  if echo "$old_CC $old_CFLAGS " | grep "[[ 	]]$]_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)[[[ 	]]" >/dev/null; then :
-  else
-    AC_MSG_WARN([add `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to the CC or CFLAGS env variable and reconfigure])
-    _LT_AC_TAGVAR(lt_cv_prog_cc_can_build_shared, $1)=no
-  fi
-fi
-
-
-#
-# Check to make sure the static flag actually works.
-#
-AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $_LT_AC_TAGVAR(lt_prog_compiler_static, $1) works],
-  _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1),
-  $_LT_AC_TAGVAR(lt_prog_compiler_static, $1),
-  [],
-  [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
-
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
 
 ## CAVEAT EMPTOR:
 ## There is no encapsulation within the following macros, do not change
@@ -8502,9 +8631,9 @@
 AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
 AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
 AC_LIBTOOL_SYS_LIB_STRIP
-AC_LIBTOOL_DLOPEN_SELF($1)
+AC_LIBTOOL_DLOPEN_SELF
 
-# Report which librarie types wil actually be built
+# Report which library types will actually be built
 AC_MSG_CHECKING([if libtool supports shared libraries])
 AC_MSG_RESULT([$can_build_shared])
 
@@ -8513,7 +8642,7 @@
 
 # On AIX, shared libraries and static libraries use the same namespace, and
 # are all built from PIC.
-case "$host_os" in
+case $host_os in
 aix3*)
   test "$enable_shared" = yes && enable_static=no
   if test -n "$RANLIB"; then
@@ -8522,48 +8651,11 @@
   fi
   ;;
 
-aix4*)
+aix4* | aix5*)
   if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
     test "$enable_shared" = yes && enable_static=no
   fi
-  ;;
-  darwin* | rhapsody*)
-  if test "$GCC" = yes; then
-    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-    case "$host_os" in
-    rhapsody* | darwin1.[[012]])
-      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,suppress'
-      ;;
-    *) # Darwin 1.3 on
-      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
-      else
-	case ${MACOSX_DEPLOYMENT_TARGET} in
-	  10.[012])
-	    _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
-	    ;;
-	  10.*)
-	    _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,dynamic_lookup'
-	    ;;
-	esac
-      fi
-      ;;
-    esac
-    output_verbose_link_cmd='echo'
-    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring'
-    _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs'
-    # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
-    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag  -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-    _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-    _LT_AC_TAGVAR(hardcode_direct, $1)=no
-    _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
-    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
-    _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-  else
-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-  fi  
-    ;;  
+    ;;
 esac
 AC_MSG_RESULT([$enable_shared])
 
@@ -8588,7 +8680,7 @@
 AC_DEFUN([_LT_AC_LANG_CXX_CONFIG],
 [AC_LANG_PUSH(C++)
 AC_REQUIRE([AC_PROG_CXX])
-AC_REQUIRE([AC_PROG_CXXCPP])
+AC_REQUIRE([_LT_AC_PROG_CXXCPP])
 
 _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
 _LT_AC_TAGVAR(allow_undefined_flag, $1)=
@@ -8600,6 +8692,7 @@
 _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
 _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
 _LT_AC_TAGVAR(hardcode_minus_L, $1)=no
+_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
 _LT_AC_TAGVAR(hardcode_automatic, $1)=no
 _LT_AC_TAGVAR(module_cmds, $1)=
 _LT_AC_TAGVAR(module_expsym_cmds, $1)=
@@ -8617,7 +8710,7 @@
 _LT_AC_TAGVAR(compiler_lib_search_path, $1)=
 
 # Source file extension for C++ test sources.
-ac_ext=cc
+ac_ext=cpp
 
 # Object file extension for compiled C++ test sources.
 objext=o
@@ -8627,11 +8720,15 @@
 lt_simple_compile_test_code="int some_variable = 0;\n"
 
 # Code to be used in simple link tests
-lt_simple_link_test_code='int main(int, char *[]) { return(0); }\n'
+lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }\n'
 
 # ltmain only uses $CC for tagged configurations so make sure $CC is set.
 _LT_AC_SYS_COMPILER
 
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
 # Allow CC to be a program name with arguments.
 lt_save_CC=$CC
 lt_save_LD=$LD
@@ -8642,18 +8739,18 @@
 if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
   lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
 else
-  unset lt_cv_prog_gnu_ld
+  $as_unset lt_cv_prog_gnu_ld
 fi
 if test -n "${lt_cv_path_LDCXX+set}"; then
   lt_cv_path_LD=$lt_cv_path_LDCXX
 else
-  unset lt_cv_path_LD
+  $as_unset lt_cv_path_LD
 fi
 test -z "${LDCXX+set}" || LD=$LDCXX
 CC=${CXX-"c++"}
 compiler=$CC
 _LT_AC_TAGVAR(compiler, $1)=$CC
-cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
+_LT_CC_BASENAME([$compiler])
 
 # We don't want -fno-exception wen compiling C++ code, so set the
 # no_builtin_flag separately
@@ -8671,8 +8768,8 @@
   # Check if GNU C++ uses GNU ld as the underlying linker, since the
   # archiving commands below assume that GNU ld is being used.
   if test "$with_gnu_ld" = yes; then
-    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib'
-    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
 
     _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
     _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
@@ -8698,7 +8795,7 @@
     # linker, instead of GNU ld.  If possible, this setting should
     # overridden to take advantage of the native linker features on
     # the platform it is being used on.
-    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -o $lib'
+    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
   fi
 
   # Commands to make compiler produce verbose output that lists
@@ -8728,11 +8825,26 @@
       exp_sym_flag='-Bexport'
       no_entry_flag=""
     else
-      # KDE requires run time linking.  Make it the default.
-      aix_use_runtimelinking=yes
-      exp_sym_flag='-bexport'
-      no_entry_flag='-bnoentry'
-    fi
+      aix_use_runtimelinking=no
+
+      # Test if we are trying to use run time linking or normal
+      # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+      # need to do runtime linking.
+      case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
+	for ld_flag in $LDFLAGS; do
+	  case $ld_flag in
+	  *-brtl*)
+	    aix_use_runtimelinking=yes
+	    break
+	    ;;
+	  esac
+	done
+	;;
+      esac
+
+      exp_sym_flag='-bexport'
+      no_entry_flag='-bnoentry'
+    fi
 
     # When large executables or shared objects are built, AIX ld can
     # have problems creating the table of contents.  If linking a library
@@ -8746,7 +8858,7 @@
     _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
 
     if test "$GXX" = yes; then
-      case $host_os in aix4.[012]|aix4.[012].*)
+      case $host_os in aix4.[[012]]|aix4.[[012]].*)
       # We only want to do this on AIX 4.2 and lower, the check
       # below for broken collect2 doesn't work under 4.3+
 	collect2name=`${CC} -print-prog-name=collect2`
@@ -8765,8 +8877,12 @@
 	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
 	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
 	fi
+	;;
       esac
       shared_flag='-shared'
+      if test "$aix_use_runtimelinking" = yes; then
+	shared_flag="$shared_flag "'${wl}-G'
+      fi
     else
       # not using gcc
       if test "$host_cpu" = ia64; then
@@ -8775,15 +8891,16 @@
 	shared_flag='-G'
       else
 	if test "$aix_use_runtimelinking" = yes; then
-	  shared_flag='-qmkshrobj ${wl}-G'
+	  shared_flag='${wl}-G'
 	else
-	  shared_flag='-qmkshrobj'
+	  shared_flag='${wl}-bM:SRE'
 	fi
       fi
     fi
 
-    # Let the compiler handle the export list.
-    _LT_AC_TAGVAR(always_export_symbols, $1)=no
+    # It seems that -bexpall does not export symbols beginning with
+    # underscore (_), so it is better to generate a list of symbols to export.
+    _LT_AC_TAGVAR(always_export_symbols, $1)=yes
     if test "$aix_use_runtimelinking" = yes; then
       # Warning - without using the other runtime loading flags (-brtl),
       # -berok will link without error, but may produce a broken library.
@@ -8792,13 +8909,12 @@
       _LT_AC_SYS_LIBPATH_AIX
       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
 
-      _LT_AC_TAGVAR(archive_cmds, $1)="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '" $shared_flag"
-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+      _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
      else
       if test "$host_cpu" = ia64; then
 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
 	_LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
       else
 	# Determine the default libpath from the value encoded in an empty executable.
 	_LT_AC_SYS_LIBPATH_AIX
@@ -8807,16 +8923,26 @@
 	# -berok will link without error, but may produce a broken library.
 	_LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
 	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
-	# -bexpall does not export symbols beginning with underscore (_)
-	_LT_AC_TAGVAR(always_export_symbols, $1)=yes
 	# Exported symbols can be pulled into shared objects from archives
-	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
+	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
 	_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
-	# This is similar to how AIX traditionally builds it's shared libraries.
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+	# This is similar to how AIX traditionally builds its shared libraries.
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
       fi
     fi
     ;;
+
+  beos*)
+    if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+      # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+      # support --undefined.  This deserves some investigation.  FIXME
+      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+    else
+      _LT_AC_TAGVAR(ld_shlibs, $1)=no
+    fi
+    ;;
+
   chorus*)
     case $cc_basename in
       *)
@@ -8830,12 +8956,12 @@
     # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
     # as there is no search path for DLLs.
     _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-    _LT_AC_TAGVAR(allow_undefined_flag, $1)=no
+    _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
     _LT_AC_TAGVAR(always_export_symbols, $1)=no
     _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
 
     if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
+      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
       # If the export-symbols file already is a .def file (1st line
       # is EXPORTS), use it as is; otherwise, prepend...
       _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
@@ -8844,70 +8970,81 @@
 	echo EXPORTS > $output_objdir/$soname.def;
 	cat $export_symbols >> $output_objdir/$soname.def;
       fi~
-      $CC -shared -nostdlib $output_objdir/$soname.def $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
+      $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
     else
       _LT_AC_TAGVAR(ld_shlibs, $1)=no
     fi
   ;;
+      darwin* | rhapsody*)
+        case $host_os in
+        rhapsody* | darwin1.[[012]])
+         _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
+         ;;
+       *) # Darwin 1.3 on
+         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+           _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
+         else
+           case ${MACOSX_DEPLOYMENT_TARGET} in
+             10.[[012]])
+               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
+               ;;
+             10.*)
+               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
+               ;;
+           esac
+         fi
+         ;;
+        esac
+      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+      _LT_AC_TAGVAR(hardcode_direct, $1)=no
+      _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
+      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
 
-  darwin* | rhapsody*)
-  if test "$GXX" = yes; then
-    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-    case "$host_os" in
-    rhapsody* | darwin1.[[012]])
-      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,suppress'
-      ;;
-    *) # Darwin 1.3 on
-      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
-      else
-	case ${MACOSX_DEPLOYMENT_TARGET} in
-	  10.[012])
-	    _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
-	    ;;
-	  10.*)
-	    _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,dynamic_lookup'
-	    ;;
-	esac
+    if test "$GXX" = yes ; then
+      lt_int_apple_cc_single_mod=no
+      output_verbose_link_cmd='echo'
+      if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then
+       lt_int_apple_cc_single_mod=yes
       fi
-      ;;
-    esac
-    lt_int_apple_cc_single_mod=no
-    output_verbose_link_cmd='echo'
-    if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
-      lt_int_apple_cc_single_mod=yes
-    fi
-    if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring'
-    else
-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring'
-    fi
-    _LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs'
-
-    # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
-    if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-    else
-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-    fi
-    _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-    _LT_AC_TAGVAR(hardcode_direct, $1)=no
-    _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
-    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
-    _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-  else
-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-  fi
-    ;;
+      if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+      else
+          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+        fi
+        _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+        # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+          if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+            _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+          else
+            _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+          fi
+            _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+      else
+      case $cc_basename in
+        xlc*)
+         output_verbose_link_cmd='echo'
+          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
+          _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+          ;;
+       *)
+         _LT_AC_TAGVAR(ld_shlibs, $1)=no
+          ;;
+      esac
+      fi
+        ;;
 
   dgux*)
     case $cc_basename in
-      ec++)
+      ec++*)
 	# FIXME: insert proper C++ library support
 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
 	;;
-      ghcx)
+      ghcx*)
 	# Green Hills C++ Compiler
 	# FIXME: insert proper C++ library support
 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
@@ -8918,14 +9055,14 @@
 	;;
     esac
     ;;
-  freebsd[12]*)
+  freebsd[[12]]*)
     # C++ shared libraries reported to be fairly broken before switch to ELF
     _LT_AC_TAGVAR(ld_shlibs, $1)=no
     ;;
   freebsd-elf*)
     _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
     ;;
-  freebsd* | kfreebsd*-gnu)
+  freebsd* | dragonfly*)
     # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
     # conventions
     _LT_AC_TAGVAR(ld_shlibs, $1)=yes
@@ -8942,12 +9079,12 @@
 				# location of the library.
 
     case $cc_basename in
-    CC)
+    CC*)
       # FIXME: insert proper C++ library support
       _LT_AC_TAGVAR(ld_shlibs, $1)=no
       ;;
-    aCC)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+    aCC*)
+      _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
       # Commands to make compiler produce verbose output that lists
       # what "hidden" libraries, object files and flags are used when
       # linking a shared library.
@@ -8956,11 +9093,11 @@
       # explicitly linking system object files so we need to strip them
       # from the output so that they don't get included in the library
       # dependencies.
-      output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | egrep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+      output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[[-]]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
       ;;
     *)
       if test "$GXX" = yes; then
-        _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+        _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
       else
         # FIXME: insert proper C++ library support
         _LT_AC_TAGVAR(ld_shlibs, $1)=no
@@ -8970,33 +9107,22 @@
     ;;
   hpux10*|hpux11*)
     if test $with_gnu_ld = no; then
-      case "$host_cpu" in
-      hppa*64*)
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+
+      case $host_cpu in
+      hppa*64*|ia64*)
 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
-	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-        ;;
-      ia64*)
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
         ;;
       *)
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
 	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
         ;;
       esac
     fi
-    case "$host_cpu" in
-    hppa*64*)
-      _LT_AC_TAGVAR(hardcode_direct, $1)=no
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-    ia64*)
+    case $host_cpu in
+    hppa*64*|ia64*)
       _LT_AC_TAGVAR(hardcode_direct, $1)=no
       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
-					      # but as the default
-					      # location of the library.
       ;;
     *)
       _LT_AC_TAGVAR(hardcode_direct, $1)=yes
@@ -9007,17 +9133,20 @@
     esac
 
     case $cc_basename in
-      CC)
+      CC*)
 	# FIXME: insert proper C++ library support
 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
 	;;
-      aCC)
-	case "$host_cpu" in
-	hppa*64*|ia64*)
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
+      aCC*)
+	case $host_cpu in
+	hppa*64*)
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	  ;;
+	ia64*)
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 	  ;;
 	*)
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects'
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 	  ;;
 	esac
 	# Commands to make compiler produce verbose output that lists
@@ -9033,12 +9162,15 @@
       *)
 	if test "$GXX" = yes; then
 	  if test $with_gnu_ld = no; then
-	    case "$host_cpu" in
-	    ia64*|hppa*64*)
-	      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
+	    case $host_cpu in
+	    hppa*64*)
+	      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	      ;;
+	    ia64*)
+	      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 	      ;;
 	    *)
-	      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects'
+	      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 	      ;;
 	    esac
 	  fi
@@ -9049,11 +9181,25 @@
 	;;
     esac
     ;;
+  interix3*)
+    _LT_AC_TAGVAR(hardcode_direct, $1)=no
+    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+    # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+    # Instead, shared libraries are loaded at an image base (0x10000000 by
+    # default) and relocated if they conflict, which is a slow very memory
+    # consuming and fragmenting process.  To avoid this, we pick a random,
+    # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+    # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
+    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+    ;;
   irix5* | irix6*)
     case $cc_basename in
-      CC)
+      CC*)
 	# SGI C++
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
 
 	# Archives containing C++ object files must be created using
 	# "CC -ar", where "CC" is the IRIX C++ compiler.  This is
@@ -9064,9 +9210,9 @@
       *)
 	if test "$GXX" = yes; then
 	  if test "$with_gnu_ld" = no; then
-	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
+	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 	  else
-	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
+	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
 	  fi
 	fi
 	_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
@@ -9075,16 +9221,16 @@
     _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
     _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
     ;;
-  linux*)
+  linux* | k*bsd*-gnu)
     case $cc_basename in
-      KCC)
+      KCC*)
 	# Kuck and Associates, Inc. (KAI) C++ Compiler
 
 	# KCC will only create a shared library if the output file
 	# ends with ".so" (or ".sl" for HP-UX), so rename the library
 	# to its proper name (with version) after linking.
-	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib; mv \$templib $lib'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
+	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
 	# Commands to make compiler produce verbose output that lists
 	# what "hidden" libraries, object files and flags are used when
 	# linking a shared library.
@@ -9102,20 +9248,44 @@
 	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
 	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
 	;;
-      icpc)
+      icpc*)
 	# Intel C++
 	with_gnu_ld=yes
+	# version 8.0 and above of icpc choke on multiply defined symbols
+	# if we add $predep_objects and $postdep_objects, however 7.1 and
+	# earlier do not add the objects themselves.
+	case `$CC -V 2>&1` in
+	*"Version 7."*)
+  	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+  	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	  ;;
+	*)  # Version 8.0 or newer
+	  tmp_idyn=
+	  case $host_cpu in
+	    ia64*) tmp_idyn=' -i_dynamic';;
+	  esac
+  	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	  ;;
+	esac
 	_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
 	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
 	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
 	;;
-      cxx)
+      pgCC*)
+        # Portland Group C++ compiler
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+  	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+
+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
+	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+        ;;
+      cxx*)
 	# Compaq C++
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
 
 	runpath_var=LD_RUN_PATH
 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
@@ -9143,7 +9313,7 @@
     ;;
   mvs*)
     case $cc_basename in
-      cxx)
+      cxx*)
 	# FIXME: insert proper C++ library support
 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
 	;;
@@ -9153,7 +9323,7 @@
 	;;
     esac
     ;;
-  netbsd*)
+  netbsd* | netbsdelf*-gnu)
     if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
       _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
       wlarc=
@@ -9164,15 +9334,31 @@
     # Workaround some broken pre-1.5 toolchains
     output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
     ;;
+  openbsd2*)
+    # C++ shared libraries are fairly broken
+    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+    ;;
+  openbsd*)
+    _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+    if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
+      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+    fi
+    output_verbose_link_cmd='echo'
+    ;;
   osf3*)
     case $cc_basename in
-      KCC)
+      KCC*)
 	# Kuck and Associates, Inc. (KAI) C++ Compiler
 
 	# KCC will only create a shared library if the output file
 	# ends with ".so" (or ".sl" for HP-UX), so rename the library
 	# to its proper name (with version) after linking.
-	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib; mv \$templib $lib'
+	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
 
 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
 	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
@@ -9182,14 +9368,14 @@
 	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
 
 	;;
-      RCC)
+      RCC*)
 	# Rational C++ 2.4.1
 	# FIXME: insert proper C++ library support
 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
 	;;
-      cxx)
+      cxx*)
 	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
 
 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
 	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
@@ -9207,7 +9393,7 @@
       *)
 	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
 	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 
 	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
 	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
@@ -9226,13 +9412,13 @@
     ;;
   osf4* | osf5*)
     case $cc_basename in
-      KCC)
+      KCC*)
 	# Kuck and Associates, Inc. (KAI) C++ Compiler
 
 	# KCC will only create a shared library if the output file
 	# ends with ".so" (or ".sl" for HP-UX), so rename the library
 	# to its proper name (with version) after linking.
-	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib; mv \$templib $lib'
+	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
 
 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
 	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
@@ -9241,17 +9427,17 @@
 	# the KAI C++ compiler.
 	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs'
 	;;
-      RCC)
+      RCC*)
 	# Rational C++ 2.4.1
 	# FIXME: insert proper C++ library support
 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
 	;;
-      cxx)
+      cxx*)
 	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
 	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
 	  echo "-hidden">> $lib.exp~
-	  $CC -shared$allow_undefined_flag $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -msym -soname $soname -Wl,-input -Wl,$lib.exp  `test -n "$verstring" && echo -set_version	$verstring` -update_registry $objdir/so_locations -o $lib~
+	  $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp  `test -n "$verstring" && echo -set_version	$verstring` -update_registry ${output_objdir}/so_locations -o $lib~
 	  $rm $lib.exp'
 
 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
@@ -9270,7 +9456,7 @@
       *)
 	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
 	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	 _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
+	 _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 
 	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
 	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
@@ -9291,27 +9477,14 @@
     # FIXME: insert proper C++ library support
     _LT_AC_TAGVAR(ld_shlibs, $1)=no
     ;;
-  sco*)
-    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-    case $cc_basename in
-      CC)
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-      *)
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-    esac
-    ;;
   sunos4*)
     case $cc_basename in
-      CC)
+      CC*)
 	# Sun C++ 4.x
 	# FIXME: insert proper C++ library support
 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
 	;;
-      lcc)
+      lcc*)
 	# Lucid
 	# FIXME: insert proper C++ library support
 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
@@ -9324,36 +9497,33 @@
     ;;
   solaris*)
     case $cc_basename in
-      CC)
+      CC*)
 	# Sun C++ 4.2, 5.x and Centerline C++
+        _LT_AC_TAGVAR(archive_cmds_need_lc,$1)=yes
 	_LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -nolib -h$soname -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects'
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag}  -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-	$CC -G${allow_undefined_flag} -nolib ${wl}-M ${wl}$lib.exp -h$soname -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~$rm $lib.exp'
+	$CC -G${allow_undefined_flag}  ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
 
 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
 	_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
 	case $host_os in
-	  solaris2.[0-5] | solaris2.[0-5].*) ;;
+	  solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
 	  *)
 	    # The C++ compiler is used as linker so we must use $wl
 	    # flag to pass the commands to the underlying system
-	    # linker.
+	    # linker. We must also pass each convience library through
+	    # to the system linker between allextract/defaultextract.
+	    # The C++ compiler will combine linker options so we
+	    # cannot just pass the convience library names through
+	    # without $wl.
 	    # Supported since Solaris 2.6 (maybe 2.5.1?)
-	    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+	    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract'
 	    ;;
 	esac
 	_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
 
-	# Commands to make compiler produce verbose output that lists
-	# what "hidden" libraries, object files and flags are used when
-	# linking a shared library.
-	#
-	# There doesn't appear to be a way to prevent this compiler from
-	# explicitly linking system object files so we need to strip them
-	# from the output so that they don't get included in the library
-	# dependencies.
-	output_verbose_link_cmd='templist=`$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep "\-[[LR]]"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+	output_verbose_link_cmd='echo'
 
 	# Archives containing C++ object files must be created using
 	# "CC -xar", where "CC" is the Sun C++ compiler.  This is
@@ -9361,9 +9531,9 @@
 	# in the archive.
 	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
 	;;
-      gcx)
+      gcx*)
 	# Green Hills C++ Compiler
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-h $wl$soname -o $lib'
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
 
 	# The C++ compiler must be used to create the archive.
 	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
@@ -9373,9 +9543,9 @@
 	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
 	  _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
 	  if $CC --version | grep -v '^2\.7' > /dev/null; then
-	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-h $wl$soname -o $lib'
+	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
 	    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-		$CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~$rm $lib.exp'
+		$CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
 
 	    # Commands to make compiler produce verbose output that lists
 	    # what "hidden" libraries, object files and flags are used when
@@ -9384,9 +9554,9 @@
 	  else
 	    # g++ 2.7 appears to require `-G' NOT `-shared' on this
 	    # platform.
-	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-h $wl$soname -o $lib'
+	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
 	    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-		$CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~$rm $lib.exp'
+		$CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
 
 	    # Commands to make compiler produce verbose output that lists
 	    # what "hidden" libraries, object files and flags are used when
@@ -9399,12 +9569,63 @@
 	;;
     esac
     ;;
-  sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7*)
+  sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
+    _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+    runpath_var='LD_RUN_PATH'
+
+    case $cc_basename in
+      CC*)
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	;;
+      *)
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	;;
+    esac
+    ;;
+  sysv5* | sco3.2v5* | sco5v6*)
+    # Note: We can NOT use -z defs as we might desire, because we do not
+    # link with -lc, and that would cause any symbols used from libc to
+    # always be unresolved, which means just about no library would
+    # ever link correctly.  If we're not using GNU ld we use -z text
+    # though, which does catch some bad symbols but isn't as heavy-handed
+    # as -z defs.
+    # For security reasons, it is highly recommended that you always
+    # use absolute paths for naming shared libraries, and exclude the
+    # DT_RUNPATH tag from executables and libraries.  But doing so
+    # requires that you compile everything twice, which is a pain.
+    # So that behaviour is only enabled if SCOABSPATH is set to a
+    # non-empty value in the environment.  Most likely only useful for
+    # creating official distributions of packages.
+    # This is a hack until libtool officially supports absolute path
+    # names for shared libraries.
+    _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+    _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
     _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
+    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
+    _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
+    runpath_var='LD_RUN_PATH'
+
+    case $cc_basename in
+      CC*)
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	;;
+      *)
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	;;
+    esac
     ;;
   tandem*)
     case $cc_basename in
-      NCC)
+      NCC*)
 	# NonStop-UX NCC 3.20
 	# FIXME: insert proper C++ library support
 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
@@ -9441,8 +9662,6 @@
 AC_LIBTOOL_PROG_LD_SHLIBS($1)
 AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
 AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
-AC_LIBTOOL_SYS_LIB_STRIP
-AC_LIBTOOL_DLOPEN_SELF($1)
 
 AC_LIBTOOL_CONFIG($1)
 
@@ -9460,7 +9679,7 @@
 ])# AC_LIBTOOL_LANG_CXX_CONFIG
 
 # AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME])
-# ------------------------
+# ------------------------------------
 # Figure out "hidden" library dependencies from verbose
 # compiler output when linking a shared library.
 # Parse the compiler output and extract the necessary
@@ -9514,7 +9733,7 @@
   # The `*' in the case matches for architectures that use `case' in
   # $output_verbose_cmd can trigger glob expansion during the loop
   # eval without this substitution.
-  output_verbose_link_cmd="`$echo \"X$output_verbose_link_cmd\" | $Xsed -e \"$no_glob_subst\"`"
+  output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"`
 
   for p in `eval $output_verbose_link_cmd`; do
     case $p in
@@ -9554,7 +9773,7 @@
        fi
        ;;
 
-    *.$objext|*.$libext)
+    *.$objext)
        # This assumes that the test object file only shows up
        # once in the compiler output.
        if test "$p" = "conftest.$objext"; then
@@ -9590,13 +9809,37 @@
 
 $rm -f confest.$objext
 
+# PORTME: override above test on systems where it is broken
+ifelse([$1],[CXX],
+[case $host_os in
+interix3*)
+  # Interix 3.5 installs completely hosed .la files for C++, so rather than
+  # hack all around it, let's just trust "g++" to DTRT.
+  _LT_AC_TAGVAR(predep_objects,$1)=
+  _LT_AC_TAGVAR(postdep_objects,$1)=
+  _LT_AC_TAGVAR(postdeps,$1)=
+  ;;
+
+solaris*)
+  case $cc_basename in
+  CC*)
+    # Adding this requires a known-good setup of shared libraries for
+    # Sun compiler versions before 5.6, else PIC objects from an old
+    # archive will be linked into the output, leading to subtle bugs.
+    _LT_AC_TAGVAR(postdeps,$1)='-lCstd -lCrun'
+    ;;
+  esac
+  ;;
+esac
+])
+
 case " $_LT_AC_TAGVAR(postdeps, $1) " in
 *" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
 esac
 ])# AC_LIBTOOL_POSTDEP_PREDEP
 
 # AC_LIBTOOL_LANG_F77_CONFIG
-# ------------------------
+# --------------------------
 # 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'.
@@ -9640,12 +9883,16 @@
 # ltmain only uses $CC for tagged configurations so make sure $CC is set.
 _LT_AC_SYS_COMPILER
 
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
 # Allow CC to be a program name with arguments.
 lt_save_CC="$CC"
 CC=${F77-"f77"}
 compiler=$CC
 _LT_AC_TAGVAR(compiler, $1)=$CC
-cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
+_LT_CC_BASENAME([$compiler])
 
 AC_MSG_CHECKING([if libtool supports shared libraries])
 AC_MSG_RESULT([$can_build_shared])
@@ -9655,7 +9902,7 @@
 
 # On AIX, shared libraries and static libraries use the same namespace, and
 # are all built from PIC.
-case "$host_os" in
+case $host_os in
 aix3*)
   test "$enable_shared" = yes && enable_static=no
   if test -n "$RANLIB"; then
@@ -9663,8 +9910,10 @@
     postinstall_cmds='$RANLIB $lib'
   fi
   ;;
-aix4*)
-  test "$enable_shared" = yes && enable_static=no
+aix4* | aix5*)
+  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+    test "$enable_shared" = yes && enable_static=no
+  fi
   ;;
 esac
 AC_MSG_RESULT([$enable_shared])
@@ -9674,8 +9923,6 @@
 test "$enable_shared" = yes || enable_static=yes
 AC_MSG_RESULT([$enable_static])
 
-test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
-
 _LT_AC_TAGVAR(GCC, $1)="$G77"
 _LT_AC_TAGVAR(LD, $1)="$LD"
 
@@ -9685,8 +9932,6 @@
 AC_LIBTOOL_PROG_LD_SHLIBS($1)
 AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
 AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
-AC_LIBTOOL_SYS_LIB_STRIP
-
 
 AC_LIBTOOL_CONFIG($1)
 
@@ -9715,20 +9960,27 @@
 lt_simple_compile_test_code="class foo {}\n"
 
 # Code to be used in simple link tests
-lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }\n'
+lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }\n'
 
 # ltmain only uses $CC for tagged configurations so make sure $CC is set.
 _LT_AC_SYS_COMPILER
 
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
 # Allow CC to be a program name with arguments.
 lt_save_CC="$CC"
 CC=${GCJ-"gcj"}
 compiler=$CC
 _LT_AC_TAGVAR(compiler, $1)=$CC
+_LT_CC_BASENAME([$compiler])
 
 # GCJ did not exist at the time GCC didn't implicitly link libc in.
 _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
 
+_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+
 ## CAVEAT EMPTOR:
 ## There is no encapsulation within the following macros, do not change
 ## the running order or otherwise move them around unless you know exactly
@@ -9740,8 +9992,6 @@
 AC_LIBTOOL_PROG_LD_SHLIBS($1)
 AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
 AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
-AC_LIBTOOL_SYS_LIB_STRIP
-AC_LIBTOOL_DLOPEN_SELF($1)
 
 AC_LIBTOOL_CONFIG($1)
 
@@ -9751,7 +10001,7 @@
 
 
 # AC_LIBTOOL_LANG_RC_CONFIG
-# --------------------------
+# -------------------------
 # Ensure that the configuration vars for the Windows resource compiler are
 # suitably defined.  Those variables are subsequently used by
 # AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
@@ -9775,11 +10025,16 @@
 # ltmain only uses $CC for tagged configurations so make sure $CC is set.
 _LT_AC_SYS_COMPILER
 
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
 # Allow CC to be a program name with arguments.
 lt_save_CC="$CC"
 CC=${RC-"windres"}
 compiler=$CC
 _LT_AC_TAGVAR(compiler, $1)=$CC
+_LT_CC_BASENAME([$compiler])
 _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
 
 AC_LIBTOOL_CONFIG($1)
@@ -9805,11 +10060,12 @@
   # without removal of \ escapes.
   if test -n "${ZSH_VERSION+set}" ; then
     setopt NO_GLOB_SUBST
-  fi  
+  fi
   # Now quote all the things that may contain metacharacters while being
   # careful not to overquote the AC_SUBSTed values.  We take copies of the
   # variables and quote the copies for generation of the libtool script.
-  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL \
+  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
+    SED SHELL STRIP \
     libname_spec library_names_spec soname_spec extract_expsyms_cmds \
     old_striplib striplib file_magic_cmd finish_cmds finish_eval \
     deplibs_check_method reload_flag reload_cmds need_locks \
@@ -9859,7 +10115,7 @@
     _LT_AC_TAGVAR(archive_cmds, $1) | \
     _LT_AC_TAGVAR(archive_expsym_cmds, $1) | \
     _LT_AC_TAGVAR(module_cmds, $1) | \
-    _LT_AC_TAGVAR(module_expsym_cmds, $1) | \   
+    _LT_AC_TAGVAR(module_expsym_cmds, $1) | \
     _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \
     _LT_AC_TAGVAR(export_symbols_cmds, $1) | \
     extract_expsyms_cmds | reload_cmds | finish_cmds | \
@@ -9925,11 +10181,11 @@
 SED=$lt_SED
 
 # Sed that helps us avoid accidentally triggering echo(1) options like -n.
-Xsed="$SED -e s/^X//"
+Xsed="$SED -e 1s/^X//"
 
 # The HP-UX ksh and POSIX shell print the target directory to stdout
 # if CDPATH is set.
-if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
 # The names of the tagged configurations supported by this script.
 available_tags=
@@ -9960,6 +10216,12 @@
 # The host system.
 host_alias=$host_alias
 host=$host
+host_os=$host_os
+
+# The build system.
+build_alias=$build_alias
+build=$build
+build_os=$build_os
 
 # An echo program that does not interpret backslashes.
 echo=$lt_echo
@@ -9971,6 +10233,9 @@
 # A C compiler.
 LTCC=$lt_LTCC
 
+# LTCC compiler flags.
+LTCFLAGS=$lt_LTCFLAGS
+
 # A language-specific compiler.
 CC=$lt_[]_LT_AC_TAGVAR(compiler, $1)
 
@@ -9990,7 +10255,7 @@
 NM=$lt_NM
 
 # A symbol stripping program
-STRIP=$STRIP
+STRIP=$lt_STRIP
 
 # Used to examine libraries when file_magic_cmd begins "file"
 MAGIC_CMD=$MAGIC_CMD
@@ -10021,7 +10286,7 @@
 libext="$libext"
 
 # Shared library suffix (normally ".so").
-shrext='$shrext'
+shrext_cmds='$shrext_cmds'
 
 # Executable file suffix (normally "").
 exeext="$exeext"
@@ -10036,7 +10301,7 @@
 # Does compiler simultaneously support -c and -o options?
 compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)
 
-# Must we lock files when doing compilation ?
+# Must we lock files when doing compilation?
 need_locks=$lt_need_locks
 
 # Do we need the lib prefix for modules?
@@ -10265,7 +10530,10 @@
   # If there is no Makefile yet, we rely on a make rule to execute
   # `config.status --recheck' to rerun these tests and create the
   # libtool script then.
-  test -f Makefile && make "$ltmain"
+  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
+  if test -f "$ltmain_in"; then
+    test -f Makefile && make "$ltmain"
+  fi
 fi
 ])# AC_LIBTOOL_CONFIG
 
@@ -10307,9 +10575,6 @@
 # Regexp to match symbols that can be accessed directly from C.
 sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
 
-# Transform the above into a raw symbol and a C symbol.
-symxfrm='\1 \2\3 \3'
-
 # Transform an extracted symbol line into a proper C declaration
 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
 
@@ -10331,14 +10596,30 @@
   lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
   lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
   ;;
+linux* | k*bsd*-gnu)
+  if test "$host_cpu" = ia64; then
+    symcode='[[ABCDGIRSTW]]'
+    lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
+    lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
+  fi
+  ;;
 irix* | nonstopux*)
   symcode='[[BCDEGRST]]'
   ;;
 osf*)
   symcode='[[BCDEGQRST]]'
   ;;
-solaris* | sysv5*)
-  symcode='[[BDT]]'
+solaris*)
+  symcode='[[BDRT]]'
+  ;;
+sco3.2v5*)
+  symcode='[[DT]]'
+  ;;
+sysv4.2uw2*)
+  symcode='[[DT]]'
+  ;;
+sysv5* | sco5v6* | unixware* | OpenUNIX*)
+  symcode='[[ABDT]]'
   ;;
 sysv4)
   symcode='[[DFNSTU]]'
@@ -10356,14 +10637,17 @@
 # If we're using GNU nm, then use its standard symbol codes.
 case `$NM -V 2>&1` in
 *GNU* | *'with BFD'*)
-  symcode='[[ABCDGISTW]]' ;;
+  symcode='[[ABCDGIRSTW]]' ;;
 esac
 
 # Try without a prefix undercore, then with it.
 for ac_symprfx in "" "_"; do
 
+  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
+  symxfrm="\\1 $ac_symprfx\\2 \\2"
+
   # Write the raw and C identifiers.
-  lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ 	]]\($symcode$symcode*\)[[ 	]][[ 	]]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'"
+  lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ 	]]\($symcode$symcode*\)[[ 	]][[ 	]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
 
   # Check to see that the pipe works correctly.
   pipe_works=no
@@ -10519,6 +10803,10 @@
       # DJGPP does not support shared libraries at all
       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
       ;;
+    interix3*)
+      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+      # Instead, we relocate shared libraries at runtime.
+      ;;
     sysv4*MP*)
       if test -d /usr/nec; then
 	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
@@ -10527,7 +10815,7 @@
     hpux*)
       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
       # not for PA HP-UX.
-      case "$host_cpu" in
+      case $host_cpu in
       hppa*64*|ia64*)
 	;;
       *)
@@ -10552,18 +10840,28 @@
 	;;
       chorus*)
 	case $cc_basename in
-	cxch68)
+	cxch68*)
 	  # Green Hills C++ Compiler
 	  # _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
 	  ;;
 	esac
 	;;
+       darwin*)
+         # PIC is the default on this platform
+         # Common symbols not allowed in MH_DYLIB files
+         case $cc_basename in
+           xlc*)
+           _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon'
+           _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+           ;;
+         esac
+       ;;
       dgux*)
 	case $cc_basename in
-	  ec++)
+	  ec++*)
 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 	    ;;
-	  ghcx)
+	  ghcx*)
 	    # Green Hills C++ Compiler
 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
 	    ;;
@@ -10571,22 +10869,22 @@
 	    ;;
 	esac
 	;;
-      freebsd* | kfreebsd*-gnu)
+      freebsd* | dragonfly*)
 	# FreeBSD uses GNU C++
 	;;
       hpux9* | hpux10* | hpux11*)
 	case $cc_basename in
-	  CC)
+	  CC*)
 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
+	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
 	    if test "$host_cpu" != ia64; then
 	      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
 	    fi
 	    ;;
-	  aCC)
+	  aCC*)
 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
-	    case "$host_cpu" in
+	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
+	    case $host_cpu in
 	    hppa*64*|ia64*)
 	      # +Z the default
 	      ;;
@@ -10599,9 +10897,13 @@
 	    ;;
 	esac
 	;;
+      interix*)
+	# This is c89, which is MS Visual C++ (no shared libs)
+	# Anyone wants to do a port?
+	;;
       irix5* | irix6* | nonstopux*)
 	case $cc_basename in
-	  CC)
+	  CC*)
 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
 	    # CC pic flag -KPIC is the default.
@@ -10610,20 +10912,26 @@
 	    ;;
 	esac
 	;;
-      linux*)
+      linux* | k*bsd*-gnu)
 	case $cc_basename in
-	  KCC)
+	  KCC*)
 	    # KAI C++ Compiler
 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
 	    ;;
-	  icpc)
+	  icpc* | ecpc*)
 	    # Intel C++
 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
-	    ;; 
-	  cxx)
+	    ;;
+	  pgCC*)
+	    # Portland Group C++ compiler.
+	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
+	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	    ;;
+	  cxx*)
 	    # Compaq C++
 	    # Make sure the PIC flag is empty.  It appears that all Alpha
 	    # Linux and Compaq Tru64 Unix objects are PIC.
@@ -10640,25 +10948,25 @@
 	;;
       mvs*)
 	case $cc_basename in
-	  cxx)
+	  cxx*)
 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'
 	    ;;
 	  *)
 	    ;;
 	esac
 	;;
-      netbsd*)
+      netbsd* | netbsdelf*-gnu)
 	;;
       osf3* | osf4* | osf5*)
 	case $cc_basename in
-	  KCC)
+	  KCC*)
 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
 	    ;;
-	  RCC)
+	  RCC*)
 	    # Rational C++ 2.4.1
 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
 	    ;;
-	  cxx)
+	  cxx*)
 	    # Digital/Compaq C++
 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 	    # Make sure the PIC flag is empty.  It appears that all Alpha
@@ -10672,24 +10980,15 @@
 	;;
       psos*)
 	;;
-      sco*)
-	case $cc_basename in
-	  CC)
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
       solaris*)
 	case $cc_basename in
-	  CC)
+	  CC*)
 	    # Sun C++ 4.2, 5.x and Centerline C++
 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
 	    ;;
-	  gcx)
+	  gcx*)
 	    # Green Hills C++ Compiler
 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
 	    ;;
@@ -10699,12 +10998,12 @@
 	;;
       sunos4*)
 	case $cc_basename in
-	  CC)
+	  CC*)
 	    # Sun C++ 4.x
 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
 	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 	    ;;
-	  lcc)
+	  lcc*)
 	    # Lucid
 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
 	    ;;
@@ -10714,7 +11013,7 @@
 	;;
       tandem*)
 	case $cc_basename in
-	  NCC)
+	  NCC*)
 	    # NonStop-UX NCC 3.20
 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 	    ;;
@@ -10722,7 +11021,14 @@
 	    ;;
 	esac
 	;;
-      unixware*)
+      sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+	case $cc_basename in
+	  CC*)
+	    _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'
+	    ;;
+	esac
 	;;
       vxworks*)
 	;;
@@ -10769,6 +11075,11 @@
       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
       ;;
 
+    interix3*)
+      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+      # Instead, we relocate shared libraries at runtime.
+      ;;
+
     msdosdjgpp*)
       # Just because we use GCC doesn't mean we suddenly get shared libraries
       # on systems that don't support them.
@@ -10785,7 +11096,7 @@
     hpux*)
       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
       # not for PA HP-UX.
-      case "$host_cpu" in
+      case $host_cpu in
       hppa*64*|ia64*)
 	# +Z the default
 	;;
@@ -10811,6 +11122,16 @@
 	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
       fi
       ;;
+      darwin*)
+        # PIC is the default on this platform
+        # Common symbols not allowed in MH_DYLIB files
+       case $cc_basename in
+         xlc*)
+         _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon'
+         _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+         ;;
+       esac
+       ;;
 
     mingw* | pw32* | os2*)
       # This hack is so that the source file can tell whether it is being
@@ -10822,7 +11143,7 @@
       _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
       # not for PA HP-UX.
-      case "$host_cpu" in
+      case $host_cpu in
       hppa*64*|ia64*)
 	# +Z the default
 	;;
@@ -10845,13 +11166,20 @@
       _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
       ;;
 
-    linux*)
-      case $CC in
+    linux* | k*bsd*-gnu)
+      case $cc_basename in
       icc* | ecc*)
 	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
         ;;
+      pgcc* | pgf77* | pgf90* | pgf95*)
+        # Portland Group compilers (*not* the Pentium gcc compiler,
+	# which looks to be a dead project)
+	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
+	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+        ;;
       ccc*)
         _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
         # All Alpha code is PIC.
@@ -10866,15 +11194,15 @@
       _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
       ;;
 
-    sco3.2v5*)
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kpic'
-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-dn'
-      ;;
-
     solaris*)
-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
       _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      case $cc_basename in
+      f77* | f90* | f95*)
+	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
+      *)
+	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
+      esac
       ;;
 
     sunos4*)
@@ -10883,7 +11211,7 @@
       _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
       ;;
 
-    sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+    sysv4 | sysv4.2uw2* | sysv4.3*)
       _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
       _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
@@ -10896,6 +11224,17 @@
       fi
       ;;
 
+    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    unicos*)
+      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+      ;;
+
     uts4*)
       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
       _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
@@ -10923,7 +11262,7 @@
     [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
 fi
-case "$host_os" in
+case $host_os in
   # For platforms which do not support PIC, -DPIC is meaningless:
   *djgpp*)
     _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
@@ -10932,6 +11271,16 @@
     _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])"
     ;;
 esac
+
+#
+# Check to make sure the static flag actually works.
+#
+wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\"
+AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
+  _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1),
+  $lt_tmp_static_flag,
+  [],
+  [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
 ])
 
 
@@ -10956,7 +11305,10 @@
     _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
   ;;
   cygwin* | mingw*)
-    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
+    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([[^ ]]*\) [[^ ]]*/\1 DATA/;/^I /d;/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
+  ;;
+  linux* | k*bsd*-gnu)
+    _LT_AC_TAGVAR(link_all_deplibs, $1)=no
   ;;
   *)
     _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
@@ -10982,7 +11334,7 @@
   _LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
   _LT_AC_TAGVAR(hardcode_automatic, $1)=no
   _LT_AC_TAGVAR(module_cmds, $1)=
-  _LT_AC_TAGVAR(module_expsym_cmds, $1)=  
+  _LT_AC_TAGVAR(module_expsym_cmds, $1)=
   _LT_AC_TAGVAR(always_export_symbols, $1)=no
   _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
   # include_expsyms should be a list of space-separated symbols to be *always*
@@ -10999,7 +11351,8 @@
   # rely on this symbol name, it's probably fine to never include it in
   # preloaded symbol tables.
   extract_expsyms_cmds=
-
+  # Just being paranoid about ensuring that cc_basename is set.
+  _LT_CC_BASENAME([$compiler])
   case $host_os in
   cygwin* | mingw* | pw32*)
     # FIXME: the MSVC++ port hasn't been tested in a loooong time
@@ -11009,6 +11362,10 @@
       with_gnu_ld=no
     fi
     ;;
+  interix*)
+    # we just hope/assume this is gcc and not c89 (= MSVC++)
+    with_gnu_ld=yes
+    ;;
   openbsd*)
     with_gnu_ld=no
     ;;
@@ -11019,6 +11376,27 @@
     # If archive_cmds runs LD, not CC, wlarc should be empty
     wlarc='${wl}'
 
+    # Set some defaults for GNU ld with shared library support. These
+    # are reset later if shared libraries are not supported. Putting them
+    # here allows them to be overridden if necessary.
+    runpath_var=LD_RUN_PATH
+    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
+    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+    # ancient GNU ld didn't support --whole-archive et. al.
+    if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
+	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+      else
+  	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
+    fi
+    supports_anon_versioning=no
+    case `$LD -v 2>/dev/null` in
+      *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
+      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
+      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
+      *\ 2.11.*) ;; # other 2.11 versions
+      *) supports_anon_versioning=yes ;;
+    esac
+
     # See if GNU ld supports shared libraries.
     case $host_os in
     aix3* | aix4* | aix5*)
@@ -11056,7 +11434,7 @@
 	_LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
 	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
 	# support --undefined.  This deserves some investigation.  FIXME
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
       else
 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
       fi
@@ -11066,13 +11444,13 @@
       # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
       # as there is no search path for DLLs.
       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_AC_TAGVAR(allow_undefined_flag, $1)=no
+      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
       _LT_AC_TAGVAR(always_export_symbols, $1)=no
       _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
+      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
 
       if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
-        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
+        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
 	# If the export-symbols file already is a .def file (1st line
 	# is EXPORTS), use it as is; otherwise, prepend...
 	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
@@ -11081,23 +11459,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
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
+    interix3*)
+      _LT_AC_TAGVAR(hardcode_direct, $1)=no
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+      # Instead, shared libraries are loaded at an image base (0x10000000 by
+      # default) and relocated if they conflict, which is a slow very memory
+      # consuming and fragmenting process.  To avoid this, we pick a random,
+      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
+      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      ;;
+
+    linux* | k*bsd*-gnu)
+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+	tmp_addflag=
+	case $cc_basename,$host_cpu in
+	pgcc*)				# Portland Group C compiler
+	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+	  tmp_addflag=' $pic_flag'
+	  ;;
+	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
+	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+	  tmp_addflag=' $pic_flag -Mnomain' ;;
+	ecc*,ia64* | icc*,ia64*)		# Intel C compiler on ia64
+	  tmp_addflag=' -i_dynamic' ;;
+	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
+	  tmp_addflag=' -i_dynamic -nofor_main' ;;
+	ifc* | ifort*)			# Intel Fortran compiler
+	  tmp_addflag=' -nofor_main' ;;
+	esac
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+
+	if test $supports_anon_versioning = yes; then
+	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~
+  cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+  $echo "local: *; };" >> $output_objdir/$libname.ver~
+	  $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+	fi
+	_LT_AC_TAGVAR(link_all_deplibs, $1)=no
       else
-	ld_shlibs=no
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
       fi
       ;;
 
-    netbsd*)
+    netbsd* | netbsdelf*-gnu)
       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
 	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
 	wlarc=
       else
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
       fi
       ;;
 
-    solaris* | sysv5*)
+    solaris*)
       if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
 	cat <<EOF 1>&2
@@ -11111,13 +11536,40 @@
 
 EOF
       elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
       else
 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
       fi
       ;;
 
+    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
+      case `$LD -v 2>&1` in
+        *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*) 
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+	cat <<_LT_EOF 1>&2
+
+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
+*** reliably create shared libraries on SCO systems.  Therefore, libtool
+*** is disabling shared libraries support.  We urge you to upgrade GNU
+*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
+
+_LT_EOF
+	;;
+	*)
+	  if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+	    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
+	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib'
+	    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib'
+	  else
+	    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+	  fi
+	;;
+      esac
+      ;;
+
     sunos4*)
       _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
       wlarc=
@@ -11127,24 +11579,19 @@
 
     *)
       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
       else
 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
       fi
       ;;
     esac
 
-    if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = yes; then
-      runpath_var=LD_RUN_PATH
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-      # ancient GNU ld didn't support --whole-archive et. al.
-      if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
- 	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-      else
-  	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
-      fi
+    if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no; then
+      runpath_var=
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
+      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
+      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
     fi
   else
     # PORTME fill in a description of your system's linker (not GNU ld)
@@ -11156,7 +11603,7 @@
       # Note: this linker hardcodes the directories in LIBPATH if there
       # are no directories specified by -L.
       _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-      if test "$GCC" = yes && test -z "$link_static_flag"; then
+      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
 	# Neither direct hardcoding nor static linking is supported with a
 	# broken collect2.
 	_LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
@@ -11178,9 +11625,21 @@
 	else
 	  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
 	fi
+	aix_use_runtimelinking=no
+
+	# Test if we are trying to use run time linking or normal
+	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
+	# need to do runtime linking.
+	case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
+	  for ld_flag in $LDFLAGS; do
+  	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+  	    aix_use_runtimelinking=yes
+  	    break
+  	  fi
+	  done
+	  ;;
+	esac
 
-	# KDE requires run time linking.  Make it the default.
-	aix_use_runtimelinking=yes
 	exp_sym_flag='-bexport'
 	no_entry_flag='-bnoentry'
       fi
@@ -11197,7 +11656,7 @@
       _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
 
       if test "$GCC" = yes; then
-	case $host_os in aix4.[012]|aix4.[012].*)
+	case $host_os in aix4.[[012]]|aix4.[[012]].*)
 	# We only want to do this on AIX 4.2 and lower, the check
 	# below for broken collect2 doesn't work under 4.3+
 	  collect2name=`${CC} -print-prog-name=collect2`
@@ -11216,8 +11675,12 @@
   	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
   	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
 	  fi
+	  ;;
 	esac
 	shared_flag='-shared'
+	if test "$aix_use_runtimelinking" = yes; then
+	  shared_flag="$shared_flag "'${wl}-G'
+	fi
       else
 	# not using gcc
 	if test "$host_cpu" = ia64; then
@@ -11225,30 +11688,30 @@
   	# chokes on -Wl,-G. The following line is correct:
 	  shared_flag='-G'
 	else
-  	if test "$aix_use_runtimelinking" = yes; then
-	    shared_flag='-qmkshrobj ${wl}-G'
+	  if test "$aix_use_runtimelinking" = yes; then
+	    shared_flag='${wl}-G'
 	  else
-	    shared_flag='-qmkshrobj'
-  	fi
+	    shared_flag='${wl}-bM:SRE'
+	  fi
 	fi
       fi
 
-      # Let the compiler handle the export list.
-      _LT_AC_TAGVAR(always_export_symbols, $1)=no
+      # It seems that -bexpall does not export symbols beginning with
+      # underscore (_), so it is better to generate a list of symbols to export.
+      _LT_AC_TAGVAR(always_export_symbols, $1)=yes
       if test "$aix_use_runtimelinking" = yes; then
 	# Warning - without using the other runtime loading flags (-brtl),
 	# -berok will link without error, but may produce a broken library.
 	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok'
        # Determine the default libpath from the value encoded in an empty executable.
-	_LT_AC_SYS_LIBPATH_AIX
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-	_LT_AC_TAGVAR(archive_cmds, $1)="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '" $shared_flag"
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+       _LT_AC_SYS_LIBPATH_AIX
+       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
        else
 	if test "$host_cpu" = ia64; then
 	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
 	  _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
-	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
+	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
 	else
 	 # Determine the default libpath from the value encoded in an empty executable.
 	 _LT_AC_SYS_LIBPATH_AIX
@@ -11257,13 +11720,11 @@
 	  # -berok will link without error, but may produce a broken library.
 	  _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
 	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
-	  # -bexpall does not export symbols beginning with underscore (_)
-	  _LT_AC_TAGVAR(always_export_symbols, $1)=yes
 	  # Exported symbols can be pulled into shared objects from archives
-	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
+	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
 	  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
-	  # This is similar to how AIX traditionally builds it's shared libraries.
-	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+	  # This is similar to how AIX traditionally builds its shared libraries.
+	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
 	fi
       fi
       ;;
@@ -11276,7 +11737,7 @@
       _LT_AC_TAGVAR(ld_shlibs, $1)=no
       ;;
 
-    bsdi4*)
+    bsdi[[45]]*)
       _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
       ;;
 
@@ -11286,69 +11747,69 @@
       # hardcode_libdir_flag_spec is actually meaningless, as there is
       # no search path for DLLs.
       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
-      _LT_AC_TAGVAR(allow_undefined_flag, $1)=no
+      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
       # Tell ltmain to make .lib files, not .a files.
       libext=lib
       # Tell ltmain to make .dll files, not .so files.
-      shrext=".dll"
+      shrext_cmds=".dll"
       # FIXME: Setting linknames here is a bad hack.
-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -o $lib $compiler_flags $libobjs `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
+      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
       # The linker will automatically build a .lib file if we build a DLL.
       _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true'
       # FIXME: Should let the user specify the lib program.
       _LT_AC_TAGVAR(old_archive_cmds, $1)='lib /OUT:$oldlib$oldobjs$old_deplibs'
-      fix_srcfile_path='`cygpath -w "$srcfile"`'
+      _LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
       _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
       ;;
 
     darwin* | rhapsody*)
-    if test "$GXX" = yes ; then
-      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-      case "$host_os" in
-      rhapsody* | darwin1.[[012]])
-	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,suppress'
-	;;
-      *) # Darwin 1.3 on
-	if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-	  _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
-	else
-	  case ${MACOSX_DEPLOYMENT_TARGET} in
-	    10.[012])
-	      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
-	      ;;
-	    10.*)
-	      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,dynamic_lookup'
-	      ;;
-	  esac
-	fi
-	;;
+      case $host_os in
+        rhapsody* | darwin1.[[012]])
+         _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
+         ;;
+       *) # Darwin 1.3 on
+         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+           _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
+         else
+           case ${MACOSX_DEPLOYMENT_TARGET} in
+             10.[[012]])
+               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
+               ;;
+             10.*)
+               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
+               ;;
+           esac
+         fi
+         ;;
       esac
-    	lt_int_apple_cc_single_mod=no
-    	output_verbose_link_cmd='echo'
-    	if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
-    	  lt_int_apple_cc_single_mod=yes
-    	fi
-    	if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-    	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring'
-    	else
-        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring'
-      fi
-      _LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs'
-      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
-        if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-        else
-          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-        fi
-          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
       _LT_AC_TAGVAR(hardcode_direct, $1)=no
       _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
+      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
       _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-    else  
-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
-    fi  
+    if test "$GCC" = yes ; then
+    	output_verbose_link_cmd='echo'
+        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+      _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+      _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+    else
+      case $cc_basename in
+        xlc*)
+         output_verbose_link_cmd='echo'
+         _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
+         _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+         _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+          ;;
+       *)
+         _LT_AC_TAGVAR(ld_shlibs, $1)=no
+          ;;
+      esac
+    fi
       ;;
 
     dgux*)
@@ -11381,8 +11842,8 @@
       ;;
 
     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd* | kfreebsd*-gnu)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $compiler_flags $libobjs $deplibs'
+    freebsd* | dragonfly*)
+      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
       _LT_AC_TAGVAR(hardcode_direct, $1)=yes
       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
@@ -11390,7 +11851,7 @@
 
     hpux9*)
       if test "$GCC" = yes; then
-	_LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $compiler_flags $libobjs $deplibs~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+	_LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
       else
 	_LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
       fi
@@ -11404,47 +11865,62 @@
       _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
       ;;
 
-    hpux10* | hpux11*)
+    hpux10*)
       if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-	case "$host_cpu" in
-	hppa*64*|ia64*)
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+      fi
+      if test "$with_gnu_ld" = no; then
+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	_LT_AC_TAGVAR(hardcode_direct, $1)=yes
+	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+
+	# hardcode_minus_L: Not really in the search PATH,
+	# but as the default location of the library.
+	_LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+      fi
+      ;;
+
+    hpux11*)
+      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+	case $host_cpu in
+	hppa*64*)
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	ia64*)
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	*)
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $compiler_flags $libobjs $deplibs'
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	esac
       else
-	case "$host_cpu" in
-	hppa*64*|ia64*)
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
+	case $host_cpu in
+	hppa*64*)
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	ia64*)
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	*)
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	esac
       fi
       if test "$with_gnu_ld" = no; then
-	case "$host_cpu" in
-	hppa*64*)
-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	case $host_cpu in
+	hppa*64*|ia64*)
 	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
-	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-	  _LT_AC_TAGVAR(hardcode_direct, $1)=no
-	  _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-	  ;;
-	ia64*)
-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
 	  _LT_AC_TAGVAR(hardcode_direct, $1)=no
 	  _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-
-	  # hardcode_minus_L: Not really in the search PATH,
-	  # but as the default location of the library.
-	  _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
 	  ;;
 	*)
-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
 	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes
 	  _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
 
@@ -11458,7 +11934,7 @@
 
     irix5* | irix6* | nonstopux*)
       if test "$GCC" = yes; then
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
       else
 	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
@@ -11468,7 +11944,7 @@
       _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
       ;;
 
-    netbsd*)
+    netbsd* | netbsdelf*-gnu)
       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
 	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
       else
@@ -11491,7 +11967,8 @@
       _LT_AC_TAGVAR(hardcode_direct, $1)=yes
       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
       if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs'
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
 	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
       else
@@ -11501,7 +11978,7 @@
 	   _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
 	   ;;
 	 *)
-	   _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs'
+	   _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
 	   _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
 	   ;;
        esac
@@ -11512,14 +11989,14 @@
       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
       _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
       _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
-      _LT_AC_TAGVAR(archive_cmds, $1)='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $compiler_flags $libobjs $deplibs$output_objdir/$libname.def'
+      _LT_AC_TAGVAR(archive_cmds, $1)='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
       _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
       ;;
 
     osf3*)
       if test "$GCC" = yes; then
 	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $compiler_flags $libobjs $deplibs ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
       else
 	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
 	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
@@ -11531,13 +12008,13 @@
     osf4* | osf5*)	# as osf3* with the addition of -msym flag
       if test "$GCC" = yes; then
 	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $compiler_flags $libobjs $deplibs ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
       else
 	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
 	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
 	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
-	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
+	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
 
 	# Both c and cxx compiler support -rpath directly
 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
@@ -11545,21 +12022,15 @@
       _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
       ;;
 
-    sco3.2v5*)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
-      runpath_var=LD_RUN_PATH
-      hardcode_runpath_var=yes
-      ;;
-
     solaris*)
       _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
       if test "$GCC" = yes; then
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
+	wlarc='${wl}'
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
 	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs~$rm $lib.exp'
+	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
       else
+	wlarc=''
 	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
 	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
   	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
@@ -11568,8 +12039,18 @@
       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
       case $host_os in
       solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
-      *) # Supported since Solaris 2.6 (maybe 2.5.1?)
-	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;;
+      *)
+ 	# The compiler driver will combine linker options so we
+ 	# cannot just pass the convience library names through
+ 	# without $wl, iff we do not link with $LD.
+ 	# Luckily, gcc supports the same syntax we need for Sun Studio.
+ 	# Supported since Solaris 2.6 (maybe 2.5.1?)
+ 	case $wlarc in
+ 	'')
+ 	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;;
+ 	*)
+ 	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
+ 	esac ;;
       esac
       _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
       ;;
@@ -11578,7 +12059,7 @@
       if test "x$host_vendor" = xsequent; then
 	# Use $CC to link under sequent, because it throws in some extra .o
 	# files that make .init and .fini sections work.
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $compiler_flags $libobjs $deplibs'
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
       else
 	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
       fi
@@ -11626,36 +12107,45 @@
       fi
       ;;
 
-    sysv4.2uw2*)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=no
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7*)
+      _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      hardcode_runpath_var=yes
-      runpath_var=LD_RUN_PATH
-      ;;
+      runpath_var='LD_RUN_PATH'
 
-   sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[[78]]* | unixware7*)
-      _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z ${wl}text'
       if test "$GCC" = yes; then
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
       else
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
       fi
-      runpath_var='LD_RUN_PATH'
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
       ;;
 
-    sysv5*)
-      _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
-      # $CC -shared without GNU ld will not create a library from C++
-      # object files and a static libstdc++, better avoid it by now
-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-  		$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
+    sysv5* | sco3.2v5* | sco5v6*)
+      # Note: We can NOT use -z defs as we might desire, because we do not
+      # link with -lc, and that would cause any symbols used from libc to
+      # always be unresolved, which means just about no library would
+      # ever link correctly.  If we're not using GNU ld we use -z text
+      # though, which does catch some bad symbols but isn't as heavy-handed
+      # as -z defs.
+      _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+      _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
+      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
+      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
+      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
       runpath_var='LD_RUN_PATH'
+
+      if test "$GCC" = yes; then
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+      fi
       ;;
 
     uts4*)
@@ -11673,11 +12163,6 @@
 AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
 test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
 
-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test "$GCC" = yes; then
-  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-fi
-
 #
 # Do we need to explicitly link libc?
 #
@@ -11698,13 +12183,14 @@
       AC_MSG_CHECKING([whether -lc should be explicitly linked in])
       $rm conftest*
       printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-  
+
       if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
         soname=conftest
         lib=conftest
         libobjs=conftest.$ac_objext
         deplibs=
         wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)
+	pic_flag=$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)
         compiler_flags=-v
         linker_flags=-v
         verstring=
@@ -11832,7 +12318,7 @@
 # Add /usr/xpg4/bin/sed as it is typically found on Solaris
 # along with /bin/sed that truncates output.
 for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
-  test ! -f $lt_ac_sed && break
+  test ! -f $lt_ac_sed && continue
   cat /dev/null > conftest.in
   lt_ac_count=0
   echo $ECHO_N "0123456789$ECHO_C" >conftest.in
--- kdelibs-3.5.7.orig/kded/test/Makefile.in
+++ kdelibs-3.5.7/kded/test/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -18,15 +18,11 @@
 # $Id: Makefile.am 334039 2004-07-30 03:27:07Z nhasan $
 
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -74,7 +70,14 @@
 kded_test_la_nofinal_OBJECTS = test.lo test_skel.lo
 @KDE_USE_FINAL_FALSE@kded_test_la_OBJECTS = $(kded_test_la_nofinal_OBJECTS)
 @KDE_USE_FINAL_TRUE@kded_test_la_OBJECTS = $(kded_test_la_final_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+#>- kded_test_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(kded_test_la_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+kded_test_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(kded_test_la_LDFLAGS) $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -82,19 +85,21 @@
 #>+ 2
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
-#>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+#>+ 3
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
 CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 3
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(kded_test_la_SOURCES)
 DIST_SOURCES = $(kded_test_la_SOURCES)
 servicesDATA_INSTALL = $(INSTALL_DATA)
@@ -107,8 +112,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -116,13 +119,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -136,8 +139,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -158,17 +159,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -237,7 +235,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -274,12 +271,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -324,87 +323,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -428,75 +383,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -504,16 +401,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -537,7 +433,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -575,13 +471,13 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
+	test -z "$(kde_moduledir)" || $(MKDIR_P) "$(DESTDIR)$(kde_moduledir)"
 	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
@@ -592,7 +488,7 @@
 
 uninstall-kde_moduleLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
@@ -607,7 +503,7 @@
 	  rm -f "$${dir}/so_locations"; \
 	done
 kded_test.la: $(kded_test_la_OBJECTS) $(kded_test_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(kde_moduledir) $(kded_test_la_LDFLAGS) $(kded_test_la_OBJECTS) $(kded_test_la_LIBADD) $(LIBS)
+	$(kded_test_la_LINK) -rpath $(kde_moduledir) $(kded_test_la_OBJECTS) $(kded_test_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -618,22 +514,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test.Plo@am__quote@
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -643,13 +539,9 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 install-servicesDATA: $(services_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(servicesdir)" || $(mkdir_p) "$(DESTDIR)$(servicesdir)"
+	test -z "$(servicesdir)" || $(MKDIR_P) "$(DESTDIR)$(servicesdir)"
 	@list='$(services_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -714,22 +606,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -745,7 +636,7 @@
 all-am: Makefile $(LTLIBRARIES) $(DATA)
 installdirs:
 	for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(servicesdir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -785,7 +676,7 @@
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
@@ -801,14 +692,22 @@
 #>+ 1
 install-data-am:   install-servicesDATA
 
+install-dvi: install-dvi-am
+
 #>- install-exec-am:
 #>+ 1
 install-exec-am:  install-kde_moduleLTLIBRARIES
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -829,22 +728,24 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-kde_moduleLTLIBRARIES \
-	uninstall-servicesDATA
+uninstall-am: uninstall-kde_moduleLTLIBRARIES uninstall-servicesDATA
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-kde_moduleLTLIBRARIES clean-libtool ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
 	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-exec \
-	install-exec-am install-info install-info-am \
-	install-kde_moduleLTLIBRARIES install-man install-servicesDATA \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am \
+	install-kde_moduleLTLIBRARIES install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-servicesDATA \
 	install-strip installcheck installcheck-am installdirs \
 	maintainer-clean maintainer-clean-generic mostlyclean \
 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
 	pdf pdf-am ps ps-am tags uninstall uninstall-am \
-	uninstall-info-am uninstall-kde_moduleLTLIBRARIES \
-	uninstall-servicesDATA
+	uninstall-kde_moduleLTLIBRARIES uninstall-servicesDATA
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- kdelibs-3.5.7.orig/kded/Makefile.in
+++ kdelibs-3.5.7/kded/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -37,15 +37,11 @@
 
 
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -103,6 +99,13 @@
 #>- kbuildsycoca_la_OBJECTS = $(am_kbuildsycoca_la_OBJECTS)
 #>+ 1
 kbuildsycoca_la_OBJECTS = kbuildsycoca_dummy.lo
+#>- kbuildsycoca_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(kbuildsycoca_la_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+kbuildsycoca_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(kbuildsycoca_la_LDFLAGS) $(LDFLAGS) -o $@
 #>- kded_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
 #>+ 1
 kded_la_DEPENDENCIES = libkdeinit_kded.la
@@ -112,6 +115,13 @@
 #>- kded_la_OBJECTS = $(am_kded_la_OBJECTS)
 #>+ 1
 kded_la_OBJECTS = kded_dummy.lo
+#>- kded_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
+#>- 	$(kded_la_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+kded_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
+	$(kded_la_LDFLAGS) $(LDFLAGS) -o $@
 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 #>- PROGRAMS = $(bin_PROGRAMS)
 #>+ 2
@@ -122,12 +132,26 @@
 #>+ 1
 kde_menu_OBJECTS = kde-menu.$(OBJEXT)
 kde_menu_DEPENDENCIES = $(am__DEPENDENCIES_1)
+#>- kde_menu_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(kde_menu_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+kde_menu_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(kde_menu_LDFLAGS) $(LDFLAGS) -o $@
 am_kdontchangethehostname_OBJECTS = khostname.$(OBJEXT)
 #>- kdontchangethehostname_OBJECTS = $(am_kdontchangethehostname_OBJECTS)
 #>+ 1
 kdontchangethehostname_OBJECTS = khostname.$(OBJEXT)
 kdontchangethehostname_DEPENDENCIES = $(am__DEPENDENCIES_1)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+#>- kdontchangethehostname_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(kdontchangethehostname_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+kdontchangethehostname_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(kdontchangethehostname_LDFLAGS) $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -135,19 +159,21 @@
 #>+ 2
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 #>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
 CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 3
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 #>- SOURCES = $(kbuildsycoca_la_SOURCES) $(kded_la_SOURCES) \
 #>- 	$(kde_menu_SOURCES) $(kdontchangethehostname_SOURCES)
 #>+ 2
@@ -172,8 +198,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -181,13 +205,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -201,8 +225,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -223,17 +245,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -302,7 +321,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -339,12 +357,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -389,87 +409,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -493,75 +469,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -569,16 +487,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -630,7 +547,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -668,13 +585,13 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(kdeinitdir)" || $(mkdir_p) "$(DESTDIR)$(kdeinitdir)"
+	test -z "$(kdeinitdir)" || $(MKDIR_P) "$(DESTDIR)$(kdeinitdir)"
 	@list='$(kdeinit_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
@@ -685,7 +602,7 @@
 
 uninstall-kdeinitLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@set -x; list='$(kdeinit_LTLIBRARIES)'; for p in $$list; do \
+	@list='$(kdeinit_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kdeinitdir)/$$p'"; \
 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kdeinitdir)/$$p"; \
@@ -701,7 +618,7 @@
 	done
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
@@ -712,7 +629,7 @@
 
 uninstall-libLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
@@ -727,12 +644,12 @@
 	  rm -f "$${dir}/so_locations"; \
 	done
 kbuildsycoca.la: $(kbuildsycoca_la_OBJECTS) $(kbuildsycoca_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(kdeinitdir) $(kbuildsycoca_la_LDFLAGS) $(kbuildsycoca_la_OBJECTS) $(kbuildsycoca_la_LIBADD) $(LIBS)
+	$(kbuildsycoca_la_LINK) -rpath $(kdeinitdir) $(kbuildsycoca_la_OBJECTS) $(kbuildsycoca_la_LIBADD) $(LIBS)
 kded.la: $(kded_la_OBJECTS) $(kded_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(kdeinitdir) $(kded_la_LDFLAGS) $(kded_la_OBJECTS) $(kded_la_LIBADD) $(LIBS)
+	$(kded_la_LINK) -rpath $(kdeinitdir) $(kded_la_OBJECTS) $(kded_la_LIBADD) $(LIBS)
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
+	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
 	  if test -f $$p \
@@ -760,10 +677,10 @@
 	done
 kde-menu$(EXEEXT): $(kde_menu_OBJECTS) $(kde_menu_DEPENDENCIES) 
 	@rm -f kde-menu$(EXEEXT)
-	$(CXXLINK) $(kde_menu_LDFLAGS) $(kde_menu_OBJECTS) $(kde_menu_LDADD) $(LIBS)
+	$(kde_menu_LINK) $(kde_menu_OBJECTS) $(kde_menu_LDADD) $(LIBS)
 kdontchangethehostname$(EXEEXT): $(kdontchangethehostname_OBJECTS) $(kdontchangethehostname_DEPENDENCIES) 
 	@rm -f kdontchangethehostname$(EXEEXT)
-	$(CXXLINK) $(kdontchangethehostname_LDFLAGS) $(kdontchangethehostname_OBJECTS) $(kdontchangethehostname_LDADD) $(LIBS)
+	$(kdontchangethehostname_LINK) $(kdontchangethehostname_OBJECTS) $(kdontchangethehostname_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -785,22 +702,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vfolder_menu.Plo@am__quote@
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -810,13 +727,9 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 install-servicetypeDATA: $(servicetype_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(servicetypedir)" || $(mkdir_p) "$(DESTDIR)$(servicetypedir)"
+	test -z "$(servicetypedir)" || $(MKDIR_P) "$(DESTDIR)$(servicetypedir)"
 	@list='$(servicetype_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -833,7 +746,7 @@
 	done
 install-updateDATA: $(update_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(updatedir)" || $(mkdir_p) "$(DESTDIR)$(updatedir)"
+	test -z "$(updatedir)" || $(MKDIR_P) "$(DESTDIR)$(updatedir)"
 	@list='$(update_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -850,7 +763,7 @@
 	done
 install-xdg_menuDATA: $(xdg_menu_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(xdg_menudir)" || $(mkdir_p) "$(DESTDIR)$(xdg_menudir)"
+	test -z "$(xdg_menudir)" || $(MKDIR_P) "$(DESTDIR)$(xdg_menudir)"
 	@list='$(xdg_menu_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -867,7 +780,7 @@
 	done
 install-includeHEADERS: $(include_HEADERS)
 	@$(NORMAL_INSTALL)
-	test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"
+	test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)"
 	@list='$(include_HEADERS)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -932,23 +845,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	$(mkdir_p) $(distdir)/../admin
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -966,7 +877,7 @@
 
 installdirs:
 	for dir in "$(DESTDIR)$(kdeinitdir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(servicetypedir)" "$(DESTDIR)$(updatedir)" "$(DESTDIR)$(xdg_menudir)" "$(DESTDIR)$(includedir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -1006,7 +917,7 @@
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
@@ -1022,12 +933,20 @@
 	install-kdeinitLTLIBRARIES install-servicetypeDATA \
 	install-updateDATA install-xdg_menuDATA
 
+install-dvi: install-dvi-am
+
 install-exec-am: install-binPROGRAMS install-libLTLIBRARIES
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -1049,29 +968,31 @@
 ps-am:
 
 uninstall-am: uninstall-binPROGRAMS uninstall-includeHEADERS \
-	uninstall-info-am uninstall-kdeinitLTLIBRARIES \
-	uninstall-libLTLIBRARIES uninstall-local \
-	uninstall-servicetypeDATA uninstall-updateDATA \
+	uninstall-kdeinitLTLIBRARIES uninstall-libLTLIBRARIES \
+	uninstall-local uninstall-servicetypeDATA uninstall-updateDATA \
 	uninstall-xdg_menuDATA
 
+.MAKE: install-am install-strip
+
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
 	clean-generic clean-kdeinitLTLIBRARIES clean-libLTLIBRARIES \
 	clean-libtool ctags distclean distclean-compile \
 	distclean-generic distclean-libtool distclean-tags distdir dvi \
 	dvi-am html html-am info info-am install install-am \
 	install-binPROGRAMS install-data install-data-am \
-	install-data-local install-exec install-exec-am \
+	install-data-local install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am \
 	install-includeHEADERS install-info install-info-am \
 	install-kdeinitLTLIBRARIES install-libLTLIBRARIES install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
 	install-servicetypeDATA install-strip install-updateDATA \
 	install-xdg_menuDATA installcheck installcheck-am installdirs \
 	maintainer-clean maintainer-clean-generic mostlyclean \
 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
 	pdf pdf-am ps ps-am tags uninstall uninstall-am \
 	uninstall-binPROGRAMS uninstall-includeHEADERS \
-	uninstall-info-am uninstall-kdeinitLTLIBRARIES \
-	uninstall-libLTLIBRARIES uninstall-local \
-	uninstall-servicetypeDATA uninstall-updateDATA \
+	uninstall-kdeinitLTLIBRARIES uninstall-libLTLIBRARIES \
+	uninstall-local uninstall-servicetypeDATA uninstall-updateDATA \
 	uninstall-xdg_menuDATA
 
 apidox-am-yes:
--- kdelibs-3.5.7.orig/kdoctools/Makefile.in
+++ kdelibs-3.5.7/kdoctools/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -19,15 +19,11 @@
 
 
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -72,7 +68,8 @@
 LTLIBRARIES = $(kde_module_LTLIBRARIES) $(noinst_LTLIBRARIES)
 am__DEPENDENCIES_1 =
 kio_ghelp_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1) libkbzipfilter_dummy.la
+	$(am__DEPENDENCIES_1) libkbzipfilter_dummy.la \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 am_kio_ghelp_la_OBJECTS = kio_help.lo main_ghelp.lo xslt.lo
 #>- kio_ghelp_la_OBJECTS = $(am_kio_ghelp_la_OBJECTS)
 #>+ 4
@@ -80,8 +77,16 @@
 kio_ghelp_la_nofinal_OBJECTS = kio_help.lo main_ghelp.lo xslt.lo
 @KDE_USE_FINAL_FALSE@kio_ghelp_la_OBJECTS = $(kio_ghelp_la_nofinal_OBJECTS)
 @KDE_USE_FINAL_TRUE@kio_ghelp_la_OBJECTS = $(kio_ghelp_la_final_OBJECTS)
+#>- kio_ghelp_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(kio_ghelp_la_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+kio_ghelp_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(kio_ghelp_la_LDFLAGS) $(LDFLAGS) -o $@
 kio_help_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-	libkbzipfilter_dummy.la
+	libkbzipfilter_dummy.la $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1)
 am_kio_help_la_OBJECTS = kio_help.lo main.lo xslt.lo
 #>- kio_help_la_OBJECTS = $(am_kio_help_la_OBJECTS)
 #>+ 4
@@ -89,8 +94,14 @@
 kio_help_la_nofinal_OBJECTS = kio_help.lo main.lo xslt.lo
 @KDE_USE_FINAL_FALSE@kio_help_la_OBJECTS = $(kio_help_la_nofinal_OBJECTS)
 @KDE_USE_FINAL_TRUE@kio_help_la_OBJECTS = $(kio_help_la_final_OBJECTS)
-libkbzipfilter_dummy_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1)
+#>- kio_help_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(kio_help_la_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+kio_help_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(kio_help_la_LDFLAGS) $(LDFLAGS) -o $@
+libkbzipfilter_dummy_la_LIBADD =
 am_libkbzipfilter_dummy_la_OBJECTS = kbzip2filter.lo
 #>- libkbzipfilter_dummy_la_OBJECTS =  \
 #>- 	$(am_libkbzipfilter_dummy_la_OBJECTS)
@@ -103,11 +114,13 @@
 #>+ 1
 meinproc_OBJECTS = meinproc.$(OBJEXT)
 meinproc_DEPENDENCIES = xslt_pure.o libkbzipfilter_dummy.la \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1)
 binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
 updateSCRIPT_INSTALL = $(INSTALL_SCRIPT)
 SCRIPTS = $(bin_SCRIPTS) $(update_SCRIPTS)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -115,19 +128,21 @@
 #>+ 2
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 #>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
 CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 3
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(kio_ghelp_la_SOURCES) $(kio_help_la_SOURCES) \
 	$(libkbzipfilter_dummy_la_SOURCES) $(meinproc_SOURCES)
 DIST_SOURCES = $(kio_ghelp_la_SOURCES) $(kio_help_la_SOURCES) \
@@ -144,8 +159,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -153,13 +166,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -173,8 +186,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -195,17 +206,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -274,7 +282,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -311,12 +318,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -361,87 +370,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -465,75 +430,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -541,16 +448,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -560,20 +466,19 @@
 AM_LDFLAGS = $(KDE_RPATH) $(LIBXML_RPATH) $(LIBXSLT_RPATH) $(all_libraries)
 noinst_LTLIBRARIES = libkbzipfilter_dummy.la
 libkbzipfilter_dummy_la_SOURCES = kbzip2filter.cpp
-libkbzipfilter_dummy_la_LIBADD = $(LIB_KIO) $(LIBBZ2)
 
 ####### Files
 kde_module_LTLIBRARIES = kio_help.la kio_ghelp.la
 kio_help_la_SOURCES = kio_help.cpp main.cpp xslt.cpp
-kio_help_la_LIBADD = $(LIBXSLT_LIBS) $(LIBXML_LIBS)  libkbzipfilter_dummy.la
+kio_help_la_LIBADD = $(LIBXSLT_LIBS) $(LIBXML_LIBS)  libkbzipfilter_dummy.la $(LIB_KIO) $(LIBBZ2)
 kio_help_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
 kio_ghelp_la_SOURCES = kio_help.cpp main_ghelp.cpp xslt.cpp
-kio_ghelp_la_LIBADD = $(LIBXSLT_LIBS) $(LIBXML_LIBS) libkbzipfilter_dummy.la
+kio_ghelp_la_LIBADD = $(LIBXSLT_LIBS) $(LIBXML_LIBS) libkbzipfilter_dummy.la $(LIB_KIO) $(LIBBZ2)
 kio_ghelp_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
 noinst_HEADERS = kio_help.h
 kdelnk_DATA = help.protocol ghelp.protocol
 kdelnkdir = $(kde_servicesdir)
-meinproc_LDADD = xslt_pure.o libkbzipfilter_dummy.la $(LIBXSLT_LIBS) $(LIBXML_LIBS) 
+meinproc_LDADD = xslt_pure.o libkbzipfilter_dummy.la $(LIBXSLT_LIBS) $(LIBXML_LIBS) $(LIB_KIO) $(LIBBZ2) $(LIB_KDECORE)
 meinproc_SOURCES = meinproc.cpp
 bin_SCRIPTS = checkXML
 #>- METASOURCES = AUTO
@@ -587,7 +492,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -625,15 +530,15 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 checkXML: $(top_builddir)/config.status $(srcdir)/checkXML.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
+	test -z "$(kde_moduledir)" || $(MKDIR_P) "$(DESTDIR)$(kde_moduledir)"
 	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
@@ -644,7 +549,7 @@
 
 uninstall-kde_moduleLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
@@ -667,21 +572,15 @@
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
-#>- kio_ghelp.la: $(kio_ghelp_la_OBJECTS) $(kio_ghelp_la_DEPENDENCIES) 
-#>+ 2
-@KDE_USE_CLOSURE_TRUE@kio_ghelp.la: kio_ghelp.la.closure $(kio_ghelp_la_OBJECTS) $(kio_ghelp_la_DEPENDENCIES) 
-@KDE_USE_CLOSURE_FALSE@kio_ghelp.la: $(kio_ghelp_la_OBJECTS) $(kio_ghelp_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(kde_moduledir) $(kio_ghelp_la_LDFLAGS) $(kio_ghelp_la_OBJECTS) $(kio_ghelp_la_LIBADD) $(LIBS)
-#>- kio_help.la: $(kio_help_la_OBJECTS) $(kio_help_la_DEPENDENCIES) 
-#>+ 2
-@KDE_USE_CLOSURE_TRUE@kio_help.la: kio_help.la.closure $(kio_help_la_OBJECTS) $(kio_help_la_DEPENDENCIES) 
-@KDE_USE_CLOSURE_FALSE@kio_help.la: $(kio_help_la_OBJECTS) $(kio_help_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(kde_moduledir) $(kio_help_la_LDFLAGS) $(kio_help_la_OBJECTS) $(kio_help_la_LIBADD) $(LIBS)
+kio_ghelp.la: $(kio_ghelp_la_OBJECTS) $(kio_ghelp_la_DEPENDENCIES) 
+	$(kio_ghelp_la_LINK) -rpath $(kde_moduledir) $(kio_ghelp_la_OBJECTS) $(kio_ghelp_la_LIBADD) $(LIBS)
+kio_help.la: $(kio_help_la_OBJECTS) $(kio_help_la_DEPENDENCIES) 
+	$(kio_help_la_LINK) -rpath $(kde_moduledir) $(kio_help_la_OBJECTS) $(kio_help_la_LIBADD) $(LIBS)
 libkbzipfilter_dummy.la: $(libkbzipfilter_dummy_la_OBJECTS) $(libkbzipfilter_dummy_la_DEPENDENCIES) 
-	$(CXXLINK)  $(libkbzipfilter_dummy_la_LDFLAGS) $(libkbzipfilter_dummy_la_OBJECTS) $(libkbzipfilter_dummy_la_LIBADD) $(LIBS)
+	$(CXXLINK)  $(libkbzipfilter_dummy_la_OBJECTS) $(libkbzipfilter_dummy_la_LIBADD) $(LIBS)
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
+	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
 	  if test -f $$p \
@@ -709,10 +608,10 @@
 	done
 meinproc$(EXEEXT): $(meinproc_OBJECTS) $(meinproc_DEPENDENCIES) 
 	@rm -f meinproc$(EXEEXT)
-	$(CXXLINK) $(meinproc_LDFLAGS) $(meinproc_OBJECTS) $(meinproc_LDADD) $(LIBS)
+	$(CXXLINK) $(meinproc_OBJECTS) $(meinproc_LDADD) $(LIBS)
 install-binSCRIPTS: $(bin_SCRIPTS)
 	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
+	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
 	@list='$(bin_SCRIPTS)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  if test -f $$d$$p; then \
@@ -731,7 +630,7 @@
 	done
 install-updateSCRIPTS: $(update_SCRIPTS)
 	@$(NORMAL_INSTALL)
-	test -z "$(updatedir)" || $(mkdir_p) "$(DESTDIR)$(updatedir)"
+	test -z "$(updatedir)" || $(MKDIR_P) "$(DESTDIR)$(updatedir)"
 	@list='$(update_SCRIPTS)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  if test -f $$d$$p; then \
@@ -763,22 +662,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xslt.Plo@am__quote@
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -788,13 +687,9 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 install-kdelnkDATA: $(kdelnk_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(kdelnkdir)" || $(mkdir_p) "$(DESTDIR)$(kdelnkdir)"
+	test -z "$(kdelnkdir)" || $(MKDIR_P) "$(DESTDIR)$(kdelnkdir)"
 	@list='$(kdelnk_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -811,7 +706,7 @@
 	done
 install-updateDATA: $(update_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(updatedir)" || $(mkdir_p) "$(DESTDIR)$(updatedir)"
+	test -z "$(updatedir)" || $(MKDIR_P) "$(DESTDIR)$(updatedir)"
 	@list='$(update_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -876,23 +771,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	$(mkdir_p) $(distdir)/../admin
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -909,7 +802,7 @@
 		$(HEADERS)
 installdirs:
 	for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(updatedir)" "$(DESTDIR)$(kdelnkdir)" "$(DESTDIR)$(updatedir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -943,14 +836,14 @@
 #>- clean-am: clean-binPROGRAMS clean-generic clean-kde_moduleLTLIBRARIES \
 #>- 	clean-libtool clean-noinstLTLIBRARIES mostlyclean-am
 #>+ 2
-clean-am: clean-closures clean-bcheck clean-final  clean-binPROGRAMS clean-generic clean-kde_moduleLTLIBRARIES \
+clean-am: clean-bcheck clean-final  clean-binPROGRAMS clean-generic clean-kde_moduleLTLIBRARIES \
 	clean-libtool clean-noinstLTLIBRARIES mostlyclean-am
 
 distclean: distclean-am
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
@@ -968,14 +861,22 @@
 install-data-am:   install-data-local \
 	install-kdelnkDATA install-updateDATA install-updateSCRIPTS
 
+install-dvi: install-dvi-am
+
 #>- install-exec-am: install-binPROGRAMS install-binSCRIPTS
 #>+ 1
 install-exec-am:  install-binPROGRAMS install-binSCRIPTS install-kde_moduleLTLIBRARIES
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -997,9 +898,10 @@
 ps-am:
 
 uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \
-	uninstall-info-am uninstall-kde_moduleLTLIBRARIES \
-	uninstall-kdelnkDATA uninstall-local uninstall-updateDATA \
-	uninstall-updateSCRIPTS
+	uninstall-kde_moduleLTLIBRARIES uninstall-kdelnkDATA \
+	uninstall-local uninstall-updateDATA uninstall-updateSCRIPTS
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
 	clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
@@ -1007,15 +909,16 @@
 	distclean-generic distclean-libtool distclean-tags distdir dvi \
 	dvi-am html html-am info info-am install install-am \
 	install-binPROGRAMS install-binSCRIPTS install-data \
-	install-data-am install-data-local install-exec \
-	install-exec-am install-info install-info-am \
-	install-kde_moduleLTLIBRARIES install-kdelnkDATA install-man \
-	install-strip install-updateDATA install-updateSCRIPTS \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-binPROGRAMS \
-	uninstall-binSCRIPTS uninstall-info-am \
+	install-data-am install-data-local install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-kde_moduleLTLIBRARIES \
+	install-kdelnkDATA install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip install-updateDATA \
+	install-updateSCRIPTS installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+	pdf pdf-am ps ps-am tags uninstall uninstall-am \
+	uninstall-binPROGRAMS uninstall-binSCRIPTS \
 	uninstall-kde_moduleLTLIBRARIES uninstall-kdelnkDATA \
 	uninstall-local uninstall-updateDATA uninstall-updateSCRIPTS
 
@@ -1143,31 +1046,9 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
-#>+ 8
-kio_ghelp.la.closure: $(kio_ghelp_la_OBJECTS) $(kio_ghelp_la_DEPENDENCIES)
-	@echo "int main() {return 0;}" > kio_ghelp_la_closure.cpp
-	@$(LTCXXCOMPILE) -c kio_ghelp_la_closure.cpp
-	$(CXXLINK) kio_ghelp_la_closure.lo $(kio_ghelp_la_LDFLAGS) $(kio_ghelp_la_OBJECTS) $(kio_ghelp_la_LIBADD) $(LIBS)
-	@rm -f kio_ghelp_la_closure.* kio_ghelp.la.closure
-	@echo "timestamp" > kio_ghelp.la.closure
-
-
-#>+ 8
-kio_help.la.closure: $(kio_help_la_OBJECTS) $(kio_help_la_DEPENDENCIES)
-	@echo "int main() {return 0;}" > kio_help_la_closure.cpp
-	@$(LTCXXCOMPILE) -c kio_help_la_closure.cpp
-	$(CXXLINK) kio_help_la_closure.lo $(kio_help_la_LDFLAGS) $(kio_help_la_OBJECTS) $(kio_help_la_LIBADD) $(LIBS)
-	@rm -f kio_help_la_closure.* kio_help.la.closure
-	@echo "timestamp" > kio_help.la.closure
-
-
 #>+ 2
 KDE_DIST=kio_help.upd move_kio_help_cache.sh Makefile.in man-template.docbook LICENSE configure.in.in template.docbook xslt.h help.protocol ghelp.protocol checkXML.in Makefile.am 
 
-#>+ 3
-clean-closures:
-	-rm -f  kio_ghelp.la.closure kio_help.la.closure
-
 #>+ 2
 docs-am:
 
--- kdelibs-3.5.7.orig/libkmid/tests/Makefile.in
+++ kdelibs-3.5.7/libkmid/tests/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -15,15 +15,11 @@
 
 @SET_MAKE@
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -69,35 +65,38 @@
 #>+ 1
 notesoff_OBJECTS = notesoff.$(OBJEXT)
 notesoff_DEPENDENCIES = ../libkmid.la
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 #>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 #>+ 2
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 #>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
 CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 3
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(apitest_SOURCES) $(ctest_SOURCES) $(notesoff_SOURCES)
 DIST_SOURCES = $(apitest_SOURCES) $(ctest_SOURCES) $(notesoff_SOURCES)
 ETAGS = etags
@@ -108,8 +107,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -117,13 +114,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -137,8 +134,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -159,17 +154,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -238,7 +230,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -275,12 +266,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -325,87 +318,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -429,75 +378,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -505,16 +396,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -533,7 +423,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .c .cc .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -571,9 +461,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 clean-noinstPROGRAMS:
@@ -584,13 +474,13 @@
 	done
 apitest$(EXEEXT): $(apitest_OBJECTS) $(apitest_DEPENDENCIES) 
 	@rm -f apitest$(EXEEXT)
-	$(CXXLINK) $(apitest_LDFLAGS) $(apitest_OBJECTS) $(apitest_LDADD) $(LIBS)
+	$(CXXLINK) $(apitest_OBJECTS) $(apitest_LDADD) $(LIBS)
 ctest$(EXEEXT): $(ctest_OBJECTS) $(ctest_DEPENDENCIES) 
 	@rm -f ctest$(EXEEXT)
-	$(LINK) $(ctest_LDFLAGS) $(ctest_OBJECTS) $(ctest_LDADD) $(LIBS)
+	$(LINK) $(ctest_OBJECTS) $(ctest_LDADD) $(LIBS)
 notesoff$(EXEEXT): $(notesoff_OBJECTS) $(notesoff_DEPENDENCIES) 
 	@rm -f notesoff$(EXEEXT)
-	$(CXXLINK) $(notesoff_LDFLAGS) $(notesoff_OBJECTS) $(notesoff_LDADD) $(LIBS)
+	$(CXXLINK) $(notesoff_OBJECTS) $(notesoff_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -603,43 +493,43 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/notesoff.Po@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
 .cc.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cc.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cc.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -650,10 +540,6 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -703,22 +589,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -771,7 +656,7 @@
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
@@ -785,12 +670,20 @@
 
 install-data-am:
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -811,19 +704,22 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am
+uninstall-am:
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-libtool clean-noinstPROGRAMS ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
 	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-exec \
-	install-exec-am install-info install-info-am install-man \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
 	install-strip installcheck installcheck-am installdirs \
 	maintainer-clean maintainer-clean-generic mostlyclean \
 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-	pdf pdf-am ps ps-am tags uninstall uninstall-am \
-	uninstall-info-am
+	pdf pdf-am ps ps-am tags uninstall uninstall-am
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- kdelibs-3.5.7.orig/libkmid/Makefile.in
+++ kdelibs-3.5.7/libkmid/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,15 +16,11 @@
 @SET_MAKE@
 
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -80,7 +76,14 @@
 	notearray.lo libkmid.lo
 @KDE_USE_FINAL_FALSE@libkmid_la_OBJECTS = $(libkmid_la_nofinal_OBJECTS)
 @KDE_USE_FINAL_TRUE@libkmid_la_OBJECTS = $(libkmid_la_final_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+#>- libkmid_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(libkmid_la_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+libkmid_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(libkmid_la_LDFLAGS) $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -88,19 +91,21 @@
 #>+ 2
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 #>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
 CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 3
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(libkmid_la_SOURCES)
 DIST_SOURCES = $(libkmid_la_SOURCES)
 libkmidincludeHEADERS_INSTALL = $(INSTALL_HEADER)
@@ -113,8 +118,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -122,13 +125,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -142,8 +145,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -164,17 +165,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -243,7 +241,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -280,12 +277,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -330,87 +329,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -434,75 +389,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -510,16 +407,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -542,9 +438,7 @@
 	fmout.cc gusout.cc alsaout.cc voiceman.cc mt32togm.cc notearray.cc \
 	libkmid.cc
 
-#>- libkmid_la_LDFLAGS = $(KDE_MT_LDFLAGS) -version-info 0:95  -no-undefined
-#>+ 1
-libkmid_la_LDFLAGS = $(KDE_MT_LDFLAGS) -version-info 0:95  -no-undefined $(KDE_NO_UNDEFINED)
+libkmid_la_LDFLAGS = $(KDE_MT_LDFLAGS) -version-info 0:95  -no-undefined
 libkmid_la_LIBADD = $(LIBASOUND) ../kdecore/libkdecore.la
 DOXYGEN_REFERENCES = kdecore
 #>- all: all-am
@@ -553,7 +447,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cc .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(srcdir)/../admin/Doxyfile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../admin/Doxyfile.am $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -591,13 +485,13 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
@@ -608,7 +502,7 @@
 
 uninstall-libLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
@@ -622,11 +516,8 @@
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
-#>- libkmid.la: $(libkmid_la_OBJECTS) $(libkmid_la_DEPENDENCIES) 
-#>+ 2
-@KDE_USE_CLOSURE_TRUE@libkmid.la: libkmid.la.closure $(libkmid_la_OBJECTS) $(libkmid_la_DEPENDENCIES) 
-@KDE_USE_CLOSURE_FALSE@libkmid.la: $(libkmid_la_OBJECTS) $(libkmid_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(libdir) $(libkmid_la_LDFLAGS) $(libkmid_la_OBJECTS) $(libkmid_la_LIBADD) $(LIBS)
+libkmid.la: $(libkmid_la_OBJECTS) $(libkmid_la_DEPENDENCIES) 
+	$(libkmid_la_LINK) -rpath $(libdir) $(libkmid_la_OBJECTS) $(libkmid_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -652,22 +543,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/voiceman.Plo@am__quote@
 
 .cc.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cc.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cc.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -677,13 +568,9 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 install-libkmidincludeHEADERS: $(libkmidinclude_HEADERS)
 	@$(NORMAL_INSTALL)
-	test -z "$(libkmidincludedir)" || $(mkdir_p) "$(DESTDIR)$(libkmidincludedir)"
+	test -z "$(libkmidincludedir)" || $(MKDIR_P) "$(DESTDIR)$(libkmidincludedir)"
 	@list='$(libkmidinclude_HEADERS)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -748,23 +635,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	$(mkdir_p) $(distdir)/../admin
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -780,7 +665,7 @@
 all-am: Makefile $(LTLIBRARIES) $(HEADERS)
 installdirs:
 	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(libkmidincludedir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -813,14 +698,14 @@
 #>- clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
 #>- 	mostlyclean-am
 #>+ 2
-clean-am: clean-closures clean-bcheck clean-final  clean-generic clean-libLTLIBRARIES clean-libtool \
+clean-am: clean-bcheck clean-final  clean-generic clean-libLTLIBRARIES clean-libtool \
 	mostlyclean-am
 
 distclean: distclean-am
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
@@ -834,12 +719,20 @@
 
 install-data-am: install-data-local install-libkmidincludeHEADERS
 
+install-dvi: install-dvi-am
+
 install-exec-am: install-libLTLIBRARIES
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -860,23 +753,26 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES \
-	uninstall-libkmidincludeHEADERS uninstall-local
+uninstall-am: uninstall-libLTLIBRARIES uninstall-libkmidincludeHEADERS \
+	uninstall-local
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-libLTLIBRARIES clean-libtool ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
 	distclean-tags distdir dvi dvi-am html html-am info info-am \
 	install install-am install-data install-data-am \
-	install-data-local install-exec install-exec-am install-info \
+	install-data-local install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
 	install-info-am install-libLTLIBRARIES \
-	install-libkmidincludeHEADERS install-man install-strip \
+	install-libkmidincludeHEADERS install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
 	installcheck installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-info-am \
-	uninstall-libLTLIBRARIES uninstall-libkmidincludeHEADERS \
-	uninstall-local
+	tags uninstall uninstall-am uninstall-libLTLIBRARIES \
+	uninstall-libkmidincludeHEADERS uninstall-local
 
 apidox-am-yes:
 	@if test \! -d "$(top_srcdir)/doc/common/" && test -z "$$DOXDATA" ; then \
@@ -974,22 +870,9 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
-#>+ 8
-libkmid.la.closure: $(libkmid_la_OBJECTS) $(libkmid_la_DEPENDENCIES)
-	@echo "int main() {return 0;}" > libkmid_la_closure.cc
-	@$(LTCXXCOMPILE) -c libkmid_la_closure.cc
-	$(CXXLINK) libkmid_la_closure.lo $(libkmid_la_LDFLAGS) $(libkmid_la_OBJECTS) $(libkmid_la_LIBADD) $(LIBS)
-	@rm -f libkmid_la_closure.* libkmid.la.closure
-	@echo "timestamp" > libkmid.la.closure
-
-
 #>+ 2
 KDE_DIST=awe_sup.h Makefile.in configure.in.in gusvoices.h sndcard.h Makefile.am 
 
-#>+ 3
-clean-closures:
-	-rm -f  libkmid.la.closure
-
 #>+ 2
 docs-am:
 
--- kdelibs-3.5.7.orig/aclocal.m4
+++ kdelibs-3.5.7/aclocal.m4
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
+# generated automatically by aclocal 1.10 -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005  Free Software Foundation, Inc.
+# 2005, 2006  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.
@@ -11,7 +11,170 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-# Copyright (C) 2002, 2003, 2005  Free Software Foundation, Inc.
+m4_if(m4_PACKAGE_VERSION, [2.61],,
+[m4_fatal([this file was generated for autoconf 2.61.
+You have another version of autoconf.  If you want to use that,
+you should regenerate the build system entirely.], [63])])
+
+# pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
+# 
+# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# PKG_PROG_PKG_CONFIG([MIN-VERSION])
+# ----------------------------------
+AC_DEFUN([PKG_PROG_PKG_CONFIG],
+[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
+m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
+AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+	AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
+fi
+if test -n "$PKG_CONFIG"; then
+	_pkg_min_version=m4_default([$1], [0.9.0])
+	AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
+	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+		AC_MSG_RESULT([yes])
+	else
+		AC_MSG_RESULT([no])
+		PKG_CONFIG=""
+	fi
+		
+fi[]dnl
+])# PKG_PROG_PKG_CONFIG
+
+# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+#
+# Check to see whether a particular set of modules exists.  Similar
+# to PKG_CHECK_MODULES(), but does not set variables or print errors.
+#
+#
+# Similar to PKG_CHECK_MODULES, make sure that the first instance of
+# this or PKG_CHECK_MODULES is called, or make sure to call
+# PKG_CHECK_EXISTS manually
+# --------------------------------------------------------------
+AC_DEFUN([PKG_CHECK_EXISTS],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+if test -n "$PKG_CONFIG" && \
+    AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
+  m4_ifval([$2], [$2], [:])
+m4_ifvaln([$3], [else
+  $3])dnl
+fi])
+
+
+# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
+# ---------------------------------------------
+m4_define([_PKG_CONFIG],
+[if test -n "$PKG_CONFIG"; then
+    if test -n "$$1"; then
+        pkg_cv_[]$1="$$1"
+    else
+        PKG_CHECK_EXISTS([$3],
+                         [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
+			 [pkg_failed=yes])
+    fi
+else
+	pkg_failed=untried
+fi[]dnl
+])# _PKG_CONFIG
+
+# _PKG_SHORT_ERRORS_SUPPORTED
+# -----------------------------
+AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi[]dnl
+])# _PKG_SHORT_ERRORS_SUPPORTED
+
+
+# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
+# [ACTION-IF-NOT-FOUND])
+#
+#
+# Note that if there is a possibility the first call to
+# PKG_CHECK_MODULES might not happen, you should be sure to include an
+# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
+#
+#
+# --------------------------------------------------------------
+AC_DEFUN([PKG_CHECK_MODULES],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
+AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
+
+pkg_failed=no
+AC_MSG_CHECKING([for $1])
+
+_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
+_PKG_CONFIG([$1][_LIBS], [libs], [$2])
+
+m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
+and $1[]_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.])
+
+if test $pkg_failed = yes; then
+        _PKG_SHORT_ERRORS_SUPPORTED
+        if test $_pkg_short_errors_supported = yes; then
+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
+        else 
+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
+
+	ifelse([$4], , [AC_MSG_ERROR(dnl
+[Package requirements ($2) were not met:
+
+$$1_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+_PKG_TEXT
+])],
+		[AC_MSG_RESULT([no])
+                $4])
+elif test $pkg_failed = untried; then
+	ifelse([$4], , [AC_MSG_FAILURE(dnl
+[The pkg-config script could not be found or is too old.  Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+_PKG_TEXT
+
+To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.])],
+		[$4])
+else
+	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
+	$1[]_LIBS=$pkg_cv_[]$1[]_LIBS
+        AC_MSG_RESULT([yes])
+	ifelse([$3], , :, [$3])
+fi[]dnl
+])# PKG_CHECK_MODULES
+
+# Copyright (C) 2002, 2003, 2005, 2006  Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -21,14 +184,29 @@
 # ----------------------------
 # Automake X.Y traces this macro to ensure aclocal.m4 has been
 # generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"])
+# (This private macro should not be called outside this file.)
+AC_DEFUN([AM_AUTOMAKE_VERSION],
+[am__api_version='1.10'
+dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
+dnl require some minimum version.  Point them to the right macro.
+m4_if([$1], [1.10], [],
+      [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
+])
+
+# _AM_AUTOCONF_VERSION(VERSION)
+# -----------------------------
+# aclocal traces this macro to find the Autoconf version.
+# This is a private macro too.  Using m4_define simplifies
+# the logic in aclocal, which can simply ignore this definition.
+m4_define([_AM_AUTOCONF_VERSION], [])
 
 # AM_SET_CURRENT_AUTOMAKE_VERSION
 # -------------------------------
-# Call AM_AUTOMAKE_VERSION so it can be traced.
+# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-	 [AM_AUTOMAKE_VERSION([1.9.6])])
+[AM_AUTOMAKE_VERSION([1.10])dnl
+_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)])
 
 # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
 
@@ -85,14 +263,14 @@
 
 # AM_CONDITIONAL                                            -*- Autoconf -*-
 
-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005
+# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006
 # Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 7
+# serial 8
 
 # AM_CONDITIONAL(NAME, SHELL-CONDITION)
 # -------------------------------------
@@ -101,8 +279,10 @@
 [AC_PREREQ(2.52)dnl
  ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
 	[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
-AC_SUBST([$1_TRUE])
-AC_SUBST([$1_FALSE])
+AC_SUBST([$1_TRUE])dnl
+AC_SUBST([$1_FALSE])dnl
+_AM_SUBST_NOTMAKE([$1_TRUE])dnl
+_AM_SUBST_NOTMAKE([$1_FALSE])dnl
 if $2; then
   $1_TRUE=
   $1_FALSE='#'
@@ -116,15 +296,14 @@
 Usually this means the macro was only invoked conditionally.]])
 fi])])
 
-
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
 # Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 8
+# serial 9
 
 # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
 # written in clear, in which case automake, when reading aclocal.m4,
@@ -152,6 +331,7 @@
 ifelse([$1], CC,   [depcc="$CC"   am_compiler_list=],
        [$1], CXX,  [depcc="$CXX"  am_compiler_list=],
        [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
+       [$1], UPC,  [depcc="$UPC"  am_compiler_list=],
        [$1], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
                    [depcc="$$1"   am_compiler_list=])
 
@@ -217,6 +397,7 @@
        depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
        $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
          >/dev/null 2>conftest.err &&
+       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
        grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
        grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
        ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
@@ -269,7 +450,8 @@
   AMDEPBACKSLASH='\'
 fi
 AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
-AC_SUBST([AMDEPBACKSLASH])
+AC_SUBST([AMDEPBACKSLASH])dnl
+_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
 ])
 
 # Generate code to set up dependency tracking.              -*- Autoconf -*-
@@ -294,8 +476,9 @@
   # some people rename them; so instead we look at the file content.
   # Grep'ing the first line is not enough: some people post-process
   # each Makefile.in and add a new line on top of each file to say so.
-  # So let's grep whole file.
-  if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
+  # Grep'ing the whole file is not good either: AIX grep has a line
+  # limit of 2048, but all sed's we know have understand at least 4000.
+  if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
     dirpart=`AS_DIRNAME("$mf")`
   else
     continue
@@ -354,8 +537,8 @@
 
 # Do all the work for Automake.                             -*- Autoconf -*-
 
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-# Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+# 2005, 2006 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -378,16 +561,20 @@
 # arguments mandatory, and then we can depend on a new Autoconf
 # release and drop the old call support.
 AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_PREREQ([2.58])dnl
+[AC_PREREQ([2.60])dnl
 dnl Autoconf wants to disallow AM_ names.  We explicitly allow
 dnl the ones we care about.
 m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
 AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
 AC_REQUIRE([AC_PROG_INSTALL])dnl
-# test to see if srcdir already configured
-if test "`cd $srcdir && pwd`" != "`pwd`" &&
-   test -f $srcdir/config.status; then
-  AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
+if test "`cd $srcdir && pwd`" != "`pwd`"; then
+  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
+  # is not polluted with repeated "-I."
+  AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
+  # test to see if srcdir already configured
+  if test -f $srcdir/config.status; then
+    AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
+  fi
 fi
 
 # test whether we have cygpath
@@ -407,6 +594,9 @@
  AC_SUBST([PACKAGE], [$1])dnl
  AC_SUBST([VERSION], [$2])],
 [_AM_SET_OPTIONS([$1])dnl
+dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
+m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
+  [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
  AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
  AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
 
@@ -442,6 +632,10 @@
                   [_AM_DEPENDENCIES(CXX)],
                   [define([AC_PROG_CXX],
                           defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
+AC_PROVIDE_IFELSE([AC_PROG_OBJC],
+                  [_AM_DEPENDENCIES(OBJC)],
+                  [define([AC_PROG_OBJC],
+                          defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
 ])
 ])
 
@@ -477,7 +671,7 @@
 # Define $install_sh.
 AC_DEFUN([AM_PROG_INSTALL_SH],
 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-install_sh=${install_sh-"$am_aux_dir/install-sh"}
+install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
 AC_SUBST(install_sh)])
 
 # Copyright (C) 2003, 2005  Free Software Foundation, Inc.
@@ -501,6 +695,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.
@@ -555,14 +778,14 @@
 
 # Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
 
-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005
+# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005
 # Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 4
+# serial 5
 
 # AM_MISSING_PROG(NAME, PROGRAM)
 # ------------------------------
@@ -578,6 +801,7 @@
 # If it does, set am_missing_run to use it, otherwise, to nothing.
 AC_DEFUN([AM_MISSING_HAS_RUN],
 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+AC_REQUIRE_AUX_FILE([missing])dnl
 test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
 # Use eval to expand $SHELL
 if eval "$MISSING --run true"; then
@@ -588,7 +812,7 @@
 fi
 ])
 
-# Copyright (C) 2003, 2004, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -596,60 +820,23 @@
 
 # AM_PROG_MKDIR_P
 # ---------------
-# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise.
-#
-# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories
-# created by `make install' are always world readable, even if the
-# installer happens to have an overly restrictive umask (e.g. 077).
-# This was a mistake.  There are at least two reasons why we must not
-# use `-m 0755':
-#   - it causes special bits like SGID to be ignored,
-#   - it may be too restrictive (some setups expect 775 directories).
-#
-# Do not use -m 0755 and let people choose whatever they expect by
-# setting umask.
-#
-# We cannot accept any implementation of `mkdir' that recognizes `-p'.
-# Some implementations (such as Solaris 8's) are not thread-safe: if a
-# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c'
-# concurrently, both version can detect that a/ is missing, but only
-# one can create it and the other will error out.  Consequently we
-# restrict ourselves to GNU make (using the --version option ensures
-# this.)
+# Check for `mkdir -p'.
 AC_DEFUN([AM_PROG_MKDIR_P],
-[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
-  # We used to keeping the `.' as first argument, in order to
-  # allow $(mkdir_p) to be used without argument.  As in
-  #   $(mkdir_p) $(somedir)
-  # where $(somedir) is conditionally defined.  However this is wrong
-  # for two reasons:
-  #  1. if the package is installed by a user who cannot write `.'
-  #     make install will fail,
-  #  2. the above comment should most certainly read
-  #     $(mkdir_p) $(DESTDIR)$(somedir)
-  #     so it does not work when $(somedir) is undefined and
-  #     $(DESTDIR) is not.
-  #  To support the latter case, we have to write
-  #     test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
-  #  so the `.' trick is pointless.
-  mkdir_p='mkdir -p --'
-else
-  # On NextStep and OpenStep, the `mkdir' command does not
-  # recognize any option.  It will interpret all options as
-  # directories to create, and then abort because `.' already
-  # exists.
-  for d in ./-p ./--version;
-  do
-    test -d $d && rmdir $d
-  done
-  # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
-  if test -f "$ac_aux_dir/mkinstalldirs"; then
-    mkdir_p='$(mkinstalldirs)'
-  else
-    mkdir_p='$(install_sh) -d'
-  fi
-fi
-AC_SUBST([mkdir_p])])
+[AC_PREREQ([2.60])dnl
+AC_REQUIRE([AC_PROG_MKDIR_P])dnl
+dnl Automake 1.8 to 1.9.6 used to define mkdir_p.  We now use MKDIR_P,
+dnl while keeping a definition of mkdir_p for backward compatibility.
+dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
+dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
+dnl Makefile.ins that do not define MKDIR_P, so we do our own
+dnl adjustment using top_builddir (which is defined more often than
+dnl MKDIR_P).
+AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
+case $mkdir_p in
+  [[\\/$]]* | ?:[[\\/]]*) ;;
+  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
+esac
+])
 
 # Helper functions for option handling.                     -*- Autoconf -*-
 
@@ -761,9 +948,21 @@
 if test "$cross_compiling" != no; then
   AC_CHECK_TOOL([STRIP], [strip], :)
 fi
-INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 AC_SUBST([INSTALL_STRIP_PROGRAM])])
 
+# Copyright (C) 2006  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# _AM_SUBST_NOTMAKE(VARIABLE)
+# ---------------------------
+# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in.
+# This macro is traced by Automake.
+AC_DEFUN([_AM_SUBST_NOTMAKE])
+
 # Check how to create a tarball.                            -*- Autoconf -*-
 
 # Copyright (C) 2004, 2005  Free Software Foundation, Inc.
--- kdelibs-3.5.7.orig/kparts/tests/Makefile.in
+++ kdelibs-3.5.7/kparts/tests/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,15 +16,11 @@
 @SET_MAKE@
 
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -78,11 +74,25 @@
 #>- libnotepadpart_la_OBJECTS = $(am_libnotepadpart_la_OBJECTS)
 #>+ 1
 libnotepadpart_la_OBJECTS = notepadpart.lo
+#>- libnotepadpart_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(libnotepadpart_la_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+libnotepadpart_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(libnotepadpart_la_LDFLAGS) $(LDFLAGS) -o $@
 libspellcheckplugin_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
 am_libspellcheckplugin_la_OBJECTS = plugin_spellcheck.lo
 #>- libspellcheckplugin_la_OBJECTS = $(am_libspellcheckplugin_la_OBJECTS)
 #>+ 1
 libspellcheckplugin_la_OBJECTS = plugin_spellcheck.lo
+#>- libspellcheckplugin_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(libspellcheckplugin_la_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+libspellcheckplugin_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(libspellcheckplugin_la_LDFLAGS) $(LDFLAGS) -o $@
 am_ghostviewtest_OBJECTS = ghostview.$(OBJEXT)
 #>- ghostviewtest_OBJECTS = $(am_ghostviewtest_OBJECTS)
 #>+ 1
@@ -104,7 +114,7 @@
 @KDE_USE_FINAL_FALSE@normalktmtest_OBJECTS = $(normalktmtest_nofinal_OBJECTS)
 @KDE_USE_FINAL_TRUE@normalktmtest_OBJECTS = $(normalktmtest_final_OBJECTS)
 normalktmtest_DEPENDENCIES = libnotepad.la $(am__DEPENDENCIES_1)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -112,19 +122,21 @@
 #>+ 2
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 #>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
 CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 3
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(libnotepad_la_SOURCES) $(libnotepadpart_la_SOURCES) \
 	$(libspellcheckplugin_la_SOURCES) $(ghostviewtest_SOURCES) \
 	$(kpartstest_SOURCES) $(normalktmtest_SOURCES)
@@ -146,8 +158,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -155,13 +165,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -175,8 +185,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -197,17 +205,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -276,7 +281,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -313,12 +317,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -363,87 +369,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -467,75 +429,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -543,16 +447,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -596,7 +499,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -634,13 +537,13 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
+	test -z "$(kde_moduledir)" || $(MKDIR_P) "$(DESTDIR)$(kde_moduledir)"
 	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
@@ -651,7 +554,7 @@
 
 uninstall-kde_moduleLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
@@ -675,17 +578,11 @@
 	  rm -f "$${dir}/so_locations"; \
 	done
 libnotepad.la: $(libnotepad_la_OBJECTS) $(libnotepad_la_DEPENDENCIES) 
-	$(CXXLINK)  $(libnotepad_la_LDFLAGS) $(libnotepad_la_OBJECTS) $(libnotepad_la_LIBADD) $(LIBS)
-#>- libnotepadpart.la: $(libnotepadpart_la_OBJECTS) $(libnotepadpart_la_DEPENDENCIES) 
-#>+ 2
-@KDE_USE_CLOSURE_TRUE@libnotepadpart.la: libnotepadpart.la.closure $(libnotepadpart_la_OBJECTS) $(libnotepadpart_la_DEPENDENCIES) 
-@KDE_USE_CLOSURE_FALSE@libnotepadpart.la: $(libnotepadpart_la_OBJECTS) $(libnotepadpart_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(kde_moduledir) $(libnotepadpart_la_LDFLAGS) $(libnotepadpart_la_OBJECTS) $(libnotepadpart_la_LIBADD) $(LIBS)
-#>- libspellcheckplugin.la: $(libspellcheckplugin_la_OBJECTS) $(libspellcheckplugin_la_DEPENDENCIES) 
-#>+ 2
-@KDE_USE_CLOSURE_TRUE@libspellcheckplugin.la: libspellcheckplugin.la.closure $(libspellcheckplugin_la_OBJECTS) $(libspellcheckplugin_la_DEPENDENCIES) 
-@KDE_USE_CLOSURE_FALSE@libspellcheckplugin.la: $(libspellcheckplugin_la_OBJECTS) $(libspellcheckplugin_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(kde_moduledir) $(libspellcheckplugin_la_LDFLAGS) $(libspellcheckplugin_la_OBJECTS) $(libspellcheckplugin_la_LIBADD) $(LIBS)
+	$(CXXLINK)  $(libnotepad_la_OBJECTS) $(libnotepad_la_LIBADD) $(LIBS)
+libnotepadpart.la: $(libnotepadpart_la_OBJECTS) $(libnotepadpart_la_DEPENDENCIES) 
+	$(libnotepadpart_la_LINK) -rpath $(kde_moduledir) $(libnotepadpart_la_OBJECTS) $(libnotepadpart_la_LIBADD) $(LIBS)
+libspellcheckplugin.la: $(libspellcheckplugin_la_OBJECTS) $(libspellcheckplugin_la_DEPENDENCIES) 
+	$(libspellcheckplugin_la_LINK) -rpath $(kde_moduledir) $(libspellcheckplugin_la_OBJECTS) $(libspellcheckplugin_la_LIBADD) $(LIBS)
 
 clean-checkPROGRAMS:
 	@list='$(check_PROGRAMS)'; for p in $$list; do \
@@ -695,13 +592,13 @@
 	done
 ghostviewtest$(EXEEXT): $(ghostviewtest_OBJECTS) $(ghostviewtest_DEPENDENCIES) 
 	@rm -f ghostviewtest$(EXEEXT)
-	$(CXXLINK) $(ghostviewtest_LDFLAGS) $(ghostviewtest_OBJECTS) $(ghostviewtest_LDADD) $(LIBS)
+	$(CXXLINK) $(ghostviewtest_OBJECTS) $(ghostviewtest_LDADD) $(LIBS)
 kpartstest$(EXEEXT): $(kpartstest_OBJECTS) $(kpartstest_DEPENDENCIES) 
 	@rm -f kpartstest$(EXEEXT)
-	$(CXXLINK) $(kpartstest_LDFLAGS) $(kpartstest_OBJECTS) $(kpartstest_LDADD) $(LIBS)
+	$(CXXLINK) $(kpartstest_OBJECTS) $(kpartstest_LDADD) $(LIBS)
 normalktmtest$(EXEEXT): $(normalktmtest_OBJECTS) $(normalktmtest_DEPENDENCIES) 
 	@rm -f normalktmtest$(EXEEXT)
-	$(CXXLINK) $(normalktmtest_LDFLAGS) $(normalktmtest_OBJECTS) $(normalktmtest_LDADD) $(LIBS)
+	$(CXXLINK) $(normalktmtest_OBJECTS) $(normalktmtest_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -718,22 +615,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/plugin_spellcheck.Plo@am__quote@
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -743,13 +640,9 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 install-ghostviewtestDATA: $(ghostviewtest_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(ghostviewtestdir)" || $(mkdir_p) "$(DESTDIR)$(ghostviewtestdir)"
+	test -z "$(ghostviewtestdir)" || $(MKDIR_P) "$(DESTDIR)$(ghostviewtestdir)"
 	@list='$(ghostviewtest_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -766,7 +659,7 @@
 	done
 install-notepadDATA: $(notepad_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(notepaddir)" || $(mkdir_p) "$(DESTDIR)$(notepaddir)"
+	test -z "$(notepaddir)" || $(MKDIR_P) "$(DESTDIR)$(notepaddir)"
 	@list='$(notepad_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -783,7 +676,7 @@
 	done
 install-pluginsDATA: $(plugins_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(pluginsdir)" || $(mkdir_p) "$(DESTDIR)$(pluginsdir)"
+	test -z "$(pluginsdir)" || $(MKDIR_P) "$(DESTDIR)$(pluginsdir)"
 	@list='$(plugins_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -800,7 +693,7 @@
 	done
 install-rcDATA: $(rc_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(rcdir)" || $(mkdir_p) "$(DESTDIR)$(rcdir)"
+	test -z "$(rcdir)" || $(MKDIR_P) "$(DESTDIR)$(rcdir)"
 	@list='$(rc_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -817,7 +710,7 @@
 	done
 install-testpartDATA: $(testpart_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(testpartdir)" || $(mkdir_p) "$(DESTDIR)$(testpartdir)"
+	test -z "$(testpartdir)" || $(MKDIR_P) "$(DESTDIR)$(testpartdir)"
 	@list='$(testpart_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -882,22 +775,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -914,7 +806,7 @@
 all-am: Makefile $(LTLIBRARIES) $(DATA)
 installdirs:
 	for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(ghostviewtestdir)" "$(DESTDIR)$(notepaddir)" "$(DESTDIR)$(pluginsdir)" "$(DESTDIR)$(rcdir)" "$(DESTDIR)$(testpartdir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -948,7 +840,7 @@
 #>- 	clean-kde_moduleLTLIBRARIES clean-libtool \
 #>- 	clean-noinstLTLIBRARIES mostlyclean-am
 #>+ 3
-clean-am: clean-metasources clean-closures clean-bcheck clean-final  clean-checkPROGRAMS clean-generic \
+clean-am: clean-metasources clean-bcheck clean-final  clean-checkPROGRAMS clean-generic \
 	clean-kde_moduleLTLIBRARIES clean-libtool \
 	clean-noinstLTLIBRARIES mostlyclean-am
 
@@ -956,7 +848,7 @@
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
@@ -976,14 +868,22 @@
  install-notepadDATA \
 	install-pluginsDATA install-rcDATA install-testpartDATA
 
+install-dvi: install-dvi-am
+
 #>- install-exec-am:
 #>+ 1
 install-exec-am:  install-kde_moduleLTLIBRARIES
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -1004,27 +904,30 @@
 
 ps-am:
 
-uninstall-am: uninstall-ghostviewtestDATA uninstall-info-am \
+uninstall-am: uninstall-ghostviewtestDATA \
 	uninstall-kde_moduleLTLIBRARIES uninstall-notepadDATA \
 	uninstall-pluginsDATA uninstall-rcDATA uninstall-testpartDATA
 
+.MAKE: install-am install-strip
+
 .PHONY: CTAGS GTAGS all all-am check check-am clean \
 	clean-checkPROGRAMS clean-generic clean-kde_moduleLTLIBRARIES \
 	clean-libtool clean-noinstLTLIBRARIES ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
 	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-exec \
-	install-exec-am install-ghostviewtestDATA install-info \
-	install-info-am install-kde_moduleLTLIBRARIES install-man \
-	install-notepadDATA install-pluginsDATA install-rcDATA \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am \
+	install-ghostviewtestDATA install-html install-html-am \
+	install-info install-info-am install-kde_moduleLTLIBRARIES \
+	install-man install-notepadDATA install-pdf install-pdf-am \
+	install-pluginsDATA install-ps install-ps-am install-rcDATA \
 	install-strip install-testpartDATA installcheck \
 	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 	tags uninstall uninstall-am uninstall-ghostviewtestDATA \
-	uninstall-info-am uninstall-kde_moduleLTLIBRARIES \
-	uninstall-notepadDATA uninstall-pluginsDATA uninstall-rcDATA \
-	uninstall-testpartDATA
+	uninstall-kde_moduleLTLIBRARIES uninstall-notepadDATA \
+	uninstall-pluginsDATA uninstall-rcDATA uninstall-testpartDATA
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
@@ -1072,24 +975,6 @@
 #>+ 2
 mocs: plugin_spellcheck.moc
 
-#>+ 8
-libnotepadpart.la.closure: $(libnotepadpart_la_OBJECTS) $(libnotepadpart_la_DEPENDENCIES)
-	@echo "int main() {return 0;}" > libnotepadpart_la_closure.cpp
-	@$(LTCXXCOMPILE) -c libnotepadpart_la_closure.cpp
-	$(CXXLINK) libnotepadpart_la_closure.lo $(libnotepadpart_la_LDFLAGS) $(libnotepadpart_la_OBJECTS) $(libnotepadpart_la_LIBADD) $(LIBS)
-	@rm -f libnotepadpart_la_closure.* libnotepadpart.la.closure
-	@echo "timestamp" > libnotepadpart.la.closure
-
-
-#>+ 8
-libspellcheckplugin.la.closure: $(libspellcheckplugin_la_OBJECTS) $(libspellcheckplugin_la_DEPENDENCIES)
-	@echo "int main() {return 0;}" > libspellcheckplugin_la_closure.cpp
-	@$(LTCXXCOMPILE) -c libspellcheckplugin_la_closure.cpp
-	$(CXXLINK) libspellcheckplugin_la_closure.lo $(libspellcheckplugin_la_LDFLAGS) $(libspellcheckplugin_la_OBJECTS) $(libspellcheckplugin_la_LIBADD) $(LIBS)
-	@rm -f libspellcheckplugin_la_closure.* libspellcheckplugin.la.closure
-	@echo "timestamp" > libspellcheckplugin.la.closure
-
-
 #>+ 3
 clean-metasources:
 	-rm -f  ghostview.moc normalktm.moc example.moc notepad.moc parts.moc plugin_spellcheck.moc
@@ -1097,10 +982,6 @@
 #>+ 2
 KDE_DIST=plugin_spellcheck.h plugin_foobar.rc notepadpart.rc plugin_spellcheck.rc parts.h Makefile.in ghostview.h notepad.desktop kpartstest_part1.rc kpartstest_shell.rc normalktm.h notepad.h ghostviewtest_shell.rc example.h Makefile.am 
 
-#>+ 3
-clean-closures:
-	-rm -f  libnotepadpart.la.closure libspellcheckplugin.la.closure
-
 #>+ 2
 docs-am:
 
--- kdelibs-3.5.7.orig/kparts/Makefile.in
+++ kdelibs-3.5.7/kparts/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -19,15 +19,11 @@
 
 
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -82,7 +78,14 @@
 	browserrun.lo statusbarextension.lo
 @KDE_USE_FINAL_FALSE@libkparts_la_OBJECTS = $(libkparts_la_nofinal_OBJECTS)
 @KDE_USE_FINAL_TRUE@libkparts_la_OBJECTS = $(libkparts_la_final_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+#>- libkparts_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(libkparts_la_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+libkparts_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(libkparts_la_LDFLAGS) $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -90,19 +93,21 @@
 #>+ 2
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
-#>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+#>+ 3
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
 CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 3
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(libkparts_la_SOURCES)
 DIST_SOURCES = $(libkparts_la_SOURCES)
 servicetypeDATA_INSTALL = $(INSTALL_DATA)
@@ -117,8 +122,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -126,13 +129,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -146,8 +149,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -168,17 +169,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -247,7 +245,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -284,12 +281,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -334,87 +333,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -438,75 +393,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -514,16 +411,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -533,9 +429,7 @@
 INCLUDES = -I$(srcdir)/../ -I$(top_srcdir)/kio/ -I$(top_srcdir)/libltdl \
 	-I$(top_srcdir)/kfile $(all_includes)
 
-#>- libkparts_la_LDFLAGS = $(KDE_MT_LDFLAGS) -version-info 3:0:1 -no-undefined
-#>+ 1
-libkparts_la_LDFLAGS = $(KDE_MT_LDFLAGS) -version-info 3:0:1 -no-undefined $(KDE_NO_UNDEFINED)
+libkparts_la_LDFLAGS = $(KDE_MT_LDFLAGS) -version-info 3:0:1 -no-undefined
 libkparts_la_LIBADD = $(LIB_KIO)
 
 ####### Files
@@ -559,7 +453,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(srcdir)/../admin/Doxyfile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../admin/Doxyfile.am $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -597,13 +491,13 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
@@ -614,7 +508,7 @@
 
 uninstall-libLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
@@ -628,11 +522,8 @@
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
-#>- libkparts.la: $(libkparts_la_OBJECTS) $(libkparts_la_DEPENDENCIES) 
-#>+ 2
-@KDE_USE_CLOSURE_TRUE@libkparts.la: libkparts.la.closure $(libkparts_la_OBJECTS) $(libkparts_la_DEPENDENCIES) 
-@KDE_USE_CLOSURE_FALSE@libkparts.la: $(libkparts_la_OBJECTS) $(libkparts_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(libdir) $(libkparts_la_LDFLAGS) $(libkparts_la_OBJECTS) $(libkparts_la_LIBADD) $(LIBS)
+libkparts.la: $(libkparts_la_OBJECTS) $(libkparts_la_DEPENDENCIES) 
+	$(libkparts_la_LINK) -rpath $(libdir) $(libkparts_la_OBJECTS) $(libkparts_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -654,22 +545,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/statusbarextension.Plo@am__quote@
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -679,13 +570,9 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 install-servicetypeDATA: $(servicetype_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(servicetypedir)" || $(mkdir_p) "$(DESTDIR)$(servicetypedir)"
+	test -z "$(servicetypedir)" || $(MKDIR_P) "$(DESTDIR)$(servicetypedir)"
 	@list='$(servicetype_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -702,7 +589,7 @@
 	done
 install-kpartsincludeHEADERS: $(kpartsinclude_HEADERS)
 	@$(NORMAL_INSTALL)
-	test -z "$(kpartsincludedir)" || $(mkdir_p) "$(DESTDIR)$(kpartsincludedir)"
+	test -z "$(kpartsincludedir)" || $(MKDIR_P) "$(DESTDIR)$(kpartsincludedir)"
 	@list='$(kpartsinclude_HEADERS)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -767,23 +654,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	$(mkdir_p) $(distdir)/../admin
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -800,7 +685,7 @@
 all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS)
 installdirs:
 	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(servicetypedir)" "$(DESTDIR)$(kpartsincludedir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -833,14 +718,14 @@
 #>- clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
 #>- 	mostlyclean-am
 #>+ 2
-clean-am: clean-metasources clean-closures clean-bcheck clean-final  clean-generic clean-libLTLIBRARIES clean-libtool \
+clean-am: clean-metasources clean-bcheck clean-final  clean-generic clean-libLTLIBRARIES clean-libtool \
 	mostlyclean-am
 
 distclean: distclean-am
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
@@ -855,12 +740,20 @@
 install-data-am: install-data-local install-kpartsincludeHEADERS \
 	install-servicetypeDATA
 
+install-dvi: install-dvi-am
+
 install-exec-am: install-libLTLIBRARIES
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -881,25 +774,27 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-kpartsincludeHEADERS \
-	uninstall-libLTLIBRARIES uninstall-local \
-	uninstall-servicetypeDATA
+uninstall-am: uninstall-kpartsincludeHEADERS uninstall-libLTLIBRARIES \
+	uninstall-local uninstall-servicetypeDATA
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am check-local clean \
 	clean-generic clean-libLTLIBRARIES clean-libtool ctags \
 	distclean distclean-compile distclean-generic \
 	distclean-libtool distclean-tags distdir dvi dvi-am html \
 	html-am info info-am install install-am install-data \
-	install-data-am install-data-local install-exec \
-	install-exec-am install-info install-info-am \
-	install-kpartsincludeHEADERS install-libLTLIBRARIES \
-	install-man install-servicetypeDATA install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
+	install-data-am install-data-local install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-kpartsincludeHEADERS \
+	install-libLTLIBRARIES install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-servicetypeDATA install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-info-am \
-	uninstall-kpartsincludeHEADERS uninstall-libLTLIBRARIES \
-	uninstall-local uninstall-servicetypeDATA
+	tags uninstall uninstall-am uninstall-kpartsincludeHEADERS \
+	uninstall-libLTLIBRARIES uninstall-local \
+	uninstall-servicetypeDATA
 
 
 check-local:
@@ -1000,15 +895,6 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
-#>+ 8
-libkparts.la.closure: $(libkparts_la_OBJECTS) $(libkparts_la_DEPENDENCIES)
-	@echo "int main() {return 0;}" > libkparts_la_closure.cpp
-	@$(LTCXXCOMPILE) -c libkparts_la_closure.cpp
-	$(CXXLINK) libkparts_la_closure.lo $(libkparts_la_LDFLAGS) $(libkparts_la_OBJECTS) $(libkparts_la_LIBADD) $(LIBS)
-	@rm -f libkparts_la_closure.* libkparts.la.closure
-	@echo "timestamp" > libkparts.la.closure
-
-
 #>+ 3
 factory.moc: $(srcdir)/factory.h
 	$(MOC) $(srcdir)/factory.h -o factory.moc
@@ -1093,10 +979,6 @@
 #>+ 2
 KDE_DIST=krop.desktop Makefile.in COMMENTS design.h krwp.desktop kpart.desktop browserview.desktop Makefile.am 
 
-#>+ 3
-clean-closures:
-	-rm -f  libkparts.la.closure
-
 #>+ 2
 docs-am:
 
--- kdelibs-3.5.7.orig/kwallet/tests/Makefile.in
+++ kdelibs-3.5.7/kwallet/tests/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,15 +14,11 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -64,6 +60,13 @@
 kwalletasync_DEPENDENCIES =  \
 	$(top_builddir)/kwallet/client/libkwalletclient.la \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+#>- kwalletasync_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(kwalletasync_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+kwalletasync_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(kwalletasync_LDFLAGS) $(LDFLAGS) -o $@
 am_kwalletboth_OBJECTS = kwalletboth.$(OBJEXT) kwallettest.$(OBJEXT)
 #>- kwalletboth_OBJECTS = $(am_kwalletboth_OBJECTS)
 #>+ 4
@@ -74,6 +77,13 @@
 kwalletboth_DEPENDENCIES =  \
 	$(top_builddir)/kwallet/client/libkwalletclient.la \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+#>- kwalletboth_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(kwalletboth_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+kwalletboth_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(kwalletboth_LDFLAGS) $(LDFLAGS) -o $@
 am_kwalletsync_OBJECTS = kwalletsync.$(OBJEXT)
 #>- kwalletsync_OBJECTS = $(am_kwalletsync_OBJECTS)
 #>+ 1
@@ -81,7 +91,14 @@
 kwalletsync_DEPENDENCIES =  \
 	$(top_builddir)/kwallet/client/libkwalletclient.la \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+#>- kwalletsync_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(kwalletsync_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+kwalletsync_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(kwalletsync_LDFLAGS) $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -89,19 +106,21 @@
 #>+ 2
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
-#>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+#>+ 3
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
 CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 3
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(kwalletasync_SOURCES) $(kwalletboth_SOURCES) \
 	$(kwalletsync_SOURCES)
 DIST_SOURCES = $(kwalletasync_SOURCES) $(kwalletboth_SOURCES) \
@@ -114,8 +133,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -123,13 +140,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -143,8 +160,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -165,17 +180,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -244,7 +256,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -281,12 +292,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -331,87 +344,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -435,75 +404,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -511,16 +422,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -550,7 +460,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -588,9 +498,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 clean-checkPROGRAMS:
@@ -601,13 +511,13 @@
 	done
 kwalletasync$(EXEEXT): $(kwalletasync_OBJECTS) $(kwalletasync_DEPENDENCIES) 
 	@rm -f kwalletasync$(EXEEXT)
-	$(CXXLINK) $(kwalletasync_LDFLAGS) $(kwalletasync_OBJECTS) $(kwalletasync_LDADD) $(LIBS)
+	$(kwalletasync_LINK) $(kwalletasync_OBJECTS) $(kwalletasync_LDADD) $(LIBS)
 kwalletboth$(EXEEXT): $(kwalletboth_OBJECTS) $(kwalletboth_DEPENDENCIES) 
 	@rm -f kwalletboth$(EXEEXT)
-	$(CXXLINK) $(kwalletboth_LDFLAGS) $(kwalletboth_OBJECTS) $(kwalletboth_LDADD) $(LIBS)
+	$(kwalletboth_LINK) $(kwalletboth_OBJECTS) $(kwalletboth_LDADD) $(LIBS)
 kwalletsync$(EXEEXT): $(kwalletsync_OBJECTS) $(kwalletsync_DEPENDENCIES) 
 	@rm -f kwalletsync$(EXEEXT)
-	$(CXXLINK) $(kwalletsync_LDFLAGS) $(kwalletsync_OBJECTS) $(kwalletsync_LDADD) $(LIBS)
+	$(kwalletsync_LINK) $(kwalletsync_OBJECTS) $(kwalletsync_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -621,22 +531,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kwallettest.Po@am__quote@
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -647,10 +557,6 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -700,22 +606,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -769,7 +674,7 @@
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
@@ -783,12 +688,20 @@
 
 install-data-am:
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -809,19 +722,23 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am
+uninstall-am:
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean \
 	clean-checkPROGRAMS clean-generic clean-libtool ctags \
 	distclean distclean-compile distclean-generic \
 	distclean-libtool distclean-tags distdir dvi dvi-am html \
 	html-am info info-am install install-am install-data \
-	install-data-am install-exec install-exec-am install-info \
-	install-info-am install-man install-strip installcheck \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
 	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-info-am
+	tags uninstall uninstall-am
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- kdelibs-3.5.7.orig/kwallet/client/Makefile.in
+++ kdelibs-3.5.7/kwallet/client/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,15 +16,11 @@
 @SET_MAKE@
 
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -72,7 +68,14 @@
 libkwalletclient_la_nofinal_OBJECTS = kwallet.lo kwallet_skel.lo
 @KDE_USE_FINAL_FALSE@libkwalletclient_la_OBJECTS = $(libkwalletclient_la_nofinal_OBJECTS)
 @KDE_USE_FINAL_TRUE@libkwalletclient_la_OBJECTS = $(libkwalletclient_la_final_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+#>- libkwalletclient_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(libkwalletclient_la_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+libkwalletclient_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(libkwalletclient_la_LDFLAGS) $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -80,19 +83,21 @@
 #>+ 2
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
-#>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+#>+ 3
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
 CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 3
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(libkwalletclient_la_SOURCES)
 DIST_SOURCES = $(libkwalletclient_la_SOURCES)
 includeHEADERS_INSTALL = $(INSTALL_HEADER)
@@ -105,8 +110,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -114,13 +117,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -134,8 +137,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -156,17 +157,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -235,7 +233,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -272,12 +269,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -322,87 +321,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -426,75 +381,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -502,16 +399,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -519,9 +415,7 @@
 xdg_menudir = @xdg_menudir@
 INCLUDES = -I$(srcdir) $(all_includes)
 lib_LTLIBRARIES = libkwalletclient.la
-#>- libkwalletclient_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:1 -no-undefined
-#>+ 1
-libkwalletclient_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:1 -no-undefined $(KDE_NO_UNDEFINED)
+libkwalletclient_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:1 -no-undefined
 libkwalletclient_la_LIBADD = $(LIB_KDECORE)
 #>- libkwalletclient_la_SOURCES = kwallet.skel \
 #>- 				kwallet.cc
@@ -537,7 +431,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cc .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -575,13 +469,13 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
@@ -592,7 +486,7 @@
 
 uninstall-libLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
@@ -606,11 +500,8 @@
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
-#>- libkwalletclient.la: $(libkwalletclient_la_OBJECTS) $(libkwalletclient_la_DEPENDENCIES) 
-#>+ 2
-@KDE_USE_CLOSURE_TRUE@libkwalletclient.la: libkwalletclient.la.closure $(libkwalletclient_la_OBJECTS) $(libkwalletclient_la_DEPENDENCIES) 
-@KDE_USE_CLOSURE_FALSE@libkwalletclient.la: $(libkwalletclient_la_OBJECTS) $(libkwalletclient_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(libdir) $(libkwalletclient_la_LDFLAGS) $(libkwalletclient_la_OBJECTS) $(libkwalletclient_la_LIBADD) $(LIBS)
+libkwalletclient.la: $(libkwalletclient_la_OBJECTS) $(libkwalletclient_la_DEPENDENCIES) 
+	$(libkwalletclient_la_LINK) -rpath $(libdir) $(libkwalletclient_la_OBJECTS) $(libkwalletclient_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -621,22 +512,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kwallet.Plo@am__quote@
 
 .cc.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cc.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cc.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -646,13 +537,9 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 install-includeHEADERS: $(include_HEADERS)
 	@$(NORMAL_INSTALL)
-	test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"
+	test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)"
 	@list='$(include_HEADERS)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -717,22 +604,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -748,7 +634,7 @@
 all-am: Makefile $(LTLIBRARIES) $(HEADERS)
 installdirs:
 	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -781,14 +667,14 @@
 #>- clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
 #>- 	mostlyclean-am
 #>+ 2
-clean-am: clean-metasources clean-idl clean-closures clean-bcheck clean-final  clean-generic clean-libLTLIBRARIES clean-libtool \
+clean-am: clean-metasources clean-idl clean-bcheck clean-final  clean-generic clean-libLTLIBRARIES clean-libtool \
 	mostlyclean-am
 
 distclean: distclean-am
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
@@ -802,12 +688,20 @@
 
 install-data-am: install-includeHEADERS
 
+install-dvi: install-dvi-am
+
 install-exec-am: install-libLTLIBRARIES
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -828,21 +722,23 @@
 
 ps-am:
 
-uninstall-am: uninstall-includeHEADERS uninstall-info-am \
-	uninstall-libLTLIBRARIES
+uninstall-am: uninstall-includeHEADERS uninstall-libLTLIBRARIES
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-libLTLIBRARIES clean-libtool ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
 	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-exec \
-	install-exec-am install-includeHEADERS install-info \
-	install-info-am install-libLTLIBRARIES install-man \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-	pdf pdf-am ps ps-am tags uninstall uninstall-am \
-	uninstall-includeHEADERS uninstall-info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-includeHEADERS install-info \
+	install-info-am install-libLTLIBRARIES install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags uninstall uninstall-am uninstall-includeHEADERS \
 	uninstall-libLTLIBRARIES
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
@@ -855,15 +751,6 @@
 kwallet_skel.cc: kwallet.kidl
 	$(DCOPIDL2CPP) --c++-suffix cc --no-signals --no-stub kwallet.kidl
 
-#>+ 8
-libkwalletclient.la.closure: $(libkwalletclient_la_OBJECTS) $(libkwalletclient_la_DEPENDENCIES)
-	@echo "int main() {return 0;}" > libkwalletclient_la_closure.cc
-	@$(LTCXXCOMPILE) -c libkwalletclient_la_closure.cc
-	$(CXXLINK) libkwalletclient_la_closure.lo $(libkwalletclient_la_LDFLAGS) $(libkwalletclient_la_OBJECTS) $(libkwalletclient_la_LIBADD) $(LIBS)
-	@rm -f libkwalletclient_la_closure.* libkwalletclient.la.closure
-	@echo "timestamp" > libkwalletclient.la.closure
-
-
 #>+ 3
 kwallet.moc: $(srcdir)/kwallet.h
 	$(MOC) $(srcdir)/kwallet.h -o kwallet.moc
@@ -883,10 +770,6 @@
 	-rm -f \
 	kwallet_skel.cc kwallet_skel.h kwallet.kidl 
 
-#>+ 3
-clean-closures:
-	-rm -f  libkwalletclient.la.closure
-
 #>+ 2
 docs-am:
 
--- kdelibs-3.5.7.orig/kwallet/Makefile.in
+++ kdelibs-3.5.7/kwallet/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,15 +14,11 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -56,17 +52,21 @@
 DIST_SOURCES =
 #>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 #>- 	html-recursive info-recursive install-data-recursive \
-#>- 	install-exec-recursive install-info-recursive \
-#>- 	install-recursive installcheck-recursive installdirs-recursive \
-#>- 	pdf-recursive ps-recursive uninstall-info-recursive \
-#>- 	uninstall-recursive
-#>+ 6
+#>- 	install-dvi-recursive install-exec-recursive \
+#>- 	install-html-recursive install-info-recursive \
+#>- 	install-pdf-recursive install-ps-recursive install-recursive \
+#>- 	installcheck-recursive installdirs-recursive pdf-recursive \
+#>- 	ps-recursive uninstall-recursive
+#>+ 7
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	html-recursive info-recursive install-data-recursive \
-	install-exec-recursive install-info-recursive \
-	install-recursive installcheck-recursive installdirs-recursive \
-	pdf-recursive ps-recursive uninstall-info-recursive \
-	uninstall-recursive nmcheck-recursive bcheck-recursive
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive nmcheck-recursive bcheck-recursive
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
@@ -76,8 +76,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -85,13 +83,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -105,8 +103,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -127,17 +123,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -206,7 +199,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -243,12 +235,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -293,87 +287,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -397,75 +347,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -473,16 +365,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -496,7 +387,7 @@
 all: docs-am  all-recursive
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(srcdir)/../admin/Doxyfile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../admin/Doxyfile.am $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -534,9 +425,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 mostlyclean-libtool:
@@ -545,10 +436,6 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
 # To change the values of `make' variables: instead of editing Makefiles,
@@ -580,8 +467,7 @@
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
+$(RECURSIVE_CLEAN_TARGETS):
 	@failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
@@ -682,23 +568,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	$(mkdir_p) $(distdir)/../admin
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -712,7 +596,7 @@
 	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
-	    || $(mkdir_p) "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 	    || exit 1; \
 	    distdir=`$(am__cd) $(distdir) && pwd`; \
 	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
@@ -720,6 +604,8 @@
 	      $(MAKE) $(AM_MAKEFLAGS) \
 	        top_distdir="$$top_distdir" \
 	        distdir="$$distdir/$$subdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -763,8 +649,7 @@
 
 distclean: distclean-recursive
 	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool \
-	distclean-tags
+distclean-am: clean-am distclean-generic distclean-tags
 
 dvi: dvi-recursive
 
@@ -778,12 +663,20 @@
 
 install-data-am: install-data-local
 
+install-dvi: install-dvi-recursive
+
 install-exec-am:
 
+install-html: install-html-recursive
+
 install-info: install-info-recursive
 
 install-man:
 
+install-pdf: install-pdf-recursive
+
+install-ps: install-ps-recursive
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
@@ -802,23 +695,24 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-local
+uninstall-am: uninstall-local
 
-uninstall-info: uninstall-info-recursive
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+	install-strip
 
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-	clean clean-generic clean-libtool clean-recursive ctags \
-	ctags-recursive distclean distclean-generic distclean-libtool \
-	distclean-recursive distclean-tags distdir dvi dvi-am html \
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+	all all-am check check-am clean clean-generic clean-libtool \
+	ctags ctags-recursive distclean distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
 	html-am info info-am install install-am install-data \
-	install-data-am install-data-local install-exec \
-	install-exec-am install-info install-info-am install-man \
-	install-strip installcheck installcheck-am installdirs \
-	installdirs-am maintainer-clean maintainer-clean-generic \
-	maintainer-clean-recursive mostlyclean mostlyclean-generic \
-	mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
-	tags tags-recursive uninstall uninstall-am uninstall-info-am \
-	uninstall-local
+	install-data-am install-data-local install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs installdirs-am \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags tags-recursive uninstall uninstall-am uninstall-local
 
 apidox-am-yes:
 	@if test \! -d "$(top_srcdir)/doc/common/" && test -z "$$DOXDATA" ; then \
--- kdelibs-3.5.7.orig/kwallet/backend/tests/Makefile.in
+++ kdelibs-3.5.7/kwallet/backend/tests/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,15 +14,11 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -73,7 +69,7 @@
 testsha_LDADD = $(LDADD)
 testsha_DEPENDENCIES = ../libkwalletbackend.la \
 	../../client/libkwalletclient.la
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -81,19 +77,21 @@
 #>+ 2
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 #>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
 CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 3
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(backendtest_SOURCES) $(testbf_SOURCES) $(testsha_SOURCES)
 DIST_SOURCES = $(backendtest_SOURCES) $(testbf_SOURCES) \
 	$(testsha_SOURCES)
@@ -105,8 +103,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -114,13 +110,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -134,8 +130,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -156,17 +150,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -235,7 +226,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -272,12 +262,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -322,87 +314,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -426,75 +374,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -502,16 +392,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -530,7 +419,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -568,9 +457,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 clean-checkPROGRAMS:
@@ -581,13 +470,13 @@
 	done
 backendtest$(EXEEXT): $(backendtest_OBJECTS) $(backendtest_DEPENDENCIES) 
 	@rm -f backendtest$(EXEEXT)
-	$(CXXLINK) $(backendtest_LDFLAGS) $(backendtest_OBJECTS) $(backendtest_LDADD) $(LIBS)
+	$(CXXLINK) $(backendtest_OBJECTS) $(backendtest_LDADD) $(LIBS)
 testbf$(EXEEXT): $(testbf_OBJECTS) $(testbf_DEPENDENCIES) 
 	@rm -f testbf$(EXEEXT)
-	$(CXXLINK) $(testbf_LDFLAGS) $(testbf_OBJECTS) $(testbf_LDADD) $(LIBS)
+	$(CXXLINK) $(testbf_OBJECTS) $(testbf_LDADD) $(LIBS)
 testsha$(EXEEXT): $(testsha_OBJECTS) $(testsha_DEPENDENCIES) 
 	@rm -f testsha$(EXEEXT)
-	$(CXXLINK) $(testsha_LDFLAGS) $(testsha_OBJECTS) $(testsha_LDADD) $(LIBS)
+	$(CXXLINK) $(testsha_OBJECTS) $(testsha_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -600,22 +489,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testsha.Po@am__quote@
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -626,10 +515,6 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -679,22 +564,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -748,7 +632,7 @@
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
@@ -762,12 +646,20 @@
 
 install-data-am:
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -788,19 +680,23 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am
+uninstall-am:
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean \
 	clean-checkPROGRAMS clean-generic clean-libtool ctags \
 	distclean distclean-compile distclean-generic \
 	distclean-libtool distclean-tags distdir dvi dvi-am html \
 	html-am info info-am install install-am install-data \
-	install-data-am install-exec install-exec-am install-info \
-	install-info-am install-man install-strip installcheck \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
 	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-info-am
+	tags uninstall uninstall-am
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- kdelibs-3.5.7.orig/kwallet/backend/Makefile.in
+++ kdelibs-3.5.7/kwallet/backend/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,15 +16,11 @@
 @SET_MAKE@
 
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -75,7 +71,14 @@
 	sha1.lo kwalletentry.lo kwalletbackend.lo
 @KDE_USE_FINAL_FALSE@libkwalletbackend_la_OBJECTS = $(libkwalletbackend_la_nofinal_OBJECTS)
 @KDE_USE_FINAL_TRUE@libkwalletbackend_la_OBJECTS = $(libkwalletbackend_la_final_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+#>- libkwalletbackend_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(libkwalletbackend_la_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+libkwalletbackend_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(libkwalletbackend_la_LDFLAGS) $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -83,19 +86,21 @@
 #>+ 2
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 #>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
 CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 3
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(libkwalletbackend_la_SOURCES)
 DIST_SOURCES = $(libkwalletbackend_la_SOURCES)
 HEADERS = $(noinst_HEADERS)
@@ -107,8 +112,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -116,13 +119,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -136,8 +139,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -158,17 +159,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -237,7 +235,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -274,12 +271,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -324,87 +323,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -428,75 +383,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -504,16 +401,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -521,9 +417,7 @@
 xdg_menudir = @xdg_menudir@
 INCLUDES = -I$(srcdir)/../client $(all_includes)
 lib_LTLIBRARIES = libkwalletbackend.la
-#>- libkwalletbackend_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:0 -no-undefined
-#>+ 1
-libkwalletbackend_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:0 -no-undefined $(KDE_NO_UNDEFINED)
+libkwalletbackend_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:0 -no-undefined
 libkwalletbackend_la_LIBADD = $(LIB_QT) ../../kdecore/libkdecore.la
 libkwalletbackend_la_SOURCES = blockcipher.cc		\
 			       blowfish.cc		\
@@ -547,7 +441,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cc .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -585,13 +479,13 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
@@ -602,7 +496,7 @@
 
 uninstall-libLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
@@ -616,11 +510,8 @@
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
-#>- libkwalletbackend.la: $(libkwalletbackend_la_OBJECTS) $(libkwalletbackend_la_DEPENDENCIES) 
-#>+ 2
-@KDE_USE_CLOSURE_TRUE@libkwalletbackend.la: libkwalletbackend.la.closure $(libkwalletbackend_la_OBJECTS) $(libkwalletbackend_la_DEPENDENCIES) 
-@KDE_USE_CLOSURE_FALSE@libkwalletbackend.la: $(libkwalletbackend_la_OBJECTS) $(libkwalletbackend_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(libdir) $(libkwalletbackend_la_LDFLAGS) $(libkwalletbackend_la_OBJECTS) $(libkwalletbackend_la_LIBADD) $(LIBS)
+libkwalletbackend.la: $(libkwalletbackend_la_OBJECTS) $(libkwalletbackend_la_DEPENDENCIES) 
+	$(libkwalletbackend_la_LINK) -rpath $(libdir) $(libkwalletbackend_la_OBJECTS) $(libkwalletbackend_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -636,22 +527,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sha1.Plo@am__quote@
 
 .cc.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cc.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cc.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -662,10 +553,6 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -715,22 +602,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -746,7 +632,7 @@
 all-am: Makefile $(LTLIBRARIES) $(HEADERS)
 installdirs:
 	for dir in "$(DESTDIR)$(libdir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -779,14 +665,14 @@
 #>- clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
 #>- 	mostlyclean-am
 #>+ 2
-clean-am: clean-closures clean-bcheck clean-final  clean-generic clean-libLTLIBRARIES clean-libtool \
+clean-am: clean-bcheck clean-final  clean-generic clean-libLTLIBRARIES clean-libtool \
 	mostlyclean-am
 
 distclean: distclean-am
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
@@ -800,12 +686,20 @@
 
 install-data-am:
 
+install-dvi: install-dvi-am
+
 install-exec-am: install-libLTLIBRARIES
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -826,41 +720,31 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES
+uninstall-am: uninstall-libLTLIBRARIES
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-libLTLIBRARIES clean-libtool ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
 	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-exec \
-	install-exec-am install-info install-info-am \
-	install-libLTLIBRARIES install-man install-strip installcheck \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am \
+	install-libLTLIBRARIES install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
 	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-info-am \
-	uninstall-libLTLIBRARIES
+	tags uninstall uninstall-am uninstall-libLTLIBRARIES
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
-#>+ 8
-libkwalletbackend.la.closure: $(libkwalletbackend_la_OBJECTS) $(libkwalletbackend_la_DEPENDENCIES)
-	@echo "int main() {return 0;}" > libkwalletbackend_la_closure.cc
-	@$(LTCXXCOMPILE) -c libkwalletbackend_la_closure.cc
-	$(CXXLINK) libkwalletbackend_la_closure.lo $(libkwalletbackend_la_LDFLAGS) $(libkwalletbackend_la_OBJECTS) $(libkwalletbackend_la_LIBADD) $(LIBS)
-	@rm -f libkwalletbackend_la_closure.* libkwalletbackend.la.closure
-	@echo "timestamp" > libkwalletbackend.la.closure
-
-
 #>+ 2
 KDE_DIST=Makefile.in Makefile.am 
 
-#>+ 3
-clean-closures:
-	-rm -f  libkwalletbackend.la.closure
-
 #>+ 2
 docs-am:
 
--- kdelibs-3.5.7.orig/kioslave/gzip/Makefile.in
+++ kdelibs-3.5.7/kioslave/gzip/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,15 +16,11 @@
 @SET_MAKE@
 
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -70,7 +66,14 @@
 #>- kgzipfilter_la_OBJECTS = $(am_kgzipfilter_la_OBJECTS)
 #>+ 1
 kgzipfilter_la_OBJECTS = kgzipfilter.lo
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+#>- kgzipfilter_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(kgzipfilter_la_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+kgzipfilter_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(kgzipfilter_la_LDFLAGS) $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -78,19 +81,21 @@
 #>+ 2
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 #>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
 CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 3
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(kgzipfilter_la_SOURCES)
 DIST_SOURCES = $(kgzipfilter_la_SOURCES)
 kde_servicesDATA_INSTALL = $(INSTALL_DATA)
@@ -103,8 +108,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -112,13 +115,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -132,8 +135,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -154,17 +155,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -233,7 +231,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -270,12 +267,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -320,87 +319,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -424,75 +379,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -500,16 +397,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -529,7 +425,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -567,13 +463,13 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
+	test -z "$(kde_moduledir)" || $(MKDIR_P) "$(DESTDIR)$(kde_moduledir)"
 	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
@@ -584,7 +480,7 @@
 
 uninstall-kde_moduleLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
@@ -598,11 +494,8 @@
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
-#>- kgzipfilter.la: $(kgzipfilter_la_OBJECTS) $(kgzipfilter_la_DEPENDENCIES) 
-#>+ 2
-@KDE_USE_CLOSURE_TRUE@kgzipfilter.la: kgzipfilter.la.closure $(kgzipfilter_la_OBJECTS) $(kgzipfilter_la_DEPENDENCIES) 
-@KDE_USE_CLOSURE_FALSE@kgzipfilter.la: $(kgzipfilter_la_OBJECTS) $(kgzipfilter_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(kde_moduledir) $(kgzipfilter_la_LDFLAGS) $(kgzipfilter_la_OBJECTS) $(kgzipfilter_la_LIBADD) $(LIBS)
+kgzipfilter.la: $(kgzipfilter_la_OBJECTS) $(kgzipfilter_la_DEPENDENCIES) 
+	$(kgzipfilter_la_LINK) -rpath $(kde_moduledir) $(kgzipfilter_la_OBJECTS) $(kgzipfilter_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -613,22 +506,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kgzipfilter.Plo@am__quote@
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -638,13 +531,9 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 install-kde_servicesDATA: $(kde_services_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(kde_servicesdir)" || $(mkdir_p) "$(DESTDIR)$(kde_servicesdir)"
+	test -z "$(kde_servicesdir)" || $(MKDIR_P) "$(DESTDIR)$(kde_servicesdir)"
 	@list='$(kde_services_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -709,22 +598,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -740,7 +628,7 @@
 all-am: Makefile $(LTLIBRARIES) $(DATA)
 installdirs:
 	for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(kde_servicesdir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -773,14 +661,14 @@
 #>- clean-am: clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
 #>- 	mostlyclean-am
 #>+ 2
-clean-am: clean-closures clean-bcheck  clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
+clean-am: clean-bcheck  clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
 	mostlyclean-am
 
 distclean: distclean-am
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
@@ -798,14 +686,22 @@
 install-data-am:   \
 	install-kde_servicesDATA
 
+install-dvi: install-dvi-am
+
 #>- install-exec-am:
 #>+ 1
 install-exec-am:  install-kde_moduleLTLIBRARIES
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -826,43 +722,34 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-kde_moduleLTLIBRARIES \
+uninstall-am: uninstall-kde_moduleLTLIBRARIES \
 	uninstall-kde_servicesDATA
 
+.MAKE: install-am install-strip
+
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-kde_moduleLTLIBRARIES clean-libtool ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
 	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-exec \
-	install-exec-am install-info install-info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am \
 	install-kde_moduleLTLIBRARIES install-kde_servicesDATA \
-	install-man install-strip installcheck installcheck-am \
+	install-man install-pdf install-pdf-am install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
 	installdirs maintainer-clean maintainer-clean-generic \
 	mostlyclean mostlyclean-compile mostlyclean-generic \
 	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
-	uninstall-am uninstall-info-am uninstall-kde_moduleLTLIBRARIES \
+	uninstall-am uninstall-kde_moduleLTLIBRARIES \
 	uninstall-kde_servicesDATA
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
-#>+ 8
-kgzipfilter.la.closure: $(kgzipfilter_la_OBJECTS) $(kgzipfilter_la_DEPENDENCIES)
-	@echo "int main() {return 0;}" > kgzipfilter_la_closure.cpp
-	@$(LTCXXCOMPILE) -c kgzipfilter_la_closure.cpp
-	$(CXXLINK) kgzipfilter_la_closure.lo $(kgzipfilter_la_LDFLAGS) $(kgzipfilter_la_OBJECTS) $(kgzipfilter_la_LIBADD) $(LIBS)
-	@rm -f kgzipfilter_la_closure.* kgzipfilter.la.closure
-	@echo "timestamp" > kgzipfilter.la.closure
-
-
 #>+ 2
 KDE_DIST=Makefile.in kgzipfilter.h kgzipfilter.desktop Makefile.am 
 
-#>+ 3
-clean-closures:
-	-rm -f  kgzipfilter.la.closure
-
 #>+ 2
 docs-am:
 
--- kdelibs-3.5.7.orig/kioslave/http/kcookiejar/tests/Makefile.in
+++ kdelibs-3.5.7/kioslave/http/kcookiejar/tests/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -17,15 +17,11 @@
 
 # $Id: Makefile.am 362284 2004-11-11 18:14:09Z waba $
 # Makefile.am of kdebase/kioslave/http
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -61,7 +57,14 @@
 kcookiejartest_OBJECTS = kcookiejartest.$(OBJEXT)
 am__DEPENDENCIES_1 =
 kcookiejartest_DEPENDENCIES = $(am__DEPENDENCIES_1)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+#>- kcookiejartest_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(kcookiejartest_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+kcookiejartest_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(kcookiejartest_LDFLAGS) $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -69,19 +72,21 @@
 #>+ 2
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 #>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
 CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 3
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(kcookiejartest_SOURCES)
 DIST_SOURCES = $(kcookiejartest_SOURCES)
 ETAGS = etags
@@ -92,8 +97,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -101,13 +104,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -121,8 +124,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -143,17 +144,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -222,7 +220,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -259,12 +256,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -309,87 +308,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -413,75 +368,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -489,16 +386,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -514,7 +410,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -552,9 +448,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 clean-checkPROGRAMS:
@@ -565,7 +461,7 @@
 	done
 kcookiejartest$(EXEEXT): $(kcookiejartest_OBJECTS) $(kcookiejartest_DEPENDENCIES) 
 	@rm -f kcookiejartest$(EXEEXT)
-	$(CXXLINK) $(kcookiejartest_LDFLAGS) $(kcookiejartest_OBJECTS) $(kcookiejartest_LDADD) $(LIBS)
+	$(kcookiejartest_LINK) $(kcookiejartest_OBJECTS) $(kcookiejartest_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -576,22 +472,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kcookiejartest.Po@am__quote@
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -602,10 +498,6 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -655,22 +547,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -725,7 +616,7 @@
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
@@ -739,12 +630,20 @@
 
 install-data-am:
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -765,19 +664,23 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am
+uninstall-am:
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am check-local clean \
 	clean-checkPROGRAMS clean-generic clean-libtool ctags \
 	distclean distclean-compile distclean-generic \
 	distclean-libtool distclean-tags distdir dvi dvi-am html \
 	html-am info info-am install install-am install-data \
-	install-data-am install-exec install-exec-am install-info \
-	install-info-am install-man install-strip installcheck \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
 	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-info-am
+	tags uninstall uninstall-am
 
 
 check-local: kcookiejartest
--- kdelibs-3.5.7.orig/kioslave/http/kcookiejar/Makefile.in
+++ kdelibs-3.5.7/kioslave/http/kcookiejar/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -19,15 +19,11 @@
 
 
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -82,6 +78,13 @@
 #>- kcookiejar_la_OBJECTS = $(am_kcookiejar_la_OBJECTS)
 #>+ 1
 kcookiejar_la_OBJECTS = kcookiejar_dummy.lo
+#>- kcookiejar_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(kcookiejar_la_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+kcookiejar_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(kcookiejar_la_LDFLAGS) $(LDFLAGS) -o $@
 kded_kcookiejar_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1)
 am_kded_kcookiejar_la_OBJECTS = kcookiejar.lo kcookieserver.lo \
@@ -93,12 +96,19 @@
 	kcookiewin.lo kcookieserver_skel.lo
 @KDE_USE_FINAL_FALSE@kded_kcookiejar_la_OBJECTS = $(kded_kcookiejar_la_nofinal_OBJECTS)
 @KDE_USE_FINAL_TRUE@kded_kcookiejar_la_OBJECTS = $(kded_kcookiejar_la_final_OBJECTS)
+#>- kded_kcookiejar_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(kded_kcookiejar_la_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+kded_kcookiejar_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(kded_kcookiejar_la_LDFLAGS) $(LDFLAGS) -o $@
 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 #>- PROGRAMS = $(bin_PROGRAMS)
 #>+ 2
 bin_PROGRAMS += kcookiejar$(EXEEXT) 
 PROGRAMS = $(bin_PROGRAMS)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -106,19 +116,21 @@
 #>+ 2
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 #>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
 CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 3
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 #>- SOURCES = $(kcookiejar_la_SOURCES) $(kded_kcookiejar_la_SOURCES)
 #>+ 1
 SOURCES = $(kcookiejar_la_SOURCES) $(kded_kcookiejar_la_SOURCES) $(kcookiejar_SOURCES) 
@@ -127,21 +139,25 @@
 DIST_SOURCES = $(kcookiejar_la_SOURCES) $(kded_kcookiejar_la_SOURCES) $(kcookiejar_SOURCES) 
 #>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 #>- 	html-recursive info-recursive install-data-recursive \
-#>- 	install-exec-recursive install-info-recursive \
-#>- 	install-recursive installcheck-recursive installdirs-recursive \
-#>- 	pdf-recursive ps-recursive uninstall-info-recursive \
-#>- 	uninstall-recursive
-#>+ 6
+#>- 	install-dvi-recursive install-exec-recursive \
+#>- 	install-html-recursive install-info-recursive \
+#>- 	install-pdf-recursive install-ps-recursive install-recursive \
+#>- 	installcheck-recursive installdirs-recursive pdf-recursive \
+#>- 	ps-recursive uninstall-recursive
+#>+ 7
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	html-recursive info-recursive install-data-recursive \
-	install-exec-recursive install-info-recursive \
-	install-recursive installcheck-recursive installdirs-recursive \
-	pdf-recursive ps-recursive uninstall-info-recursive \
-	uninstall-recursive nmcheck-recursive bcheck-recursive
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive nmcheck-recursive bcheck-recursive
 cookieDATA_INSTALL = $(INSTALL_DATA)
 kdedDATA_INSTALL = $(INSTALL_DATA)
 updateDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(cookie_DATA) $(kded_DATA) $(update_DATA)
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
@@ -151,8 +167,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -160,13 +174,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -180,8 +194,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -202,17 +214,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -281,7 +290,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -318,12 +326,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -368,87 +378,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -472,75 +438,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -548,16 +456,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -596,7 +503,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -634,13 +541,13 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
+	test -z "$(kde_moduledir)" || $(MKDIR_P) "$(DESTDIR)$(kde_moduledir)"
 	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
@@ -651,7 +558,7 @@
 
 uninstall-kde_moduleLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
@@ -667,7 +574,7 @@
 	done
 install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(kdeinitdir)" || $(mkdir_p) "$(DESTDIR)$(kdeinitdir)"
+	test -z "$(kdeinitdir)" || $(MKDIR_P) "$(DESTDIR)$(kdeinitdir)"
 	@list='$(kdeinit_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
@@ -678,7 +585,7 @@
 
 uninstall-kdeinitLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@set -x; list='$(kdeinit_LTLIBRARIES)'; for p in $$list; do \
+	@list='$(kdeinit_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kdeinitdir)/$$p'"; \
 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kdeinitdir)/$$p"; \
@@ -694,7 +601,7 @@
 	done
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
@@ -705,7 +612,7 @@
 
 uninstall-libLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
@@ -720,12 +627,12 @@
 	  rm -f "$${dir}/so_locations"; \
 	done
 kcookiejar.la: $(kcookiejar_la_OBJECTS) $(kcookiejar_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(kdeinitdir) $(kcookiejar_la_LDFLAGS) $(kcookiejar_la_OBJECTS) $(kcookiejar_la_LIBADD) $(LIBS)
+	$(kcookiejar_la_LINK) -rpath $(kdeinitdir) $(kcookiejar_la_OBJECTS) $(kcookiejar_la_LIBADD) $(LIBS)
 kded_kcookiejar.la: $(kded_kcookiejar_la_OBJECTS) $(kded_kcookiejar_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(kde_moduledir) $(kded_kcookiejar_la_LDFLAGS) $(kded_kcookiejar_la_OBJECTS) $(kded_kcookiejar_la_LIBADD) $(LIBS)
+	$(kded_kcookiejar_la_LINK) -rpath $(kde_moduledir) $(kded_kcookiejar_la_OBJECTS) $(kded_kcookiejar_la_LIBADD) $(LIBS)
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
+	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
 	  if test -f $$p \
@@ -764,22 +671,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Plo@am__quote@
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -789,13 +696,9 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 install-cookieDATA: $(cookie_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(cookiedir)" || $(mkdir_p) "$(DESTDIR)$(cookiedir)"
+	test -z "$(cookiedir)" || $(MKDIR_P) "$(DESTDIR)$(cookiedir)"
 	@list='$(cookie_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -812,7 +715,7 @@
 	done
 install-kdedDATA: $(kded_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(kdeddir)" || $(mkdir_p) "$(DESTDIR)$(kdeddir)"
+	test -z "$(kdeddir)" || $(MKDIR_P) "$(DESTDIR)$(kdeddir)"
 	@list='$(kded_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -829,7 +732,7 @@
 	done
 install-updateDATA: $(update_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(updatedir)" || $(mkdir_p) "$(DESTDIR)$(updatedir)"
+	test -z "$(updatedir)" || $(MKDIR_P) "$(DESTDIR)$(updatedir)"
 	@list='$(update_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -876,8 +779,7 @@
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
+$(RECURSIVE_CLEAN_TARGETS):
 	@failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
@@ -978,22 +880,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -1007,7 +908,7 @@
 	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
-	    || $(mkdir_p) "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 	    || exit 1; \
 	    distdir=`$(am__cd) $(distdir) && pwd`; \
 	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
@@ -1015,6 +916,8 @@
 	      $(MAKE) $(AM_MAKEFLAGS) \
 	        top_distdir="$$top_distdir" \
 	        distdir="$$distdir/$$subdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -1027,7 +930,7 @@
 installdirs: installdirs-recursive
 installdirs-am:
 	for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(kdeinitdir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(cookiedir)" "$(DESTDIR)$(kdeddir)" "$(DESTDIR)$(updatedir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-recursive
 install-exec: install-exec-recursive
@@ -1069,7 +972,7 @@
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-recursive
 
@@ -1087,14 +990,22 @@
 install-data-am:   install-cookieDATA \
 	install-kdedDATA install-kdeinitLTLIBRARIES install-updateDATA
 
+install-dvi: install-dvi-recursive
+
 #>- install-exec-am: install-binPROGRAMS install-libLTLIBRARIES
 #>+ 1
 install-exec-am:  install-binPROGRAMS install-libLTLIBRARIES install-kde_moduleLTLIBRARIES
 
+install-html: install-html-recursive
+
 install-info: install-info-recursive
 
 install-man:
 
+install-pdf: install-pdf-recursive
+
+install-ps: install-ps-recursive
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
@@ -1116,30 +1027,32 @@
 ps-am:
 
 uninstall-am: uninstall-binPROGRAMS uninstall-cookieDATA \
-	uninstall-info-am uninstall-kde_moduleLTLIBRARIES \
-	uninstall-kdedDATA uninstall-kdeinitLTLIBRARIES \
-	uninstall-libLTLIBRARIES uninstall-updateDATA
-
-uninstall-info: uninstall-info-recursive
-
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-	clean clean-binPROGRAMS clean-generic \
-	clean-kde_moduleLTLIBRARIES clean-kdeinitLTLIBRARIES \
-	clean-libLTLIBRARIES clean-libtool clean-recursive ctags \
-	ctags-recursive distclean distclean-compile distclean-generic \
-	distclean-libtool distclean-recursive distclean-tags distdir \
-	dvi dvi-am html html-am info info-am install install-am \
+	uninstall-kde_moduleLTLIBRARIES uninstall-kdedDATA \
+	uninstall-kdeinitLTLIBRARIES uninstall-libLTLIBRARIES \
+	uninstall-updateDATA
+
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+	install-strip
+
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+	all all-am check check-am clean clean-binPROGRAMS \
+	clean-generic clean-kde_moduleLTLIBRARIES \
+	clean-kdeinitLTLIBRARIES clean-libLTLIBRARIES clean-libtool \
+	ctags ctags-recursive distclean distclean-compile \
+	distclean-generic distclean-libtool distclean-tags distdir dvi \
+	dvi-am html html-am info info-am install install-am \
 	install-binPROGRAMS install-cookieDATA install-data \
-	install-data-am install-exec install-exec-am install-info \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
 	install-info-am install-kde_moduleLTLIBRARIES install-kdedDATA \
 	install-kdeinitLTLIBRARIES install-libLTLIBRARIES install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
 	install-strip install-updateDATA installcheck installcheck-am \
 	installdirs installdirs-am maintainer-clean \
-	maintainer-clean-generic maintainer-clean-recursive \
-	mostlyclean mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 	tags tags-recursive uninstall uninstall-am \
-	uninstall-binPROGRAMS uninstall-cookieDATA uninstall-info-am \
+	uninstall-binPROGRAMS uninstall-cookieDATA \
 	uninstall-kde_moduleLTLIBRARIES uninstall-kdedDATA \
 	uninstall-kdeinitLTLIBRARIES uninstall-libLTLIBRARIES \
 	uninstall-updateDATA
--- kdelibs-3.5.7.orig/kioslave/http/Makefile.in
+++ kdelibs-3.5.7/kioslave/http/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -21,15 +21,11 @@
 
 
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -82,6 +78,13 @@
 #>- kio_http_la_OBJECTS = $(am_kio_http_la_OBJECTS)
 #>+ 1
 kio_http_la_OBJECTS = http.lo
+#>- kio_http_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(kio_http_la_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+kio_http_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(kio_http_la_LDFLAGS) $(LDFLAGS) -o $@
 #>- kio_http_cache_cleaner_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
 #>+ 1
 kio_http_cache_cleaner_la_DEPENDENCIES = libkdeinit_kio_http_cache_cleaner.la
@@ -92,12 +95,21 @@
 #>- 	$(am_kio_http_cache_cleaner_la_OBJECTS)
 #>+ 1
 kio_http_cache_cleaner_la_OBJECTS = kio_http_cache_cleaner_dummy.lo
+#>- kio_http_cache_cleaner_la_LINK = $(LIBTOOL) --tag=CXX \
+#>- 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
+#>- 	$(AM_CXXFLAGS) $(CXXFLAGS) \
+#>- 	$(kio_http_cache_cleaner_la_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 4
+kio_http_cache_cleaner_la_LINK = $(LIBTOOL) --tag=CXX \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
+	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
+	$(kio_http_cache_cleaner_la_LDFLAGS) $(LDFLAGS) -o $@
 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 #>- PROGRAMS = $(bin_PROGRAMS)
 #>+ 2
 bin_PROGRAMS += kio_http_cache_cleaner$(EXEEXT) 
 PROGRAMS = $(bin_PROGRAMS)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -105,19 +117,21 @@
 #>+ 2
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 #>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
 CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 3
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 #>- SOURCES = $(kio_http_la_SOURCES) $(kio_http_cache_cleaner_la_SOURCES)
 #>+ 1
 SOURCES = $(kio_http_la_SOURCES) $(kio_http_cache_cleaner_la_SOURCES) $(kio_http_cache_cleaner_SOURCES) 
@@ -128,20 +142,24 @@
 	$(kio_http_cache_cleaner_la_SOURCES) $(kio_http_cache_cleaner_SOURCES) 
 #>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 #>- 	html-recursive info-recursive install-data-recursive \
-#>- 	install-exec-recursive install-info-recursive \
-#>- 	install-recursive installcheck-recursive installdirs-recursive \
-#>- 	pdf-recursive ps-recursive uninstall-info-recursive \
-#>- 	uninstall-recursive
-#>+ 6
+#>- 	install-dvi-recursive install-exec-recursive \
+#>- 	install-html-recursive install-info-recursive \
+#>- 	install-pdf-recursive install-ps-recursive install-recursive \
+#>- 	installcheck-recursive installdirs-recursive pdf-recursive \
+#>- 	ps-recursive uninstall-recursive
+#>+ 7
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	html-recursive info-recursive install-data-recursive \
-	install-exec-recursive install-info-recursive \
-	install-recursive installcheck-recursive installdirs-recursive \
-	pdf-recursive ps-recursive uninstall-info-recursive \
-	uninstall-recursive nmcheck-recursive bcheck-recursive
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive nmcheck-recursive bcheck-recursive
 kdelnkDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(kdelnk_DATA)
 HEADERS = $(noinst_HEADERS)
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
@@ -151,8 +169,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -160,13 +176,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -180,8 +196,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -202,17 +216,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -281,7 +292,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -318,12 +328,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -368,87 +380,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -472,75 +440,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -548,16 +458,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -591,7 +500,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cc .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -629,13 +538,13 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
+	test -z "$(kde_moduledir)" || $(MKDIR_P) "$(DESTDIR)$(kde_moduledir)"
 	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
@@ -646,7 +555,7 @@
 
 uninstall-kde_moduleLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
@@ -662,7 +571,7 @@
 	done
 install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(kdeinitdir)" || $(mkdir_p) "$(DESTDIR)$(kdeinitdir)"
+	test -z "$(kdeinitdir)" || $(MKDIR_P) "$(DESTDIR)$(kdeinitdir)"
 	@list='$(kdeinit_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
@@ -673,7 +582,7 @@
 
 uninstall-kdeinitLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@set -x; list='$(kdeinit_LTLIBRARIES)'; for p in $$list; do \
+	@list='$(kdeinit_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kdeinitdir)/$$p'"; \
 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kdeinitdir)/$$p"; \
@@ -689,7 +598,7 @@
 	done
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
@@ -700,7 +609,7 @@
 
 uninstall-libLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
@@ -714,16 +623,13 @@
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
-#>- kio_http.la: $(kio_http_la_OBJECTS) $(kio_http_la_DEPENDENCIES) 
-#>+ 2
-@KDE_USE_CLOSURE_TRUE@kio_http.la: kio_http.la.closure $(kio_http_la_OBJECTS) $(kio_http_la_DEPENDENCIES) 
-@KDE_USE_CLOSURE_FALSE@kio_http.la: $(kio_http_la_OBJECTS) $(kio_http_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(kde_moduledir) $(kio_http_la_LDFLAGS) $(kio_http_la_OBJECTS) $(kio_http_la_LIBADD) $(LIBS)
+kio_http.la: $(kio_http_la_OBJECTS) $(kio_http_la_DEPENDENCIES) 
+	$(kio_http_la_LINK) -rpath $(kde_moduledir) $(kio_http_la_OBJECTS) $(kio_http_la_LIBADD) $(LIBS)
 kio_http_cache_cleaner.la: $(kio_http_cache_cleaner_la_OBJECTS) $(kio_http_cache_cleaner_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(kdeinitdir) $(kio_http_cache_cleaner_la_LDFLAGS) $(kio_http_cache_cleaner_la_OBJECTS) $(kio_http_cache_cleaner_la_LIBADD) $(LIBS)
+	$(kio_http_cache_cleaner_la_LINK) -rpath $(kdeinitdir) $(kio_http_cache_cleaner_la_OBJECTS) $(kio_http_cache_cleaner_la_LIBADD) $(LIBS)
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
+	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
 	  if test -f $$p \
@@ -760,43 +666,43 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/http_cache_cleaner.Plo@am__quote@
 
 .cc.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cc.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cc.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -806,13 +712,9 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 install-kdelnkDATA: $(kdelnk_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(kdelnkdir)" || $(mkdir_p) "$(DESTDIR)$(kdelnkdir)"
+	test -z "$(kdelnkdir)" || $(MKDIR_P) "$(DESTDIR)$(kdelnkdir)"
 	@list='$(kdelnk_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -859,8 +761,7 @@
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
+$(RECURSIVE_CLEAN_TARGETS):
 	@failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
@@ -961,23 +862,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	$(mkdir_p) $(distdir)/../../admin
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -991,7 +890,7 @@
 	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
-	    || $(mkdir_p) "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 	    || exit 1; \
 	    distdir=`$(am__cd) $(distdir) && pwd`; \
 	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
@@ -999,6 +898,8 @@
 	      $(MAKE) $(AM_MAKEFLAGS) \
 	        top_distdir="$$top_distdir" \
 	        distdir="$$distdir/$$subdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -1011,7 +912,7 @@
 installdirs: installdirs-recursive
 installdirs-am:
 	for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(kdeinitdir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(kdelnkdir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-recursive
 install-exec: install-exec-recursive
@@ -1045,7 +946,7 @@
 #>- 	clean-kdeinitLTLIBRARIES clean-libLTLIBRARIES clean-libtool \
 #>- 	mostlyclean-am
 #>+ 3
-clean-am: clean-metasources clean-closures clean-bcheck  clean-binPROGRAMS clean-generic clean-kde_moduleLTLIBRARIES \
+clean-am: clean-metasources clean-bcheck  clean-binPROGRAMS clean-generic clean-kde_moduleLTLIBRARIES \
 	clean-kdeinitLTLIBRARIES clean-libLTLIBRARIES clean-libtool \
 	mostlyclean-am
 
@@ -1053,7 +954,7 @@
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-recursive
 
@@ -1071,14 +972,22 @@
 install-data-am:   install-data-local \
 	install-kdeinitLTLIBRARIES install-kdelnkDATA
 
+install-dvi: install-dvi-recursive
+
 #>- install-exec-am: install-binPROGRAMS install-libLTLIBRARIES
 #>+ 1
 install-exec-am:  install-binPROGRAMS install-libLTLIBRARIES install-kde_moduleLTLIBRARIES
 
+install-html: install-html-recursive
+
 install-info: install-info-recursive
 
 install-man:
 
+install-pdf: install-pdf-recursive
+
+install-ps: install-ps-recursive
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
@@ -1099,32 +1008,34 @@
 
 ps-am:
 
-uninstall-am: uninstall-binPROGRAMS uninstall-info-am \
-	uninstall-kde_moduleLTLIBRARIES uninstall-kdeinitLTLIBRARIES \
-	uninstall-kdelnkDATA uninstall-libLTLIBRARIES uninstall-local
-
-uninstall-info: uninstall-info-recursive
-
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-	clean clean-binPROGRAMS clean-generic \
-	clean-kde_moduleLTLIBRARIES clean-kdeinitLTLIBRARIES \
-	clean-libLTLIBRARIES clean-libtool clean-recursive ctags \
-	ctags-recursive distclean distclean-compile distclean-generic \
-	distclean-libtool distclean-recursive distclean-tags distdir \
-	dvi dvi-am html html-am info info-am install install-am \
+uninstall-am: uninstall-binPROGRAMS uninstall-kde_moduleLTLIBRARIES \
+	uninstall-kdeinitLTLIBRARIES uninstall-kdelnkDATA \
+	uninstall-libLTLIBRARIES uninstall-local
+
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+	install-strip
+
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+	all all-am check check-am clean clean-binPROGRAMS \
+	clean-generic clean-kde_moduleLTLIBRARIES \
+	clean-kdeinitLTLIBRARIES clean-libLTLIBRARIES clean-libtool \
+	ctags ctags-recursive distclean distclean-compile \
+	distclean-generic distclean-libtool distclean-tags distdir dvi \
+	dvi-am html html-am info info-am install install-am \
 	install-binPROGRAMS install-data install-data-am \
-	install-data-local install-exec install-exec-am install-info \
+	install-data-local install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
 	install-info-am install-kde_moduleLTLIBRARIES \
 	install-kdeinitLTLIBRARIES install-kdelnkDATA \
-	install-libLTLIBRARIES install-man install-strip installcheck \
+	install-libLTLIBRARIES install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
 	installcheck-am installdirs installdirs-am maintainer-clean \
-	maintainer-clean-generic maintainer-clean-recursive \
-	mostlyclean mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 	tags tags-recursive uninstall uninstall-am \
-	uninstall-binPROGRAMS uninstall-info-am \
-	uninstall-kde_moduleLTLIBRARIES uninstall-kdeinitLTLIBRARIES \
-	uninstall-kdelnkDATA uninstall-libLTLIBRARIES uninstall-local
+	uninstall-binPROGRAMS uninstall-kde_moduleLTLIBRARIES \
+	uninstall-kdeinitLTLIBRARIES uninstall-kdelnkDATA \
+	uninstall-libLTLIBRARIES uninstall-local
 
 apidox-am-yes:
 	@if test \! -d "$(top_srcdir)/doc/common/" && test -z "$$DOXDATA" ; then \
@@ -1248,15 +1159,6 @@
 kio_http_cache_cleaner_LDADD = libkdeinit_kio_http_cache_cleaner.la
 kio_http_cache_cleaner_DEPENDENCIES = libkdeinit_kio_http_cache_cleaner.la
 
-#>+ 8
-kio_http.la.closure: $(kio_http_la_OBJECTS) $(kio_http_la_DEPENDENCIES)
-	@echo "int main() {return 0;}" > kio_http_la_closure.cc
-	@$(LTCXXCOMPILE) -c kio_http_la_closure.cc
-	$(CXXLINK) kio_http_la_closure.lo $(kio_http_la_LDFLAGS) $(kio_http_la_OBJECTS) $(kio_http_la_LIBADD) $(LIBS)
-	@rm -f kio_http_la_closure.* kio_http.la.closure
-	@echo "timestamp" > kio_http.la.closure
-
-
 #>+ 3
 http.moc: $(srcdir)/http.h
 	$(MOC) $(srcdir)/http.h -o http.moc
@@ -1271,10 +1173,6 @@
 #>+ 2
 KDE_DIST=webdav.protocol http_cache_cleaner.desktop Makefile.in THOUGHTS rfc2818.txt rfc2616.txt https.protocol configure.in.in rfc3253.txt rfc3229.txt shoutcast-icecast.txt README.webdav rfc2817.txt README.http_cache_cleaner webdavs.protocol configure.in.bot rfc2617.txt http.protocol rfc2518.txt Makefile.am 
 
-#>+ 3
-clean-closures:
-	-rm -f  kio_http.la.closure
-
 #>+ 2
 docs-am:
 
--- kdelibs-3.5.7.orig/kioslave/file/Makefile.in
+++ kdelibs-3.5.7/kioslave/file/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -17,15 +17,11 @@
 
 
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -71,7 +67,14 @@
 #>- kio_file_la_OBJECTS = $(am_kio_file_la_OBJECTS)
 #>+ 1
 kio_file_la_OBJECTS = file.lo
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+#>- kio_file_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(kio_file_la_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+kio_file_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(kio_file_la_LDFLAGS) $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -79,19 +82,21 @@
 #>+ 2
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 #>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
 CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 3
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(kio_file_la_SOURCES)
 DIST_SOURCES = $(kio_file_la_SOURCES)
 kdelnkDATA_INSTALL = $(INSTALL_DATA)
@@ -106,8 +111,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -115,13 +118,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -135,8 +138,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -157,17 +158,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -236,7 +234,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -273,12 +270,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -323,87 +322,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -427,75 +382,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -503,16 +400,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -538,7 +434,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cc .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -576,13 +472,13 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
+	test -z "$(kde_moduledir)" || $(MKDIR_P) "$(DESTDIR)$(kde_moduledir)"
 	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
@@ -593,7 +489,7 @@
 
 uninstall-kde_moduleLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
@@ -607,11 +503,8 @@
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
-#>- kio_file.la: $(kio_file_la_OBJECTS) $(kio_file_la_DEPENDENCIES) 
-#>+ 2
-@KDE_USE_CLOSURE_TRUE@kio_file.la: kio_file.la.closure $(kio_file_la_OBJECTS) $(kio_file_la_DEPENDENCIES) 
-@KDE_USE_CLOSURE_FALSE@kio_file.la: $(kio_file_la_OBJECTS) $(kio_file_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(kde_moduledir) $(kio_file_la_LDFLAGS) $(kio_file_la_OBJECTS) $(kio_file_la_LIBADD) $(LIBS)
+kio_file.la: $(kio_file_la_OBJECTS) $(kio_file_la_DEPENDENCIES) 
+	$(kio_file_la_LINK) -rpath $(kde_moduledir) $(kio_file_la_OBJECTS) $(kio_file_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -622,22 +515,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/file.Plo@am__quote@
 
 .cc.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cc.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cc.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -647,13 +540,9 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 install-kdelnkDATA: $(kdelnk_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(kdelnkdir)" || $(mkdir_p) "$(DESTDIR)$(kdelnkdir)"
+	test -z "$(kdelnkdir)" || $(MKDIR_P) "$(DESTDIR)$(kdelnkdir)"
 	@list='$(kdelnk_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -670,7 +559,7 @@
 	done
 install-fileincludeHEADERS: $(fileinclude_HEADERS)
 	@$(NORMAL_INSTALL)
-	test -z "$(fileincludedir)" || $(mkdir_p) "$(DESTDIR)$(fileincludedir)"
+	test -z "$(fileincludedir)" || $(MKDIR_P) "$(DESTDIR)$(fileincludedir)"
 	@list='$(fileinclude_HEADERS)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -735,22 +624,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -766,7 +654,7 @@
 all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS)
 installdirs:
 	for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(kdelnkdir)" "$(DESTDIR)$(fileincludedir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -799,14 +687,14 @@
 #>- clean-am: clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
 #>- 	mostlyclean-am
 #>+ 2
-clean-am: clean-metasources clean-closures clean-bcheck  clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
+clean-am: clean-metasources clean-bcheck  clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
 	mostlyclean-am
 
 distclean: distclean-am
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
@@ -824,14 +712,22 @@
 install-data-am:   install-fileincludeHEADERS \
  install-kdelnkDATA
 
+install-dvi: install-dvi-am
+
 #>- install-exec-am:
 #>+ 1
 install-exec-am:  install-kde_moduleLTLIBRARIES
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -852,37 +748,31 @@
 
 ps-am:
 
-uninstall-am: uninstall-fileincludeHEADERS uninstall-info-am \
+uninstall-am: uninstall-fileincludeHEADERS \
 	uninstall-kde_moduleLTLIBRARIES uninstall-kdelnkDATA
 
+.MAKE: install-am install-strip
+
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-kde_moduleLTLIBRARIES clean-libtool ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
 	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-exec \
-	install-exec-am install-fileincludeHEADERS install-info \
-	install-info-am install-kde_moduleLTLIBRARIES \
-	install-kdelnkDATA install-man install-strip installcheck \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am \
+	install-fileincludeHEADERS install-html install-html-am \
+	install-info install-info-am install-kde_moduleLTLIBRARIES \
+	install-kdelnkDATA install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
 	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 	tags uninstall uninstall-am uninstall-fileincludeHEADERS \
-	uninstall-info-am uninstall-kde_moduleLTLIBRARIES \
-	uninstall-kdelnkDATA
+	uninstall-kde_moduleLTLIBRARIES uninstall-kdelnkDATA
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
-#>+ 8
-kio_file.la.closure: $(kio_file_la_OBJECTS) $(kio_file_la_DEPENDENCIES)
-	@echo "int main() {return 0;}" > kio_file_la_closure.cc
-	@$(LTCXXCOMPILE) -c kio_file_la_closure.cc
-	$(CXXLINK) kio_file_la_closure.lo $(kio_file_la_LDFLAGS) $(kio_file_la_OBJECTS) $(kio_file_la_LIBADD) $(LIBS)
-	@rm -f kio_file_la_closure.* kio_file.la.closure
-	@echo "timestamp" > kio_file.la.closure
-
-
 #>+ 3
 file.moc: $(srcdir)/file.h
 	$(MOC) $(srcdir)/file.h -o file.moc
@@ -897,10 +787,6 @@
 #>+ 2
 KDE_DIST=Makefile.in file.protocol Makefile.am 
 
-#>+ 3
-clean-closures:
-	-rm -f  kio_file.la.closure
-
 #>+ 2
 docs-am:
 
--- kdelibs-3.5.7.orig/kioslave/Makefile.in
+++ kdelibs-3.5.7/kioslave/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -32,15 +32,11 @@
 #    along with this library; see the file COPYING.LIB.  If not, write to
 #    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 #    Boston, MA 02110-1301, USA.
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -74,17 +70,21 @@
 DIST_SOURCES =
 #>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 #>- 	html-recursive info-recursive install-data-recursive \
-#>- 	install-exec-recursive install-info-recursive \
-#>- 	install-recursive installcheck-recursive installdirs-recursive \
-#>- 	pdf-recursive ps-recursive uninstall-info-recursive \
-#>- 	uninstall-recursive
-#>+ 6
+#>- 	install-dvi-recursive install-exec-recursive \
+#>- 	install-html-recursive install-info-recursive \
+#>- 	install-pdf-recursive install-ps-recursive install-recursive \
+#>- 	installcheck-recursive installdirs-recursive pdf-recursive \
+#>- 	ps-recursive uninstall-recursive
+#>+ 7
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	html-recursive info-recursive install-data-recursive \
-	install-exec-recursive install-info-recursive \
-	install-recursive installcheck-recursive installdirs-recursive \
-	pdf-recursive ps-recursive uninstall-info-recursive \
-	uninstall-recursive nmcheck-recursive bcheck-recursive
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive nmcheck-recursive bcheck-recursive
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = file http ftp gzip bzip2 metainfo
@@ -94,8 +94,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -103,13 +101,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -123,8 +121,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -145,17 +141,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -224,7 +217,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -261,12 +253,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -311,87 +305,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -415,75 +365,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -491,16 +383,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -513,7 +404,7 @@
 all: docs-am  all-recursive
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -551,9 +442,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 mostlyclean-libtool:
@@ -562,10 +453,6 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
 # To change the values of `make' variables: instead of editing Makefiles,
@@ -597,8 +484,7 @@
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
+$(RECURSIVE_CLEAN_TARGETS):
 	@failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
@@ -699,23 +585,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	$(mkdir_p) $(distdir)/../admin
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -729,7 +613,7 @@
 	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
-	    || $(mkdir_p) "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 	    || exit 1; \
 	    distdir=`$(am__cd) $(distdir) && pwd`; \
 	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
@@ -737,6 +621,8 @@
 	      $(MAKE) $(AM_MAKEFLAGS) \
 	        top_distdir="$$top_distdir" \
 	        distdir="$$distdir/$$subdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -780,8 +666,7 @@
 
 distclean: distclean-recursive
 	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool \
-	distclean-tags
+distclean-am: clean-am distclean-generic distclean-tags
 
 dvi: dvi-recursive
 
@@ -795,12 +680,20 @@
 
 install-data-am: install-data-local
 
+install-dvi: install-dvi-recursive
+
 install-exec-am:
 
+install-html: install-html-recursive
+
 install-info: install-info-recursive
 
 install-man:
 
+install-pdf: install-pdf-recursive
+
+install-ps: install-ps-recursive
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
@@ -819,23 +712,24 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-local
+uninstall-am: uninstall-local
 
-uninstall-info: uninstall-info-recursive
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+	install-strip
 
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-	clean clean-generic clean-libtool clean-recursive ctags \
-	ctags-recursive distclean distclean-generic distclean-libtool \
-	distclean-recursive distclean-tags distdir dvi dvi-am html \
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+	all all-am check check-am clean clean-generic clean-libtool \
+	ctags ctags-recursive distclean distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
 	html-am info info-am install install-am install-data \
-	install-data-am install-data-local install-exec \
-	install-exec-am install-info install-info-am install-man \
-	install-strip installcheck installcheck-am installdirs \
-	installdirs-am maintainer-clean maintainer-clean-generic \
-	maintainer-clean-recursive mostlyclean mostlyclean-generic \
-	mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
-	tags tags-recursive uninstall uninstall-am uninstall-info-am \
-	uninstall-local
+	install-data-am install-data-local install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs installdirs-am \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags tags-recursive uninstall uninstall-am uninstall-local
 
 
 messages: # they get into kio.pot
--- kdelibs-3.5.7.orig/kioslave/metainfo/Makefile.in
+++ kdelibs-3.5.7/kioslave/metainfo/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -17,15 +17,11 @@
 
 
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -71,7 +67,14 @@
 #>- kio_metainfo_la_OBJECTS = $(am_kio_metainfo_la_OBJECTS)
 #>+ 1
 kio_metainfo_la_OBJECTS = metainfo.lo
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+#>- kio_metainfo_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(kio_metainfo_la_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+kio_metainfo_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(kio_metainfo_la_LDFLAGS) $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -79,19 +82,21 @@
 #>+ 2
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 #>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
 CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 3
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(kio_metainfo_la_SOURCES)
 DIST_SOURCES = $(kio_metainfo_la_SOURCES)
 kdelnkDATA_INSTALL = $(INSTALL_DATA)
@@ -105,8 +110,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -114,13 +117,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -134,8 +137,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -156,17 +157,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -235,7 +233,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -272,12 +269,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -322,87 +321,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -426,75 +381,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -502,16 +399,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -533,7 +429,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -571,13 +467,13 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
+	test -z "$(kde_moduledir)" || $(MKDIR_P) "$(DESTDIR)$(kde_moduledir)"
 	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
@@ -588,7 +484,7 @@
 
 uninstall-kde_moduleLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
@@ -602,11 +498,8 @@
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
-#>- kio_metainfo.la: $(kio_metainfo_la_OBJECTS) $(kio_metainfo_la_DEPENDENCIES) 
-#>+ 2
-@KDE_USE_CLOSURE_TRUE@kio_metainfo.la: kio_metainfo.la.closure $(kio_metainfo_la_OBJECTS) $(kio_metainfo_la_DEPENDENCIES) 
-@KDE_USE_CLOSURE_FALSE@kio_metainfo.la: $(kio_metainfo_la_OBJECTS) $(kio_metainfo_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(kde_moduledir) $(kio_metainfo_la_LDFLAGS) $(kio_metainfo_la_OBJECTS) $(kio_metainfo_la_LIBADD) $(LIBS)
+kio_metainfo.la: $(kio_metainfo_la_OBJECTS) $(kio_metainfo_la_DEPENDENCIES) 
+	$(kio_metainfo_la_LINK) -rpath $(kde_moduledir) $(kio_metainfo_la_OBJECTS) $(kio_metainfo_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -617,22 +510,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/metainfo.Plo@am__quote@
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -642,13 +535,9 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 install-kdelnkDATA: $(kdelnk_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(kdelnkdir)" || $(mkdir_p) "$(DESTDIR)$(kdelnkdir)"
+	test -z "$(kdelnkdir)" || $(MKDIR_P) "$(DESTDIR)$(kdelnkdir)"
 	@list='$(kdelnk_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -713,22 +602,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -744,7 +632,7 @@
 all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS)
 installdirs:
 	for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(kdelnkdir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -777,14 +665,14 @@
 #>- clean-am: clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
 #>- 	mostlyclean-am
 #>+ 2
-clean-am: clean-closures clean-bcheck  clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
+clean-am: clean-bcheck  clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
 	mostlyclean-am
 
 distclean: distclean-am
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
@@ -800,14 +688,22 @@
 #>+ 1
 install-data-am:   install-kdelnkDATA
 
+install-dvi: install-dvi-am
+
 #>- install-exec-am:
 #>+ 1
 install-exec-am:  install-kde_moduleLTLIBRARIES
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -828,22 +724,24 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-kde_moduleLTLIBRARIES \
-	uninstall-kdelnkDATA
+uninstall-am: uninstall-kde_moduleLTLIBRARIES uninstall-kdelnkDATA
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-kde_moduleLTLIBRARIES clean-libtool ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
 	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-exec \
-	install-exec-am install-info install-info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am \
 	install-kde_moduleLTLIBRARIES install-kdelnkDATA install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
 	install-strip installcheck installcheck-am installdirs \
 	maintainer-clean maintainer-clean-generic mostlyclean \
 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
 	pdf pdf-am ps ps-am tags uninstall uninstall-am \
-	uninstall-info-am uninstall-kde_moduleLTLIBRARIES \
-	uninstall-kdelnkDATA
+	uninstall-kde_moduleLTLIBRARIES uninstall-kdelnkDATA
 
 
 #servicetypes_DATA = thumbcreator.desktop
@@ -856,22 +754,9 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
-#>+ 8
-kio_metainfo.la.closure: $(kio_metainfo_la_OBJECTS) $(kio_metainfo_la_DEPENDENCIES)
-	@echo "int main() {return 0;}" > kio_metainfo_la_closure.cpp
-	@$(LTCXXCOMPILE) -c kio_metainfo_la_closure.cpp
-	$(CXXLINK) kio_metainfo_la_closure.lo $(kio_metainfo_la_LDFLAGS) $(kio_metainfo_la_OBJECTS) $(kio_metainfo_la_LIBADD) $(LIBS)
-	@rm -f kio_metainfo_la_closure.* kio_metainfo.la.closure
-	@echo "timestamp" > kio_metainfo.la.closure
-
-
 #>+ 2
 KDE_DIST=Makefile.in metainfo.protocol Makefile.am 
 
-#>+ 3
-clean-closures:
-	-rm -f  kio_metainfo.la.closure
-
 #>+ 2
 docs-am:
 
--- kdelibs-3.5.7.orig/kioslave/bzip2/Makefile.in
+++ kdelibs-3.5.7/kioslave/bzip2/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,15 +16,11 @@
 @SET_MAKE@
 
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -70,7 +66,14 @@
 #>- kbzip2filter_la_OBJECTS = $(am_kbzip2filter_la_OBJECTS)
 #>+ 1
 kbzip2filter_la_OBJECTS = kbzip2filter.lo
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+#>- kbzip2filter_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(kbzip2filter_la_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+kbzip2filter_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(kbzip2filter_la_LDFLAGS) $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -78,19 +81,21 @@
 #>+ 2
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 #>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
 CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 3
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(kbzip2filter_la_SOURCES)
 DIST_SOURCES = $(kbzip2filter_la_SOURCES)
 kde_servicesDATA_INSTALL = $(INSTALL_DATA)
@@ -103,8 +108,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -112,13 +115,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -132,8 +135,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -154,17 +155,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -233,7 +231,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -270,12 +267,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -320,87 +319,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -424,75 +379,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -500,16 +397,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -528,7 +424,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -566,13 +462,13 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
+	test -z "$(kde_moduledir)" || $(MKDIR_P) "$(DESTDIR)$(kde_moduledir)"
 	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
@@ -583,7 +479,7 @@
 
 uninstall-kde_moduleLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
@@ -597,11 +493,8 @@
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
-#>- kbzip2filter.la: $(kbzip2filter_la_OBJECTS) $(kbzip2filter_la_DEPENDENCIES) 
-#>+ 2
-@KDE_USE_CLOSURE_TRUE@kbzip2filter.la: kbzip2filter.la.closure $(kbzip2filter_la_OBJECTS) $(kbzip2filter_la_DEPENDENCIES) 
-@KDE_USE_CLOSURE_FALSE@kbzip2filter.la: $(kbzip2filter_la_OBJECTS) $(kbzip2filter_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(kde_moduledir) $(kbzip2filter_la_LDFLAGS) $(kbzip2filter_la_OBJECTS) $(kbzip2filter_la_LIBADD) $(LIBS)
+kbzip2filter.la: $(kbzip2filter_la_OBJECTS) $(kbzip2filter_la_DEPENDENCIES) 
+	$(kbzip2filter_la_LINK) -rpath $(kde_moduledir) $(kbzip2filter_la_OBJECTS) $(kbzip2filter_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -612,22 +505,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kbzip2filter.Plo@am__quote@
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -637,13 +530,9 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 install-kde_servicesDATA: $(kde_services_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(kde_servicesdir)" || $(mkdir_p) "$(DESTDIR)$(kde_servicesdir)"
+	test -z "$(kde_servicesdir)" || $(MKDIR_P) "$(DESTDIR)$(kde_servicesdir)"
 	@list='$(kde_services_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -708,22 +597,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -739,7 +627,7 @@
 all-am: Makefile $(LTLIBRARIES) $(DATA)
 installdirs:
 	for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(kde_servicesdir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -772,14 +660,14 @@
 #>- clean-am: clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
 #>- 	mostlyclean-am
 #>+ 2
-clean-am: clean-closures clean-bcheck  clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
+clean-am: clean-bcheck  clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
 	mostlyclean-am
 
 distclean: distclean-am
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
@@ -797,14 +685,22 @@
 install-data-am:   \
 	install-kde_servicesDATA
 
+install-dvi: install-dvi-am
+
 #>- install-exec-am:
 #>+ 1
 install-exec-am:  install-kde_moduleLTLIBRARIES
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -825,43 +721,34 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-kde_moduleLTLIBRARIES \
+uninstall-am: uninstall-kde_moduleLTLIBRARIES \
 	uninstall-kde_servicesDATA
 
+.MAKE: install-am install-strip
+
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-kde_moduleLTLIBRARIES clean-libtool ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
 	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-exec \
-	install-exec-am install-info install-info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am \
 	install-kde_moduleLTLIBRARIES install-kde_servicesDATA \
-	install-man install-strip installcheck installcheck-am \
+	install-man install-pdf install-pdf-am install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
 	installdirs maintainer-clean maintainer-clean-generic \
 	mostlyclean mostlyclean-compile mostlyclean-generic \
 	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
-	uninstall-am uninstall-info-am uninstall-kde_moduleLTLIBRARIES \
+	uninstall-am uninstall-kde_moduleLTLIBRARIES \
 	uninstall-kde_servicesDATA
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
-#>+ 8
-kbzip2filter.la.closure: $(kbzip2filter_la_OBJECTS) $(kbzip2filter_la_DEPENDENCIES)
-	@echo "int main() {return 0;}" > kbzip2filter_la_closure.cpp
-	@$(LTCXXCOMPILE) -c kbzip2filter_la_closure.cpp
-	$(CXXLINK) kbzip2filter_la_closure.lo $(kbzip2filter_la_LDFLAGS) $(kbzip2filter_la_OBJECTS) $(kbzip2filter_la_LIBADD) $(LIBS)
-	@rm -f kbzip2filter_la_closure.* kbzip2filter.la.closure
-	@echo "timestamp" > kbzip2filter.la.closure
-
-
 #>+ 2
 KDE_DIST=Makefile.in kbzip2filter.h configure.in.in kbzip2filter.desktop Makefile.am 
 
-#>+ 3
-clean-closures:
-	-rm -f  kbzip2filter.la.closure
-
 #>+ 2
 docs-am:
 
--- kdelibs-3.5.7.orig/kioslave/ftp/Makefile.in
+++ kdelibs-3.5.7/kioslave/ftp/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -17,15 +17,11 @@
 
 
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -71,7 +67,14 @@
 #>- kio_ftp_la_OBJECTS = $(am_kio_ftp_la_OBJECTS)
 #>+ 1
 kio_ftp_la_OBJECTS = ftp.lo
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+#>- kio_ftp_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(kio_ftp_la_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+kio_ftp_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(kio_ftp_la_LDFLAGS) $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -79,19 +82,21 @@
 #>+ 2
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 #>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
 CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 3
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(kio_ftp_la_SOURCES)
 DIST_SOURCES = $(kio_ftp_la_SOURCES)
 kdelnkDATA_INSTALL = $(INSTALL_DATA)
@@ -105,8 +110,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -114,13 +117,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -134,8 +137,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -156,17 +157,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -235,7 +233,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -272,12 +269,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -322,87 +321,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -426,75 +381,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -502,16 +399,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -533,7 +429,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cc .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -571,13 +467,13 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
+	test -z "$(kde_moduledir)" || $(MKDIR_P) "$(DESTDIR)$(kde_moduledir)"
 	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
@@ -588,7 +484,7 @@
 
 uninstall-kde_moduleLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
@@ -602,11 +498,8 @@
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
-#>- kio_ftp.la: $(kio_ftp_la_OBJECTS) $(kio_ftp_la_DEPENDENCIES) 
-#>+ 2
-@KDE_USE_CLOSURE_TRUE@kio_ftp.la: kio_ftp.la.closure $(kio_ftp_la_OBJECTS) $(kio_ftp_la_DEPENDENCIES) 
-@KDE_USE_CLOSURE_FALSE@kio_ftp.la: $(kio_ftp_la_OBJECTS) $(kio_ftp_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(kde_moduledir) $(kio_ftp_la_LDFLAGS) $(kio_ftp_la_OBJECTS) $(kio_ftp_la_LIBADD) $(LIBS)
+kio_ftp.la: $(kio_ftp_la_OBJECTS) $(kio_ftp_la_DEPENDENCIES) 
+	$(kio_ftp_la_LINK) -rpath $(kde_moduledir) $(kio_ftp_la_OBJECTS) $(kio_ftp_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -617,22 +510,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ftp.Plo@am__quote@
 
 .cc.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cc.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cc.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -642,13 +535,9 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 install-kdelnkDATA: $(kdelnk_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(kdelnkdir)" || $(mkdir_p) "$(DESTDIR)$(kdelnkdir)"
+	test -z "$(kdelnkdir)" || $(MKDIR_P) "$(DESTDIR)$(kdelnkdir)"
 	@list='$(kdelnk_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -713,22 +602,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -744,7 +632,7 @@
 all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS)
 installdirs:
 	for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(kdelnkdir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -777,14 +665,14 @@
 #>- clean-am: clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
 #>- 	mostlyclean-am
 #>+ 2
-clean-am: clean-closures clean-bcheck  clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
+clean-am: clean-bcheck  clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
 	mostlyclean-am
 
 distclean: distclean-am
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
@@ -800,14 +688,22 @@
 #>+ 1
 install-data-am:   install-kdelnkDATA
 
+install-dvi: install-dvi-am
+
 #>- install-exec-am:
 #>+ 1
 install-exec-am:  install-kde_moduleLTLIBRARIES
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -828,43 +724,32 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-kde_moduleLTLIBRARIES \
-	uninstall-kdelnkDATA
+uninstall-am: uninstall-kde_moduleLTLIBRARIES uninstall-kdelnkDATA
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-kde_moduleLTLIBRARIES clean-libtool ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
 	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-exec \
-	install-exec-am install-info install-info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am \
 	install-kde_moduleLTLIBRARIES install-kdelnkDATA install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
 	install-strip installcheck installcheck-am installdirs \
 	maintainer-clean maintainer-clean-generic mostlyclean \
 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
 	pdf pdf-am ps ps-am tags uninstall uninstall-am \
-	uninstall-info-am uninstall-kde_moduleLTLIBRARIES \
-	uninstall-kdelnkDATA
+	uninstall-kde_moduleLTLIBRARIES uninstall-kdelnkDATA
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
-#>+ 8
-kio_ftp.la.closure: $(kio_ftp_la_OBJECTS) $(kio_ftp_la_DEPENDENCIES)
-	@echo "int main() {return 0;}" > kio_ftp_la_closure.cc
-	@$(LTCXXCOMPILE) -c kio_ftp_la_closure.cc
-	$(CXXLINK) kio_ftp_la_closure.lo $(kio_ftp_la_LDFLAGS) $(kio_ftp_la_OBJECTS) $(kio_ftp_la_LIBADD) $(LIBS)
-	@rm -f kio_ftp_la_closure.* kio_ftp.la.closure
-	@echo "timestamp" > kio_ftp.la.closure
-
-
 #>+ 2
 KDE_DIST=Makefile.in ftp.protocol configure.in.in Makefile.am 
 
-#>+ 3
-clean-closures:
-	-rm -f  kio_ftp.la.closure
-
 #>+ 2
 docs-am:
 
--- kdelibs-3.5.7.orig/kspell2/ui/Makefile.in
+++ kdelibs-3.5.7/kspell2/ui/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,15 +16,11 @@
 @SET_MAKE@
 
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -64,11 +60,20 @@
 	"$(DESTDIR)$(kspell2includedir)"
 libLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(lib_LTLIBRARIES) $(noinst_LTLIBRARIES)
-libkspell2_la_DEPENDENCIES = libkspell2_noinst.la ../libkspell2base.la
+am__DEPENDENCIES_1 =
+libkspell2_la_DEPENDENCIES = libkspell2_noinst.la ../libkspell2base.la \
+	$(am__DEPENDENCIES_1) ../../kutils/libkutils.la
 am_libkspell2_la_OBJECTS = dialog.lo
 #>- libkspell2_la_OBJECTS = $(am_libkspell2_la_OBJECTS)
 #>+ 1
 libkspell2_la_OBJECTS = dialog.lo
+#>- libkspell2_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(libkspell2_la_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+libkspell2_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(libkspell2_la_LDFLAGS) $(LDFLAGS) -o $@
 libkspell2_noinst_la_LIBADD =
 am_libkspell2_noinst_la_OBJECTS = configwidget.lo highlighter.lo \
 	configdialog.lo
@@ -79,7 +84,7 @@
 	configdialog.lo kspell2ui.lo configui.lo
 @KDE_USE_FINAL_FALSE@libkspell2_noinst_la_OBJECTS = $(libkspell2_noinst_la_nofinal_OBJECTS)
 @KDE_USE_FINAL_TRUE@libkspell2_noinst_la_OBJECTS = $(libkspell2_noinst_la_final_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -87,19 +92,21 @@
 #>+ 2
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 #>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
 CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 3
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(libkspell2_la_SOURCES) $(libkspell2_noinst_la_SOURCES)
 DIST_SOURCES = $(libkspell2_la_SOURCES) \
 	$(libkspell2_noinst_la_SOURCES)
@@ -113,8 +120,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -122,13 +127,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -142,8 +147,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -164,17 +167,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -243,7 +243,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -280,12 +279,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -330,87 +331,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -434,75 +391,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -510,16 +409,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -542,17 +440,15 @@
 	highlighter.cpp  configdialog.cpp kspell2ui.cpp configui.cpp
 
 libkspell2_la_SOURCES = dialog.cpp
-#>- libkspell2_la_LDFLAGS = -no-undefined -version-info 1:0:0 $(all_libraries)
-#>+ 1
-libkspell2_la_LDFLAGS = -no-undefined $(KDE_NO_UNDEFINED) -version-info 1:0:0 $(all_libraries)
-libkspell2_la_LIBADD = libkspell2_noinst.la ../libkspell2base.la
+libkspell2_la_LDFLAGS = -no-undefined -version-info 1:0:0 $(all_libraries)
+libkspell2_la_LIBADD = libkspell2_noinst.la ../libkspell2base.la $(LIB_KPARTS) ../../kutils/libkutils.la 
 #>- all: all-am
 #>+ 1
 all: docs-am  all-am
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -590,13 +486,13 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
@@ -607,7 +503,7 @@
 
 uninstall-libLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
@@ -630,13 +526,10 @@
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
-#>- libkspell2.la: $(libkspell2_la_OBJECTS) $(libkspell2_la_DEPENDENCIES) 
-#>+ 2
-@KDE_USE_CLOSURE_TRUE@libkspell2.la: libkspell2.la.closure $(libkspell2_la_OBJECTS) $(libkspell2_la_DEPENDENCIES) 
-@KDE_USE_CLOSURE_FALSE@libkspell2.la: $(libkspell2_la_OBJECTS) $(libkspell2_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(libdir) $(libkspell2_la_LDFLAGS) $(libkspell2_la_OBJECTS) $(libkspell2_la_LIBADD) $(LIBS)
+libkspell2.la: $(libkspell2_la_OBJECTS) $(libkspell2_la_DEPENDENCIES) 
+	$(libkspell2_la_LINK) -rpath $(libdir) $(libkspell2_la_OBJECTS) $(libkspell2_la_LIBADD) $(LIBS)
 libkspell2_noinst.la: $(libkspell2_noinst_la_OBJECTS) $(libkspell2_noinst_la_DEPENDENCIES) 
-	$(CXXLINK)  $(libkspell2_noinst_la_LDFLAGS) $(libkspell2_noinst_la_OBJECTS) $(libkspell2_noinst_la_LIBADD) $(LIBS)
+	$(CXXLINK)  $(libkspell2_noinst_la_OBJECTS) $(libkspell2_noinst_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -650,22 +543,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/highlighter.Plo@am__quote@
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -675,13 +568,9 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 install-kspell2includeHEADERS: $(kspell2include_HEADERS)
 	@$(NORMAL_INSTALL)
-	test -z "$(kspell2includedir)" || $(mkdir_p) "$(DESTDIR)$(kspell2includedir)"
+	test -z "$(kspell2includedir)" || $(MKDIR_P) "$(DESTDIR)$(kspell2includedir)"
 	@list='$(kspell2include_HEADERS)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -746,22 +635,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -777,7 +665,7 @@
 all-am: Makefile $(LTLIBRARIES) $(HEADERS)
 installdirs:
 	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(kspell2includedir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -810,14 +698,14 @@
 #>- clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
 #>- 	clean-noinstLTLIBRARIES mostlyclean-am
 #>+ 2
-clean-am: clean-metasources clean-ui clean-closures clean-bcheck clean-final  clean-generic clean-libLTLIBRARIES clean-libtool \
+clean-am: clean-metasources clean-ui clean-bcheck clean-final  clean-generic clean-libLTLIBRARIES clean-libtool \
 	clean-noinstLTLIBRARIES mostlyclean-am
 
 distclean: distclean-am
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
@@ -831,12 +719,20 @@
 
 install-data-am: install-kspell2includeHEADERS
 
+install-dvi: install-dvi-am
+
 install-exec-am: install-libLTLIBRARIES
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -857,22 +753,25 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-kspell2includeHEADERS \
-	uninstall-libLTLIBRARIES
+uninstall-am: uninstall-kspell2includeHEADERS uninstall-libLTLIBRARIES
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-libLTLIBRARIES clean-libtool clean-noinstLTLIBRARIES \
 	ctags distclean distclean-compile distclean-generic \
 	distclean-libtool distclean-tags distdir dvi dvi-am html \
 	html-am info info-am install install-am install-data \
-	install-data-am install-exec install-exec-am install-info \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
 	install-info-am install-kspell2includeHEADERS \
-	install-libLTLIBRARIES install-man install-strip installcheck \
+	install-libLTLIBRARIES install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
 	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-info-am \
-	uninstall-kspell2includeHEADERS uninstall-libLTLIBRARIES
+	tags uninstall uninstall-am uninstall-kspell2includeHEADERS \
+	uninstall-libLTLIBRARIES
 
 
 #>- dialog.lo: kspell2ui.h
@@ -882,15 +781,6 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
-#>+ 8
-libkspell2.la.closure: $(libkspell2_la_OBJECTS) $(libkspell2_la_DEPENDENCIES)
-	@echo "int main() {return 0;}" > libkspell2_la_closure.cpp
-	@$(LTCXXCOMPILE) -c libkspell2_la_closure.cpp
-	$(CXXLINK) libkspell2_la_closure.lo $(libkspell2_la_LDFLAGS) $(libkspell2_la_OBJECTS) $(libkspell2_la_LIBADD) $(LIBS)
-	@rm -f libkspell2_la_closure.* libkspell2.la.closure
-	@echo "timestamp" > libkspell2.la.closure
-
-
 #>+ 3
 dialog.moc: $(srcdir)/dialog.h
 	$(MOC) $(srcdir)/dialog.h -o dialog.moc
@@ -925,10 +815,6 @@
 	kspell2ui.cpp kspell2ui.h kspell2ui.moc \
 	configui.cpp configui.h configui.moc 
 
-#>+ 3
-clean-closures:
-	-rm -f  libkspell2.la.closure
-
 #>+ 2
 docs-am:
 
--- kdelibs-3.5.7.orig/kspell2/tests/Makefile.in
+++ kdelibs-3.5.7/kspell2/tests/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,15 +14,11 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -71,7 +67,8 @@
 #>+ 1
 test_configdialog_OBJECTS = test_configdialog.$(OBJEXT)
 test_configdialog_DEPENDENCIES = ../ui/libkspell2_noinst.la \
-	../libkspell2base.la $(am__DEPENDENCIES_1)
+	../libkspell2base.la $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) ../../kutils/libkutils.la
 am_test_dialog_OBJECTS = test_dialog.$(OBJEXT)
 #>- test_dialog_OBJECTS = $(am_test_dialog_OBJECTS)
 #>+ 1
@@ -87,8 +84,9 @@
 #>+ 1
 test_highlighter_OBJECTS = test_highlighter.$(OBJEXT)
 test_highlighter_DEPENDENCIES = ../ui/libkspell2_noinst.la \
-	../libkspell2base.la $(am__DEPENDENCIES_1)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+	../libkspell2base.la $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) ../../kutils/libkutils.la
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -96,19 +94,21 @@
 #>+ 2
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 #>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
 CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 3
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(backgroundtest_SOURCES) $(test_SOURCES) \
 	$(test_configdialog_SOURCES) $(test_dialog_SOURCES) \
 	$(test_filter_SOURCES) $(test_highlighter_SOURCES)
@@ -123,8 +123,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -132,13 +130,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -152,8 +150,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -174,17 +170,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -253,7 +246,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -290,12 +282,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -340,87 +334,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -444,75 +394,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -520,16 +412,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -546,16 +437,16 @@
 test_dialog_SOURCES = test_dialog.cpp
 test_dialog_LDADD = ../ui/libkspell2.la $(LIB_KDECORE)
 test_highlighter_SOURCES = test_highlighter.cpp
-test_highlighter_LDADD = ../ui/libkspell2_noinst.la ../libkspell2base.la $(LIB_KDECORE)
+test_highlighter_LDADD = ../ui/libkspell2_noinst.la ../libkspell2base.la $(LIB_KDECORE) $(LIB_KPARTS) ../../kutils/libkutils.la
 test_configdialog_SOURCES = test_configdialog.cpp
-test_configdialog_LDADD = ../ui/libkspell2_noinst.la ../libkspell2base.la $(LIB_KDECORE)
+test_configdialog_LDADD = ../ui/libkspell2_noinst.la ../libkspell2base.la $(LIB_KDECORE) $(LIB_KPARTS) ../../kutils/libkutils.la
 #>- all: all-am
 #>+ 1
 all: docs-am  all-am
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -593,9 +484,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 clean-checkPROGRAMS:
@@ -606,22 +497,22 @@
 	done
 backgroundtest$(EXEEXT): $(backgroundtest_OBJECTS) $(backgroundtest_DEPENDENCIES) 
 	@rm -f backgroundtest$(EXEEXT)
-	$(CXXLINK) $(backgroundtest_LDFLAGS) $(backgroundtest_OBJECTS) $(backgroundtest_LDADD) $(LIBS)
+	$(CXXLINK) $(backgroundtest_OBJECTS) $(backgroundtest_LDADD) $(LIBS)
 test$(EXEEXT): $(test_OBJECTS) $(test_DEPENDENCIES) 
 	@rm -f test$(EXEEXT)
-	$(CXXLINK) $(test_LDFLAGS) $(test_OBJECTS) $(test_LDADD) $(LIBS)
+	$(CXXLINK) $(test_OBJECTS) $(test_LDADD) $(LIBS)
 test_configdialog$(EXEEXT): $(test_configdialog_OBJECTS) $(test_configdialog_DEPENDENCIES) 
 	@rm -f test_configdialog$(EXEEXT)
-	$(CXXLINK) $(test_configdialog_LDFLAGS) $(test_configdialog_OBJECTS) $(test_configdialog_LDADD) $(LIBS)
+	$(CXXLINK) $(test_configdialog_OBJECTS) $(test_configdialog_LDADD) $(LIBS)
 test_dialog$(EXEEXT): $(test_dialog_OBJECTS) $(test_dialog_DEPENDENCIES) 
 	@rm -f test_dialog$(EXEEXT)
-	$(CXXLINK) $(test_dialog_LDFLAGS) $(test_dialog_OBJECTS) $(test_dialog_LDADD) $(LIBS)
+	$(CXXLINK) $(test_dialog_OBJECTS) $(test_dialog_LDADD) $(LIBS)
 test_filter$(EXEEXT): $(test_filter_OBJECTS) $(test_filter_DEPENDENCIES) 
 	@rm -f test_filter$(EXEEXT)
-	$(CXXLINK) $(test_filter_LDFLAGS) $(test_filter_OBJECTS) $(test_filter_LDADD) $(LIBS)
+	$(CXXLINK) $(test_filter_OBJECTS) $(test_filter_LDADD) $(LIBS)
 test_highlighter$(EXEEXT): $(test_highlighter_OBJECTS) $(test_highlighter_DEPENDENCIES) 
 	@rm -f test_highlighter$(EXEEXT)
-	$(CXXLINK) $(test_highlighter_LDFLAGS) $(test_highlighter_OBJECTS) $(test_highlighter_LDADD) $(LIBS)
+	$(CXXLINK) $(test_highlighter_OBJECTS) $(test_highlighter_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -637,22 +528,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_highlighter.Po@am__quote@
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -663,10 +554,6 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -716,22 +603,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -785,7 +671,7 @@
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
@@ -799,12 +685,20 @@
 
 install-data-am:
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -825,19 +719,23 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am
+uninstall-am:
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean \
 	clean-checkPROGRAMS clean-generic clean-libtool ctags \
 	distclean distclean-compile distclean-generic \
 	distclean-libtool distclean-tags distdir dvi dvi-am html \
 	html-am info info-am install install-am install-data \
-	install-data-am install-exec install-exec-am install-info \
-	install-info-am install-man install-strip installcheck \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
 	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-info-am
+	tags uninstall uninstall-am
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- kdelibs-3.5.7.orig/kspell2/plugins/hspell/Makefile.in
+++ kdelibs-3.5.7/kspell2/plugins/hspell/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,15 +16,11 @@
 @SET_MAKE@
 
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -73,7 +69,14 @@
 	kspell_hspelldict.lo
 @KDE_USE_FINAL_FALSE@kspell_hspell_la_OBJECTS = $(kspell_hspell_la_nofinal_OBJECTS)
 @KDE_USE_FINAL_TRUE@kspell_hspell_la_OBJECTS = $(kspell_hspell_la_final_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+#>- kspell_hspell_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(kspell_hspell_la_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+kspell_hspell_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(kspell_hspell_la_LDFLAGS) $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -81,19 +84,21 @@
 #>+ 2
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
-#>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+#>+ 3
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
 CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 3
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(kspell_hspell_la_SOURCES)
 DIST_SOURCES = $(kspell_hspell_la_SOURCES)
 serviceDATA_INSTALL = $(INSTALL_DATA)
@@ -106,8 +111,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -115,13 +118,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -135,8 +138,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -157,17 +158,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -236,7 +234,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -273,12 +270,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -323,87 +322,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -427,75 +382,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -503,16 +400,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -526,9 +422,7 @@
 AM_LDFLAGS = $(LDFLAGS_AS_NEEDED) $(LDFLAGS_NEW_DTAGS)
 kde_module_LTLIBRARIES = kspell_hspell.la
 kspell_hspell_la_SOURCES = kspell_hspellclient.cpp kspell_hspelldict.cpp
-#>- kspell_hspell_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN)
-#>+ 1
-kspell_hspell_la_LDFLAGS = -module -no-undefined $(KDE_NO_UNDEFINED) $(KDE_PLUGIN)
+kspell_hspell_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN)
 kspell_hspell_la_LIBADD = ../../ui/libkspell2.la -lhspell -lz
 service_DATA = kspell_hspell.desktop
 servicedir = $(kde_servicesdir)
@@ -538,7 +432,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -576,13 +470,13 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
+	test -z "$(kde_moduledir)" || $(MKDIR_P) "$(DESTDIR)$(kde_moduledir)"
 	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
@@ -593,7 +487,7 @@
 
 uninstall-kde_moduleLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
@@ -607,11 +501,8 @@
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
-#>- kspell_hspell.la: $(kspell_hspell_la_OBJECTS) $(kspell_hspell_la_DEPENDENCIES) 
-#>+ 2
-@KDE_USE_CLOSURE_TRUE@kspell_hspell.la: kspell_hspell.la.closure $(kspell_hspell_la_OBJECTS) $(kspell_hspell_la_DEPENDENCIES) 
-@KDE_USE_CLOSURE_FALSE@kspell_hspell.la: $(kspell_hspell_la_OBJECTS) $(kspell_hspell_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(kde_moduledir) $(kspell_hspell_la_LDFLAGS) $(kspell_hspell_la_OBJECTS) $(kspell_hspell_la_LIBADD) $(LIBS)
+kspell_hspell.la: $(kspell_hspell_la_OBJECTS) $(kspell_hspell_la_DEPENDENCIES) 
+	$(kspell_hspell_la_LINK) -rpath $(kde_moduledir) $(kspell_hspell_la_OBJECTS) $(kspell_hspell_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -623,22 +514,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kspell_hspelldict.Plo@am__quote@
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -648,13 +539,9 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 install-serviceDATA: $(service_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(servicedir)" || $(mkdir_p) "$(DESTDIR)$(servicedir)"
+	test -z "$(servicedir)" || $(MKDIR_P) "$(DESTDIR)$(servicedir)"
 	@list='$(service_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -719,22 +606,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -750,7 +636,7 @@
 all-am: Makefile $(LTLIBRARIES) $(DATA)
 installdirs:
 	for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(servicedir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -783,14 +669,14 @@
 #>- clean-am: clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
 #>- 	mostlyclean-am
 #>+ 2
-clean-am: clean-metasources clean-closures clean-bcheck clean-final  clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
+clean-am: clean-metasources clean-bcheck clean-final  clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
 	mostlyclean-am
 
 distclean: distclean-am
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
@@ -806,14 +692,22 @@
 #>+ 1
 install-data-am:   install-serviceDATA
 
+install-dvi: install-dvi-am
+
 #>- install-exec-am:
 #>+ 1
 install-exec-am:  install-kde_moduleLTLIBRARIES
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -834,36 +728,29 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-kde_moduleLTLIBRARIES \
-	uninstall-serviceDATA
+uninstall-am: uninstall-kde_moduleLTLIBRARIES uninstall-serviceDATA
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-kde_moduleLTLIBRARIES clean-libtool ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
 	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-exec \
-	install-exec-am install-info install-info-am \
-	install-kde_moduleLTLIBRARIES install-man install-serviceDATA \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am \
+	install-kde_moduleLTLIBRARIES install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-serviceDATA \
 	install-strip installcheck installcheck-am installdirs \
 	maintainer-clean maintainer-clean-generic mostlyclean \
 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
 	pdf pdf-am ps ps-am tags uninstall uninstall-am \
-	uninstall-info-am uninstall-kde_moduleLTLIBRARIES \
-	uninstall-serviceDATA
+	uninstall-kde_moduleLTLIBRARIES uninstall-serviceDATA
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
-#>+ 8
-kspell_hspell.la.closure: $(kspell_hspell_la_OBJECTS) $(kspell_hspell_la_DEPENDENCIES)
-	@echo "int main() {return 0;}" > kspell_hspell_la_closure.cpp
-	@$(LTCXXCOMPILE) -c kspell_hspell_la_closure.cpp
-	$(CXXLINK) kspell_hspell_la_closure.lo $(kspell_hspell_la_LDFLAGS) $(kspell_hspell_la_OBJECTS) $(kspell_hspell_la_LIBADD) $(LIBS)
-	@rm -f kspell_hspell_la_closure.* kspell_hspell.la.closure
-	@echo "timestamp" > kspell_hspell.la.closure
-
-
 #>+ 3
 kspell_hspellclient.moc: $(srcdir)/kspell_hspellclient.h
 	$(MOC) $(srcdir)/kspell_hspellclient.h -o kspell_hspellclient.moc
@@ -878,10 +765,6 @@
 #>+ 2
 KDE_DIST=kspell_hspellclient.h Makefile.in kspell_hspell.desktop kspell_hspelldict.h Makefile.am 
 
-#>+ 3
-clean-closures:
-	-rm -f  kspell_hspell.la.closure
-
 #>+ 2
 docs-am:
 
--- kdelibs-3.5.7.orig/kspell2/plugins/aspell/Makefile.in
+++ kdelibs-3.5.7/kspell2/plugins/aspell/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,15 +16,11 @@
 @SET_MAKE@
 
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -73,7 +69,14 @@
 	kspell_aspelldict.lo
 @KDE_USE_FINAL_FALSE@kspell_aspell_la_OBJECTS = $(kspell_aspell_la_nofinal_OBJECTS)
 @KDE_USE_FINAL_TRUE@kspell_aspell_la_OBJECTS = $(kspell_aspell_la_final_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+#>- kspell_aspell_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(kspell_aspell_la_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+kspell_aspell_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(kspell_aspell_la_LDFLAGS) $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -81,19 +84,21 @@
 #>+ 2
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
-#>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+#>+ 3
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
 CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 3
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(kspell_aspell_la_SOURCES)
 DIST_SOURCES = $(kspell_aspell_la_SOURCES)
 serviceDATA_INSTALL = $(INSTALL_DATA)
@@ -106,8 +111,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -115,13 +118,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -135,8 +138,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -157,17 +158,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -236,7 +234,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -273,12 +270,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -323,87 +322,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -427,75 +382,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -503,16 +400,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -526,9 +422,7 @@
 AM_LDFLAGS = $(LDFLAGS_AS_NEEDED) $(LDFLAGS_NEW_DTAGS)
 kde_module_LTLIBRARIES = kspell_aspell.la
 kspell_aspell_la_SOURCES = kspell_aspellclient.cpp kspell_aspelldict.cpp
-#>- kspell_aspell_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN)
-#>+ 1
-kspell_aspell_la_LDFLAGS = -module -no-undefined $(KDE_NO_UNDEFINED) $(KDE_PLUGIN)
+kspell_aspell_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN)
 kspell_aspell_la_LIBADD = ../../ui/libkspell2.la -laspell
 service_DATA = kspell_aspell.desktop
 servicedir = $(kde_servicesdir)
@@ -538,7 +432,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -576,13 +470,13 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
+	test -z "$(kde_moduledir)" || $(MKDIR_P) "$(DESTDIR)$(kde_moduledir)"
 	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
@@ -593,7 +487,7 @@
 
 uninstall-kde_moduleLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
@@ -607,11 +501,8 @@
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
-#>- kspell_aspell.la: $(kspell_aspell_la_OBJECTS) $(kspell_aspell_la_DEPENDENCIES) 
-#>+ 2
-@KDE_USE_CLOSURE_TRUE@kspell_aspell.la: kspell_aspell.la.closure $(kspell_aspell_la_OBJECTS) $(kspell_aspell_la_DEPENDENCIES) 
-@KDE_USE_CLOSURE_FALSE@kspell_aspell.la: $(kspell_aspell_la_OBJECTS) $(kspell_aspell_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(kde_moduledir) $(kspell_aspell_la_LDFLAGS) $(kspell_aspell_la_OBJECTS) $(kspell_aspell_la_LIBADD) $(LIBS)
+kspell_aspell.la: $(kspell_aspell_la_OBJECTS) $(kspell_aspell_la_DEPENDENCIES) 
+	$(kspell_aspell_la_LINK) -rpath $(kde_moduledir) $(kspell_aspell_la_OBJECTS) $(kspell_aspell_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -623,22 +514,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kspell_aspelldict.Plo@am__quote@
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -648,13 +539,9 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 install-serviceDATA: $(service_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(servicedir)" || $(mkdir_p) "$(DESTDIR)$(servicedir)"
+	test -z "$(servicedir)" || $(MKDIR_P) "$(DESTDIR)$(servicedir)"
 	@list='$(service_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -719,22 +606,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -750,7 +636,7 @@
 all-am: Makefile $(LTLIBRARIES) $(DATA)
 installdirs:
 	for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(servicedir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -783,14 +669,14 @@
 #>- clean-am: clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
 #>- 	mostlyclean-am
 #>+ 2
-clean-am: clean-metasources clean-closures clean-bcheck clean-final  clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
+clean-am: clean-metasources clean-bcheck clean-final  clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
 	mostlyclean-am
 
 distclean: distclean-am
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
@@ -806,14 +692,22 @@
 #>+ 1
 install-data-am:   install-serviceDATA
 
+install-dvi: install-dvi-am
+
 #>- install-exec-am:
 #>+ 1
 install-exec-am:  install-kde_moduleLTLIBRARIES
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -834,36 +728,29 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-kde_moduleLTLIBRARIES \
-	uninstall-serviceDATA
+uninstall-am: uninstall-kde_moduleLTLIBRARIES uninstall-serviceDATA
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-kde_moduleLTLIBRARIES clean-libtool ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
 	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-exec \
-	install-exec-am install-info install-info-am \
-	install-kde_moduleLTLIBRARIES install-man install-serviceDATA \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am \
+	install-kde_moduleLTLIBRARIES install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-serviceDATA \
 	install-strip installcheck installcheck-am installdirs \
 	maintainer-clean maintainer-clean-generic mostlyclean \
 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
 	pdf pdf-am ps ps-am tags uninstall uninstall-am \
-	uninstall-info-am uninstall-kde_moduleLTLIBRARIES \
-	uninstall-serviceDATA
+	uninstall-kde_moduleLTLIBRARIES uninstall-serviceDATA
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
-#>+ 8
-kspell_aspell.la.closure: $(kspell_aspell_la_OBJECTS) $(kspell_aspell_la_DEPENDENCIES)
-	@echo "int main() {return 0;}" > kspell_aspell_la_closure.cpp
-	@$(LTCXXCOMPILE) -c kspell_aspell_la_closure.cpp
-	$(CXXLINK) kspell_aspell_la_closure.lo $(kspell_aspell_la_LDFLAGS) $(kspell_aspell_la_OBJECTS) $(kspell_aspell_la_LIBADD) $(LIBS)
-	@rm -f kspell_aspell_la_closure.* kspell_aspell.la.closure
-	@echo "timestamp" > kspell_aspell.la.closure
-
-
 #>+ 3
 kspell_aspellclient.moc: $(srcdir)/kspell_aspellclient.h
 	$(MOC) $(srcdir)/kspell_aspellclient.h -o kspell_aspellclient.moc
@@ -878,10 +765,6 @@
 #>+ 2
 KDE_DIST=Makefile.in kspell_aspell.desktop kspell_aspellclient.h kspell_aspelldict.h Makefile.am 
 
-#>+ 3
-clean-closures:
-	-rm -f  kspell_aspell.la.closure
-
 #>+ 2
 docs-am:
 
--- kdelibs-3.5.7.orig/kspell2/plugins/ispell/Makefile.in
+++ kdelibs-3.5.7/kspell2/plugins/ispell/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,15 +16,11 @@
 @SET_MAKE@
 
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -75,7 +71,14 @@
 	makedent.lo tgood.lo ispell_checker.lo
 @KDE_USE_FINAL_FALSE@kspell_ispell_la_OBJECTS = $(kspell_ispell_la_nofinal_OBJECTS)
 @KDE_USE_FINAL_TRUE@kspell_ispell_la_OBJECTS = $(kspell_ispell_la_final_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+#>- kspell_ispell_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(kspell_ispell_la_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+kspell_ispell_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(kspell_ispell_la_LDFLAGS) $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -83,19 +86,21 @@
 #>+ 2
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
-#>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+#>+ 3
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
 CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 3
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(kspell_ispell_la_SOURCES)
 DIST_SOURCES = $(kspell_ispell_la_SOURCES)
 serviceDATA_INSTALL = $(INSTALL_DATA)
@@ -108,8 +113,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -117,13 +120,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -137,8 +140,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -159,17 +160,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -238,7 +236,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -275,12 +272,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -325,87 +324,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -429,75 +384,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -505,16 +402,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -536,9 +432,7 @@
 	tgood.cpp		\
 	ispell_checker.cpp
 
-#>- kspell_ispell_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN)
-#>+ 1
-kspell_ispell_la_LDFLAGS = -module -no-undefined $(KDE_NO_UNDEFINED) $(KDE_PLUGIN)
+kspell_ispell_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN)
 kspell_ispell_la_LIBADD = ../../ui/libkspell2.la 
 service_DATA = kspell_ispell.desktop
 servicedir = $(kde_servicesdir)
@@ -548,7 +442,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -586,13 +480,13 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
+	test -z "$(kde_moduledir)" || $(MKDIR_P) "$(DESTDIR)$(kde_moduledir)"
 	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
@@ -603,7 +497,7 @@
 
 uninstall-kde_moduleLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
@@ -617,11 +511,8 @@
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
-#>- kspell_ispell.la: $(kspell_ispell_la_OBJECTS) $(kspell_ispell_la_DEPENDENCIES) 
-#>+ 2
-@KDE_USE_CLOSURE_TRUE@kspell_ispell.la: kspell_ispell.la.closure $(kspell_ispell_la_OBJECTS) $(kspell_ispell_la_DEPENDENCIES) 
-@KDE_USE_CLOSURE_FALSE@kspell_ispell.la: $(kspell_ispell_la_OBJECTS) $(kspell_ispell_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(kde_moduledir) $(kspell_ispell_la_LDFLAGS) $(kspell_ispell_la_OBJECTS) $(kspell_ispell_la_LIBADD) $(LIBS)
+kspell_ispell.la: $(kspell_ispell_la_OBJECTS) $(kspell_ispell_la_DEPENDENCIES) 
+	$(kspell_ispell_la_LINK) -rpath $(kde_moduledir) $(kspell_ispell_la_OBJECTS) $(kspell_ispell_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -640,22 +531,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tgood.Plo@am__quote@
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -665,13 +556,9 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 install-serviceDATA: $(service_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(servicedir)" || $(mkdir_p) "$(DESTDIR)$(servicedir)"
+	test -z "$(servicedir)" || $(MKDIR_P) "$(DESTDIR)$(servicedir)"
 	@list='$(service_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -736,22 +623,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -767,7 +653,7 @@
 all-am: Makefile $(LTLIBRARIES) $(DATA)
 installdirs:
 	for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(servicedir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -800,14 +686,14 @@
 #>- clean-am: clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
 #>- 	mostlyclean-am
 #>+ 2
-clean-am: clean-metasources clean-closures clean-bcheck clean-final  clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
+clean-am: clean-metasources clean-bcheck clean-final  clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
 	mostlyclean-am
 
 distclean: distclean-am
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
@@ -823,14 +709,22 @@
 #>+ 1
 install-data-am:   install-serviceDATA
 
+install-dvi: install-dvi-am
+
 #>- install-exec-am:
 #>+ 1
 install-exec-am:  install-kde_moduleLTLIBRARIES
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -851,36 +745,29 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-kde_moduleLTLIBRARIES \
-	uninstall-serviceDATA
+uninstall-am: uninstall-kde_moduleLTLIBRARIES uninstall-serviceDATA
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-kde_moduleLTLIBRARIES clean-libtool ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
 	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-exec \
-	install-exec-am install-info install-info-am \
-	install-kde_moduleLTLIBRARIES install-man install-serviceDATA \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am \
+	install-kde_moduleLTLIBRARIES install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-serviceDATA \
 	install-strip installcheck installcheck-am installdirs \
 	maintainer-clean maintainer-clean-generic mostlyclean \
 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
 	pdf pdf-am ps ps-am tags uninstall uninstall-am \
-	uninstall-info-am uninstall-kde_moduleLTLIBRARIES \
-	uninstall-serviceDATA
+	uninstall-kde_moduleLTLIBRARIES uninstall-serviceDATA
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
-#>+ 8
-kspell_ispell.la.closure: $(kspell_ispell_la_OBJECTS) $(kspell_ispell_la_DEPENDENCIES)
-	@echo "int main() {return 0;}" > kspell_ispell_la_closure.cpp
-	@$(LTCXXCOMPILE) -c kspell_ispell_la_closure.cpp
-	$(CXXLINK) kspell_ispell_la_closure.lo $(kspell_ispell_la_LDFLAGS) $(kspell_ispell_la_OBJECTS) $(kspell_ispell_la_LIBADD) $(LIBS)
-	@rm -f kspell_ispell_la_closure.* kspell_ispell.la.closure
-	@echo "timestamp" > kspell_ispell.la.closure
-
-
 #>+ 3
 kspell_ispellclient.moc: $(srcdir)/kspell_ispellclient.h
 	$(MOC) $(srcdir)/kspell_ispellclient.h -o kspell_ispellclient.moc
@@ -895,10 +782,6 @@
 #>+ 2
 KDE_DIST=Makefile.in kspell_ispelldict.h kspell_ispellclient.h msgs.h ispell_def.h ispell_checker.h sp_spell.h ispell.h kspell_ispell.desktop Makefile.am 
 
-#>+ 3
-clean-closures:
-	-rm -f  kspell_ispell.la.closure
-
 #>+ 2
 docs-am:
 
--- kdelibs-3.5.7.orig/kspell2/plugins/Makefile.in
+++ kdelibs-3.5.7/kspell2/plugins/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,15 +14,11 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -55,17 +51,21 @@
 DIST_SOURCES =
 #>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 #>- 	html-recursive info-recursive install-data-recursive \
-#>- 	install-exec-recursive install-info-recursive \
-#>- 	install-recursive installcheck-recursive installdirs-recursive \
-#>- 	pdf-recursive ps-recursive uninstall-info-recursive \
-#>- 	uninstall-recursive
-#>+ 6
+#>- 	install-dvi-recursive install-exec-recursive \
+#>- 	install-html-recursive install-info-recursive \
+#>- 	install-pdf-recursive install-ps-recursive install-recursive \
+#>- 	installcheck-recursive installdirs-recursive pdf-recursive \
+#>- 	ps-recursive uninstall-recursive
+#>+ 7
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	html-recursive info-recursive install-data-recursive \
-	install-exec-recursive install-info-recursive \
-	install-recursive installcheck-recursive installdirs-recursive \
-	pdf-recursive ps-recursive uninstall-info-recursive \
-	uninstall-recursive nmcheck-recursive bcheck-recursive
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive nmcheck-recursive bcheck-recursive
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = aspell hspell ispell
@@ -75,8 +75,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -84,13 +82,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -104,8 +102,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -126,17 +122,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -205,7 +198,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -242,12 +234,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -292,87 +286,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -396,75 +346,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -472,16 +364,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -495,7 +386,7 @@
 all: docs-am  all-recursive
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -533,9 +424,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 mostlyclean-libtool:
@@ -544,10 +435,6 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
 # To change the values of `make' variables: instead of editing Makefiles,
@@ -579,8 +466,7 @@
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
+$(RECURSIVE_CLEAN_TARGETS):
 	@failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
@@ -681,22 +567,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -710,7 +595,7 @@
 	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
-	    || $(mkdir_p) "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 	    || exit 1; \
 	    distdir=`$(am__cd) $(distdir) && pwd`; \
 	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
@@ -718,6 +603,8 @@
 	      $(MAKE) $(AM_MAKEFLAGS) \
 	        top_distdir="$$top_distdir" \
 	        distdir="$$distdir/$$subdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -761,8 +648,7 @@
 
 distclean: distclean-recursive
 	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool \
-	distclean-tags
+distclean-am: clean-am distclean-generic distclean-tags
 
 dvi: dvi-recursive
 
@@ -776,12 +662,20 @@
 
 install-data-am:
 
+install-dvi: install-dvi-recursive
+
 install-exec-am:
 
+install-html: install-html-recursive
+
 install-info: install-info-recursive
 
 install-man:
 
+install-pdf: install-pdf-recursive
+
+install-ps: install-ps-recursive
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
@@ -800,22 +694,24 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am
+uninstall-am:
 
-uninstall-info: uninstall-info-recursive
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+	install-strip
 
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-	clean clean-generic clean-libtool clean-recursive ctags \
-	ctags-recursive distclean distclean-generic distclean-libtool \
-	distclean-recursive distclean-tags distdir dvi dvi-am html \
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+	all all-am check check-am clean clean-generic clean-libtool \
+	ctags ctags-recursive distclean distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
 	html-am info info-am install install-am install-data \
-	install-data-am install-exec install-exec-am install-info \
-	install-info-am install-man install-strip installcheck \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
 	installcheck-am installdirs installdirs-am maintainer-clean \
-	maintainer-clean-generic maintainer-clean-recursive \
-	mostlyclean mostlyclean-generic mostlyclean-libtool \
-	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
-	uninstall uninstall-am uninstall-info-am
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
+	uninstall uninstall-am
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- kdelibs-3.5.7.orig/kspell2/Makefile.in
+++ kdelibs-3.5.7/kspell2/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -17,15 +17,11 @@
 
 
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -57,9 +53,7 @@
 	$(top_builddir)/kjs/global.h
 CONFIG_CLEAN_FILES =
 LTLIBRARIES = $(noinst_LTLIBRARIES)
-am__DEPENDENCIES_1 =
-libkspell2base_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-	../kutils/libkutils.la
+libkspell2base_la_LIBADD =
 am_libkspell2base_la_OBJECTS = settings.lo broker.lo client.lo \
 	filter.lo backgroundchecker.lo backgroundthread.lo \
 	backgroundengine.lo defaultdictionary.lo
@@ -71,7 +65,14 @@
 	backgroundengine.lo defaultdictionary.lo
 @KDE_USE_FINAL_FALSE@libkspell2base_la_OBJECTS = $(libkspell2base_la_nofinal_OBJECTS)
 @KDE_USE_FINAL_TRUE@libkspell2base_la_OBJECTS = $(libkspell2base_la_final_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+#>- libkspell2base_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(libkspell2base_la_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+libkspell2base_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(libkspell2base_la_LDFLAGS) $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -79,34 +80,38 @@
 #>+ 2
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 #>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
 CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 3
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(libkspell2base_la_SOURCES)
 DIST_SOURCES = $(libkspell2base_la_SOURCES)
 #>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 #>- 	html-recursive info-recursive install-data-recursive \
-#>- 	install-exec-recursive install-info-recursive \
-#>- 	install-recursive installcheck-recursive installdirs-recursive \
-#>- 	pdf-recursive ps-recursive uninstall-info-recursive \
-#>- 	uninstall-recursive
-#>+ 6
+#>- 	install-dvi-recursive install-exec-recursive \
+#>- 	install-html-recursive install-info-recursive \
+#>- 	install-pdf-recursive install-ps-recursive install-recursive \
+#>- 	installcheck-recursive installdirs-recursive pdf-recursive \
+#>- 	ps-recursive uninstall-recursive
+#>+ 7
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	html-recursive info-recursive install-data-recursive \
-	install-exec-recursive install-info-recursive \
-	install-recursive installcheck-recursive installdirs-recursive \
-	pdf-recursive ps-recursive uninstall-info-recursive \
-	uninstall-recursive nmcheck-recursive bcheck-recursive
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive nmcheck-recursive bcheck-recursive
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -119,6 +124,8 @@
 DATA = $(servicetype_DATA)
 kspell2baseincludeHEADERS_INSTALL = $(INSTALL_HEADER)
 HEADERS = $(kspell2baseinclude_HEADERS)
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
@@ -128,8 +135,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -137,13 +142,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -157,8 +162,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -179,17 +182,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -258,7 +258,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -295,12 +294,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -345,87 +346,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -449,75 +406,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -525,16 +424,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -554,10 +452,7 @@
 	backgroundthread.cpp backgroundengine.cpp \
 	defaultdictionary.cpp 
 
-#>- libkspell2base_la_LDFLAGS = -no-undefined $(all_libraries)
-#>+ 1
-libkspell2base_la_LDFLAGS = -no-undefined $(KDE_NO_UNDEFINED) $(all_libraries)
-libkspell2base_la_LIBADD = $(LIB_KPARTS) ../kutils/libkutils.la 
+libkspell2base_la_LDFLAGS = -no-undefined $(all_libraries)
 servicetype_DATA = kspellclient.desktop
 servicetypedir = $(kde_servicetypesdir)
 #>- all: all-recursive
@@ -566,7 +461,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -604,9 +499,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 clean-noinstLTLIBRARIES:
@@ -617,11 +512,8 @@
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
-#>- libkspell2base.la: $(libkspell2base_la_OBJECTS) $(libkspell2base_la_DEPENDENCIES) 
-#>+ 2
-@KDE_USE_CLOSURE_TRUE@libkspell2base.la: libkspell2base.la.closure $(libkspell2base_la_OBJECTS) $(libkspell2base_la_DEPENDENCIES) 
-@KDE_USE_CLOSURE_FALSE@libkspell2base.la: $(libkspell2base_la_OBJECTS) $(libkspell2base_la_DEPENDENCIES) 
-	$(CXXLINK)  $(libkspell2base_la_LDFLAGS) $(libkspell2base_la_OBJECTS) $(libkspell2base_la_LIBADD) $(LIBS)
+libkspell2base.la: $(libkspell2base_la_OBJECTS) $(libkspell2base_la_DEPENDENCIES) 
+	$(libkspell2base_la_LINK)  $(libkspell2base_la_OBJECTS) $(libkspell2base_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -639,22 +531,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/settings.Plo@am__quote@
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -664,13 +556,9 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 install-servicetypeDATA: $(servicetype_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(servicetypedir)" || $(mkdir_p) "$(DESTDIR)$(servicetypedir)"
+	test -z "$(servicetypedir)" || $(MKDIR_P) "$(DESTDIR)$(servicetypedir)"
 	@list='$(servicetype_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -687,7 +575,7 @@
 	done
 install-kspell2baseincludeHEADERS: $(kspell2baseinclude_HEADERS)
 	@$(NORMAL_INSTALL)
-	test -z "$(kspell2baseincludedir)" || $(mkdir_p) "$(DESTDIR)$(kspell2baseincludedir)"
+	test -z "$(kspell2baseincludedir)" || $(MKDIR_P) "$(DESTDIR)$(kspell2baseincludedir)"
 	@list='$(kspell2baseinclude_HEADERS)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -734,8 +622,7 @@
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
+$(RECURSIVE_CLEAN_TARGETS):
 	@failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
@@ -836,23 +723,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	$(mkdir_p) $(distdir)/../admin
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -866,7 +751,7 @@
 	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
-	    || $(mkdir_p) "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 	    || exit 1; \
 	    distdir=`$(am__cd) $(distdir) && pwd`; \
 	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
@@ -874,6 +759,8 @@
 	      $(MAKE) $(AM_MAKEFLAGS) \
 	        top_distdir="$$top_distdir" \
 	        distdir="$$distdir/$$subdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -884,7 +771,7 @@
 installdirs: installdirs-recursive
 installdirs-am:
 	for dir in "$(DESTDIR)$(servicetypedir)" "$(DESTDIR)$(kspell2baseincludedir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-recursive
 install-exec: install-exec-recursive
@@ -917,14 +804,14 @@
 #>- clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
 #>- 	mostlyclean-am
 #>+ 2
-clean-am: clean-metasources clean-closures clean-bcheck clean-final  clean-generic clean-libtool clean-noinstLTLIBRARIES \
+clean-am: clean-metasources clean-bcheck clean-final  clean-generic clean-libtool clean-noinstLTLIBRARIES \
 	mostlyclean-am
 
 distclean: distclean-recursive
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-recursive
 
@@ -939,12 +826,20 @@
 install-data-am: install-data-local install-kspell2baseincludeHEADERS \
 	install-servicetypeDATA
 
+install-dvi: install-dvi-recursive
+
 install-exec-am:
 
+install-html: install-html-recursive
+
 install-info: install-info-recursive
 
 install-man:
 
+install-pdf: install-pdf-recursive
+
+install-ps: install-ps-recursive
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
@@ -965,26 +860,27 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-kspell2baseincludeHEADERS \
-	uninstall-local uninstall-servicetypeDATA
+uninstall-am: uninstall-kspell2baseincludeHEADERS uninstall-local \
+	uninstall-servicetypeDATA
 
-uninstall-info: uninstall-info-recursive
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+	install-strip
 
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-	clean clean-generic clean-libtool clean-noinstLTLIBRARIES \
-	clean-recursive ctags ctags-recursive distclean \
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+	all all-am check check-am clean clean-generic clean-libtool \
+	clean-noinstLTLIBRARIES ctags ctags-recursive distclean \
 	distclean-compile distclean-generic distclean-libtool \
-	distclean-recursive distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-data \
-	install-data-am install-data-local install-exec \
-	install-exec-am install-info install-info-am \
-	install-kspell2baseincludeHEADERS install-man \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am \
+	install-data-local install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-kspell2baseincludeHEADERS install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
 	install-servicetypeDATA install-strip installcheck \
 	installcheck-am installdirs installdirs-am maintainer-clean \
-	maintainer-clean-generic maintainer-clean-recursive \
-	mostlyclean mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
-	tags tags-recursive uninstall uninstall-am uninstall-info-am \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags tags-recursive uninstall uninstall-am \
 	uninstall-kspell2baseincludeHEADERS uninstall-local \
 	uninstall-servicetypeDATA
 
@@ -1084,15 +980,6 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
-#>+ 8
-libkspell2base.la.closure: $(libkspell2base_la_OBJECTS) $(libkspell2base_la_DEPENDENCIES)
-	@echo "int main() {return 0;}" > libkspell2base_la_closure.cpp
-	@$(LTCXXCOMPILE) -c libkspell2base_la_closure.cpp
-	$(CXXLINK) libkspell2base_la_closure.lo $(libkspell2base_la_LDFLAGS) $(libkspell2base_la_OBJECTS) $(libkspell2base_la_LIBADD) $(LIBS)
-	@rm -f libkspell2base_la_closure.* libkspell2base.la.closure
-	@echo "timestamp" > libkspell2base.la.closure
-
-
 #>+ 3
 defaultdictionary.moc: $(srcdir)/defaultdictionary.h
 	$(MOC) $(srcdir)/defaultdictionary.h -o defaultdictionary.moc
@@ -1135,10 +1022,6 @@
 #>+ 2
 KDE_DIST=backgroundengine.h Makefile.in backgroundthread.h client.h kspellclient.desktop threadevents.h Makefile.am 
 
-#>+ 3
-clean-closures:
-	-rm -f  libkspell2base.la.closure
-
 #>+ 2
 docs-am:
 
--- kdelibs-3.5.7.orig/kutils/tests/Makefile.in
+++ kdelibs-3.5.7/kutils/tests/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,15 +14,11 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -38,6 +34,7 @@
 host_triplet = @host@
 target_triplet = @target@
 check_PROGRAMS = kfindtest$(EXEEXT) kreplacetest$(EXEEXT)
+TESTS = kfindtest$(EXEEXT) kreplacetest$(EXEEXT)
 subdir = kutils/tests
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -57,12 +54,26 @@
 #>+ 1
 kfindtest_OBJECTS = kfindtest.$(OBJEXT)
 kfindtest_DEPENDENCIES = ../libkutils.la
+#>- kfindtest_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(kfindtest_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+kfindtest_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(kfindtest_LDFLAGS) $(LDFLAGS) -o $@
 am_kreplacetest_OBJECTS = kreplacetest.$(OBJEXT)
 #>- kreplacetest_OBJECTS = $(am_kreplacetest_OBJECTS)
 #>+ 1
 kreplacetest_OBJECTS = kreplacetest.$(OBJEXT)
 kreplacetest_DEPENDENCIES = ../libkutils.la
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+#>- kreplacetest_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(kreplacetest_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+kreplacetest_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(kreplacetest_LDFLAGS) $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -70,19 +81,21 @@
 #>+ 2
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
-#>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+#>+ 3
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
 CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 3
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(kfindtest_SOURCES) $(kreplacetest_SOURCES)
 DIST_SOURCES = $(kfindtest_SOURCES) $(kreplacetest_SOURCES)
 ETAGS = etags
@@ -93,8 +106,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -102,13 +113,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -122,8 +133,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -144,17 +153,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -223,7 +229,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -260,12 +265,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -310,87 +317,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -414,75 +377,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -490,23 +395,21 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
 xdg_directorydir = @xdg_directorydir@
 xdg_menudir = @xdg_menudir@
 INCLUDES = $(all_includes)
-TESTS = kfindtest kreplacetest
 kfindtest_SOURCES = kfindtest.cpp
 kfindtest_LDADD = ../libkutils.la
 kfindtest_LDFLAGS = $(all_libraries)
@@ -520,7 +423,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -558,9 +461,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 clean-checkPROGRAMS:
@@ -571,10 +474,10 @@
 	done
 kfindtest$(EXEEXT): $(kfindtest_OBJECTS) $(kfindtest_DEPENDENCIES) 
 	@rm -f kfindtest$(EXEEXT)
-	$(CXXLINK) $(kfindtest_LDFLAGS) $(kfindtest_OBJECTS) $(kfindtest_LDADD) $(LIBS)
+	$(kfindtest_LINK) $(kfindtest_OBJECTS) $(kfindtest_LDADD) $(LIBS)
 kreplacetest$(EXEEXT): $(kreplacetest_OBJECTS) $(kreplacetest_DEPENDENCIES) 
 	@rm -f kreplacetest$(EXEEXT)
-	$(CXXLINK) $(kreplacetest_LDFLAGS) $(kreplacetest_OBJECTS) $(kreplacetest_LDADD) $(LIBS)
+	$(kreplacetest_LINK) $(kreplacetest_OBJECTS) $(kreplacetest_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -586,22 +489,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kreplacetest.Po@am__quote@
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -612,10 +515,6 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -665,9 +564,9 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 check-TESTS: $(TESTS)
-	@failed=0; all=0; xfail=0; xpass=0; skip=0; \
+	@failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[	 ]'; \
 	srcdir=$(srcdir); export srcdir; \
-	list='$(TESTS)'; \
+	list=' $(TESTS) '; \
 	if test -n "$$list"; then \
 	  for tst in $$list; do \
 	    if test -f ./$$tst; then dir=./; \
@@ -676,7 +575,7 @@
 	    if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
 	      all=`expr $$all + 1`; \
 	      case " $(XFAIL_TESTS) " in \
-	      *" $$tst "*) \
+	      *$$ws$$tst$$ws*) \
 		xpass=`expr $$xpass + 1`; \
 		failed=`expr $$failed + 1`; \
 		echo "XPASS: $$tst"; \
@@ -688,7 +587,7 @@
 	    elif test $$? -ne 77; then \
 	      all=`expr $$all + 1`; \
 	      case " $(XFAIL_TESTS) " in \
-	      *" $$tst "*) \
+	      *$$ws$$tst$$ws*) \
 		xfail=`expr $$xfail + 1`; \
 		echo "XFAIL: $$tst"; \
 	      ;; \
@@ -738,22 +637,21 @@
 	else :; fi
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -808,7 +706,7 @@
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
@@ -822,12 +720,20 @@
 
 install-data-am:
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -848,19 +754,23 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am
+uninstall-am:
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
 	clean-checkPROGRAMS clean-generic clean-libtool ctags \
 	distclean distclean-compile distclean-generic \
 	distclean-libtool distclean-tags distdir dvi dvi-am html \
 	html-am info info-am install install-am install-data \
-	install-data-am install-exec install-exec-am install-info \
-	install-info-am install-man install-strip installcheck \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
 	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-info-am
+	tags uninstall uninstall-am
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- kdelibs-3.5.7.orig/kutils/Makefile.in
+++ kdelibs-3.5.7/kutils/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -17,15 +17,11 @@
 
 
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -82,7 +78,14 @@
 	kcmoduleproxyIfaceImpl.lo kcmoduleproxyIface_skel.lo
 @KDE_USE_FINAL_FALSE@libkutils_la_OBJECTS = $(libkutils_la_nofinal_OBJECTS)
 @KDE_USE_FINAL_TRUE@libkutils_la_OBJECTS = $(libkutils_la_final_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+#>- libkutils_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(libkutils_la_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+libkutils_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(libkutils_la_LDFLAGS) $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -90,38 +93,44 @@
 #>+ 2
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
-#>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+#>+ 3
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
 CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 3
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(libkutils_la_SOURCES)
 DIST_SOURCES = $(libkutils_la_SOURCES)
 #>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 #>- 	html-recursive info-recursive install-data-recursive \
-#>- 	install-exec-recursive install-info-recursive \
-#>- 	install-recursive installcheck-recursive installdirs-recursive \
-#>- 	pdf-recursive ps-recursive uninstall-info-recursive \
-#>- 	uninstall-recursive
-#>+ 6
+#>- 	install-dvi-recursive install-exec-recursive \
+#>- 	install-html-recursive install-info-recursive \
+#>- 	install-pdf-recursive install-ps-recursive install-recursive \
+#>- 	installcheck-recursive installdirs-recursive pdf-recursive \
+#>- 	ps-recursive uninstall-recursive
+#>+ 7
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	html-recursive info-recursive install-data-recursive \
-	install-exec-recursive install-info-recursive \
-	install-recursive installcheck-recursive installdirs-recursive \
-	pdf-recursive ps-recursive uninstall-info-recursive \
-	uninstall-recursive nmcheck-recursive bcheck-recursive
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive nmcheck-recursive bcheck-recursive
 kde_servicetypesDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(kde_servicetypes_DATA)
 includeHEADERS_INSTALL = $(INSTALL_HEADER)
 HEADERS = $(include_HEADERS) $(noinst_HEADERS)
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
@@ -131,8 +140,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -140,13 +147,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -160,8 +167,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -182,17 +187,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -261,7 +263,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -298,12 +299,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -348,87 +351,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -452,75 +411,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -528,16 +429,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -546,9 +446,7 @@
 SUBDIRS = ksettings .
 INCLUDES = -I$(top_srcdir)/interfaces/kregexpeditor $(all_includes)
 lib_LTLIBRARIES = libkutils.la
-#>- libkutils_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 3:0:2
-#>+ 1
-libkutils_la_LDFLAGS = $(all_libraries) -no-undefined $(KDE_NO_UNDEFINED) -version-info 3:0:2
+libkutils_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 3:0:2
 # Needs KTrader
 libkutils_la_LIBADD = ../kio/libkio.la ksettings/libksettings.la
 #>- libkutils_la_SOURCES = kfind.cpp kfinddialog.cpp kreplace.cpp \
@@ -582,7 +480,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(srcdir)/../admin/Doxyfile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../admin/Doxyfile.am $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -620,13 +518,13 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
@@ -637,7 +535,7 @@
 
 uninstall-libLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
@@ -651,11 +549,8 @@
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
-#>- libkutils.la: $(libkutils_la_OBJECTS) $(libkutils_la_DEPENDENCIES) 
-#>+ 2
-@KDE_USE_CLOSURE_TRUE@libkutils.la: libkutils.la.closure $(libkutils_la_OBJECTS) $(libkutils_la_DEPENDENCIES) 
-@KDE_USE_CLOSURE_FALSE@libkutils.la: $(libkutils_la_OBJECTS) $(libkutils_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(libdir) $(libkutils_la_LDFLAGS) $(libkutils_la_OBJECTS) $(libkutils_la_LIBADD) $(LIBS)
+libkutils.la: $(libkutils_la_OBJECTS) $(libkutils_la_DEPENDENCIES) 
+	$(libkutils_la_LINK) -rpath $(libdir) $(libkutils_la_OBJECTS) $(libkutils_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -678,22 +573,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kreplacedialog.Plo@am__quote@
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -703,13 +598,9 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 install-kde_servicetypesDATA: $(kde_servicetypes_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(kde_servicetypesdir)" || $(mkdir_p) "$(DESTDIR)$(kde_servicetypesdir)"
+	test -z "$(kde_servicetypesdir)" || $(MKDIR_P) "$(DESTDIR)$(kde_servicetypesdir)"
 	@list='$(kde_servicetypes_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -726,7 +617,7 @@
 	done
 install-includeHEADERS: $(include_HEADERS)
 	@$(NORMAL_INSTALL)
-	test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"
+	test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)"
 	@list='$(include_HEADERS)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -773,8 +664,7 @@
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
+$(RECURSIVE_CLEAN_TARGETS):
 	@failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
@@ -875,23 +765,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	$(mkdir_p) $(distdir)/../admin
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -905,7 +793,7 @@
 	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
-	    || $(mkdir_p) "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 	    || exit 1; \
 	    distdir=`$(am__cd) $(distdir) && pwd`; \
 	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
@@ -913,6 +801,8 @@
 	      $(MAKE) $(AM_MAKEFLAGS) \
 	        top_distdir="$$top_distdir" \
 	        distdir="$$distdir/$$subdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -923,7 +813,7 @@
 installdirs: installdirs-recursive
 installdirs-am:
 	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(kde_servicetypesdir)" "$(DESTDIR)$(includedir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-recursive
 install-exec: install-exec-recursive
@@ -956,14 +846,14 @@
 #>- clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
 #>- 	mostlyclean-am
 #>+ 2
-clean-am: clean-metasources clean-idl clean-closures clean-bcheck clean-final  clean-generic clean-libLTLIBRARIES clean-libtool \
+clean-am: clean-metasources clean-idl clean-bcheck clean-final  clean-generic clean-libLTLIBRARIES clean-libtool \
 	mostlyclean-am
 
 distclean: distclean-recursive
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-recursive
 
@@ -978,12 +868,20 @@
 install-data-am: install-data-local install-includeHEADERS \
 	install-kde_servicetypesDATA
 
+install-dvi: install-dvi-recursive
+
 install-exec-am: install-libLTLIBRARIES
 
+install-html: install-html-recursive
+
 install-info: install-info-recursive
 
 install-man:
 
+install-pdf: install-pdf-recursive
+
+install-ps: install-ps-recursive
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
@@ -1004,30 +902,30 @@
 
 ps-am:
 
-uninstall-am: uninstall-includeHEADERS uninstall-info-am \
-	uninstall-kde_servicetypesDATA uninstall-libLTLIBRARIES \
-	uninstall-local
-
-uninstall-info: uninstall-info-recursive
-
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-	clean clean-generic clean-libLTLIBRARIES clean-libtool \
-	clean-recursive ctags ctags-recursive distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-recursive distclean-tags distdir dvi dvi-am html \
+uninstall-am: uninstall-includeHEADERS uninstall-kde_servicetypesDATA \
+	uninstall-libLTLIBRARIES uninstall-local
+
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+	install-strip
+
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+	all all-am check check-am clean clean-generic \
+	clean-libLTLIBRARIES clean-libtool ctags ctags-recursive \
+	distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
 	html-am info info-am install install-am install-data \
-	install-data-am install-data-local install-exec \
-	install-exec-am install-includeHEADERS install-info \
-	install-info-am install-kde_servicetypesDATA \
-	install-libLTLIBRARIES install-man install-strip installcheck \
-	installcheck-am installdirs installdirs-am maintainer-clean \
-	maintainer-clean-generic maintainer-clean-recursive \
-	mostlyclean mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
+	install-data-am install-data-local install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-includeHEADERS install-info install-info-am \
+	install-kde_servicetypesDATA install-libLTLIBRARIES \
+	install-man install-pdf install-pdf-am install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs installdirs-am maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 	tags tags-recursive uninstall uninstall-am \
-	uninstall-includeHEADERS uninstall-info-am \
-	uninstall-kde_servicetypesDATA uninstall-libLTLIBRARIES \
-	uninstall-local
+	uninstall-includeHEADERS uninstall-kde_servicetypesDATA \
+	uninstall-libLTLIBRARIES uninstall-local
 
 apidox-am-yes:
 	@if test \! -d "$(top_srcdir)/doc/common/" && test -z "$$DOXDATA" ; then \
@@ -1133,15 +1031,6 @@
 kcmoduleproxyIface_skel.cpp: kcmoduleproxyIface.kidl
 	$(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub kcmoduleproxyIface.kidl
 
-#>+ 8
-libkutils.la.closure: $(libkutils_la_OBJECTS) $(libkutils_la_DEPENDENCIES)
-	@echo "int main() {return 0;}" > libkutils_la_closure.cpp
-	@$(LTCXXCOMPILE) -c libkutils_la_closure.cpp
-	$(CXXLINK) libkutils_la_closure.lo $(libkutils_la_LDFLAGS) $(libkutils_la_OBJECTS) $(libkutils_la_LIBADD) $(LIBS)
-	@rm -f libkutils_la_closure.* libkutils.la.closure
-	@echo "timestamp" > libkutils.la.closure
-
-
 #>+ 3
 kcmultidialog.moc: $(srcdir)/kcmultidialog.h
 	$(MOC) $(srcdir)/kcmultidialog.h -o kcmultidialog.moc
@@ -1238,10 +1127,6 @@
 	-rm -f \
 	kcmoduleproxyIface_skel.cpp kcmoduleproxyIface_skel.h kcmoduleproxyIface.kidl 
 
-#>+ 3
-clean-closures:
-	-rm -f  libkutils.la.closure
-
 #>+ 2
 docs-am:
 
--- kdelibs-3.5.7.orig/kutils/ksettings/Makefile.in
+++ kdelibs-3.5.7/kutils/ksettings/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,15 +16,11 @@
 @SET_MAKE@
 
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -65,7 +61,7 @@
 	componentsdialog.lo
 @KDE_USE_FINAL_FALSE@libksettings_la_OBJECTS = $(libksettings_la_nofinal_OBJECTS)
 @KDE_USE_FINAL_TRUE@libksettings_la_OBJECTS = $(libksettings_la_final_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -73,19 +69,21 @@
 #>+ 2
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
-#>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+#>+ 3
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
 CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 3
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(libksettings_la_SOURCES)
 DIST_SOURCES = $(libksettings_la_SOURCES)
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -105,8 +103,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -114,13 +110,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -134,8 +130,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -156,17 +150,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -235,7 +226,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -272,12 +262,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -322,87 +314,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -426,75 +374,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -502,16 +392,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -529,7 +418,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -567,9 +456,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 clean-noinstLTLIBRARIES:
@@ -581,7 +470,7 @@
 	  rm -f "$${dir}/so_locations"; \
 	done
 libksettings.la: $(libksettings_la_OBJECTS) $(libksettings_la_DEPENDENCIES) 
-	$(CXXLINK)  $(libksettings_la_LDFLAGS) $(libksettings_la_OBJECTS) $(libksettings_la_LIBADD) $(LIBS)
+	$(CXXLINK)  $(libksettings_la_OBJECTS) $(libksettings_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -595,22 +484,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pluginpage.Plo@am__quote@
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -620,13 +509,9 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 install-ksettingsincludeHEADERS: $(ksettingsinclude_HEADERS)
 	@$(NORMAL_INSTALL)
-	test -z "$(ksettingsincludedir)" || $(mkdir_p) "$(DESTDIR)$(ksettingsincludedir)"
+	test -z "$(ksettingsincludedir)" || $(MKDIR_P) "$(DESTDIR)$(ksettingsincludedir)"
 	@list='$(ksettingsinclude_HEADERS)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -691,22 +576,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -722,7 +606,7 @@
 all-am: Makefile $(LTLIBRARIES) $(HEADERS)
 installdirs:
 	for dir in "$(DESTDIR)$(ksettingsincludedir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -762,7 +646,7 @@
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
@@ -776,12 +660,20 @@
 
 install-data-am: install-ksettingsincludeHEADERS
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -802,20 +694,23 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-ksettingsincludeHEADERS
+uninstall-am: uninstall-ksettingsincludeHEADERS
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-libtool clean-noinstLTLIBRARIES ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
 	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-exec \
-	install-exec-am install-info install-info-am \
-	install-ksettingsincludeHEADERS install-man install-strip \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am \
+	install-ksettingsincludeHEADERS install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
 	installcheck installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-info-am \
-	uninstall-ksettingsincludeHEADERS
+	tags uninstall uninstall-am uninstall-ksettingsincludeHEADERS
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- kdelibs-3.5.7.orig/configure
+++ kdelibs-3.5.7/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.60.
+# Generated by GNU Autoconf 2.61.
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
 # 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@@ -10,7 +10,8 @@
 ## M4sh Initialization.  ##
 ## --------------------- ##
 
-# Be Bourne compatible
+# Be more Bourne compatible
+DUALCASE=1; export DUALCASE # for MKS sh
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
@@ -19,10 +20,13 @@
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
 else
-  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
+  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
@@ -215,7 +219,7 @@
 else
   as_candidate_shells=
     as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in /usr/bin/posix$PATH_SEPARATOR/bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
+for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
@@ -233,7 +237,6 @@
 	 # Try only shells that exist, to save several forks.
 	 if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
 		{ ("$as_shell") 2> /dev/null <<\_ASEOF
-# Be Bourne compatible
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
@@ -242,10 +245,12 @@
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
 else
-  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
+  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
@@ -253,7 +258,6 @@
   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=:
@@ -262,10 +266,12 @@
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
 else
-  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
+  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 () {
@@ -512,19 +518,28 @@
   as_mkdir_p=false
 fi
 
-# 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"
+if test -x / >/dev/null 2>&1; then
+  as_test_x='test -x'
 else
-  as_executable_p=:
+  if ls -dL / >/dev/null 2>&1; then
+    as_ls_L_option=L
+  else
+    as_ls_L_option=
+  fi
+  as_test_x='
+    eval sh -c '\''
+      if test -d "$1"; then
+        test -d "$1/.";
+      else
+	case $1 in
+        -*)set "./$1";;
+	esac;
+	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
+	???[sx]*):;;*)false;;esac;fi
+    '\'' sh
+  '
 fi
-rm -f conf$$.file
+as_executable_p=$as_test_x
 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -571,15 +586,15 @@
 
 # The HP-UX ksh and POSIX shell print the target directory to stdout
 # if CDPATH is set.
-if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
 if test -z "$ECHO"; then
 if test "X${echo_test_string+set}" != Xset; then
 # find a string as large as possible, as long as the shell can cope with it
   for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do
     # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
-    if (echo_test_string="`eval $cmd`") 2>/dev/null &&
-       echo_test_string="`eval $cmd`" &&
+    if (echo_test_string=`eval $cmd`) 2>/dev/null &&
+       echo_test_string=`eval $cmd` &&
        (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
     then
       break
@@ -720,36 +735,36 @@
 # Factoring default headers for most tests.
 ac_includes_default="\
 #include <stdio.h>
-#if HAVE_SYS_TYPES_H
+#ifdef HAVE_SYS_TYPES_H
 # include <sys/types.h>
 #endif
-#if HAVE_SYS_STAT_H
+#ifdef HAVE_SYS_STAT_H
 # include <sys/stat.h>
 #endif
-#if STDC_HEADERS
+#ifdef STDC_HEADERS
 # include <stdlib.h>
 # include <stddef.h>
 #else
-# if HAVE_STDLIB_H
+# ifdef HAVE_STDLIB_H
 #  include <stdlib.h>
 # endif
 #endif
-#if HAVE_STRING_H
-# if !STDC_HEADERS && HAVE_MEMORY_H
+#ifdef HAVE_STRING_H
+# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
 #  include <memory.h>
 # endif
 # include <string.h>
 #endif
-#if HAVE_STRINGS_H
+#ifdef HAVE_STRINGS_H
 # include <strings.h>
 #endif
-#if HAVE_INTTYPES_H
+#ifdef HAVE_INTTYPES_H
 # include <inttypes.h>
 #endif
-#if HAVE_STDINT_H
+#ifdef HAVE_STDINT_H
 # include <stdint.h>
 #endif
-#if HAVE_UNISTD_H
+#ifdef HAVE_UNISTD_H
 # include <unistd.h>
 #endif"
 
@@ -808,6 +823,7 @@
 INSTALL_PROGRAM
 INSTALL_SCRIPT
 INSTALL_DATA
+am__isrc
 CYGPATH_W
 PACKAGE
 VERSION
@@ -826,6 +842,9 @@
 AMTAR
 am__tar
 am__untar
+MAINTAINER_MODE_TRUE
+MAINTAINER_MODE_FALSE
+MAINT
 CC
 CFLAGS
 LDFLAGS
@@ -1019,9 +1038,10 @@
 include_VERSION_SCRIPT_TRUE
 include_VERSION_SCRIPT_FALSE
 MD5SUM
-LIB_DNSSD
-HAVE_DNSSD_TRUE
-HAVE_DNSSD_FALSE
+have_pkg_config
+PKG_CONFIG
+AVAHI_CFLAGS
+AVAHI_LIBS
 LUA
 LUA_INCLUDES
 LUA_LIBS
@@ -1056,7 +1076,6 @@
 KJAVA_POLICYPATH
 LIBTIFF
 LIB_JASPER
-PKG_CONFIG
 LIB_EXR
 EXR_FLAGS
 include_TIFF_MODULES_TRUE
@@ -1176,6 +1195,7 @@
 CC
 CFLAGS
 LDFLAGS
+LIBS
 CPPFLAGS
 CPP
 CXX
@@ -1184,7 +1204,8 @@
 CXXCPP
 F77
 FFLAGS
-XMKMF'
+XMKMF
+PKG_CONFIG'
 
 
 # Initialize some variables set by options.
@@ -1290,10 +1311,10 @@
   -disable-* | --disable-*)
     ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
+    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
       { echo "$as_me: error: invalid feature name: $ac_feature" >&2
    { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
+    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
     eval enable_$ac_feature=no ;;
 
   -docdir | --docdir | --docdi | --doc | --do)
@@ -1309,10 +1330,10 @@
   -enable-* | --enable-*)
     ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
+    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
       { echo "$as_me: error: invalid feature name: $ac_feature" >&2
    { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
+    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
     eval enable_$ac_feature=\$ac_optarg ;;
 
   -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
@@ -1506,19 +1527,19 @@
   -with-* | --with-*)
     ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
+    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
       { echo "$as_me: error: invalid package name: $ac_package" >&2
    { (exit 1); exit 1; }; }
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
+    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
     eval with_$ac_package=\$ac_optarg ;;
 
   -without-* | --without-*)
     ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
+    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
       { echo "$as_me: error: invalid package name: $ac_package" >&2
    { (exit 1); exit 1; }; }
-    ac_package=`echo $ac_package | sed 's/-/_/g'`
+    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
     eval with_$ac_package=no ;;
 
   --x)
@@ -1764,6 +1785,8 @@
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
   --disable-fast-perl     disable fast Makefile generation (needs perl)
+  --enable-maintainer-mode  enable make rules and dependencies not useful
+			  (and sometimes confusing) to the casual installer
   --enable-debug=ARG      enables debug symbols (yes|no|full) default=no
   --disable-debug         disables debug output and debug symbols default=no
   --enable-strict         compiles with strict compiler options (may not
@@ -1798,7 +1821,6 @@
                           toolchain hidden visibility default=no
   --enable-sendfile       enable the use of sendfile() (Linux only)
   --enable-mitshm         use MIT-SHM for pixmap loading/saving
-  --disable-dnssd     don't require libdns_sd (browsing and publishing DNS-SD services will not be possible)
   --disable-openpty       disable openpty (UNIX98 terminals) support default=enabled
   --enable-fast-malloc    Use own malloc implementation : yes,no,full,debug
   --disable-cups          disable CUPS support default=auto
@@ -1853,6 +1875,7 @@
   CFLAGS      C compiler flags
   LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
               nonstandard directory <lib dir>
+  LIBS        libraries to pass to the linker, e.g. -l<library>
   CPPFLAGS    C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
               you have headers in a nonstandard directory <include dir>
   CPP         C preprocessor
@@ -1862,6 +1885,7 @@
   F77         Fortran 77 compiler command
   FFLAGS      Fortran 77 compiler flags
   XMKMF       Path to xmkmf, Makefile generator for X Window System
+  PKG_CONFIG  path to pkg-config utility
 
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
@@ -1927,7 +1951,7 @@
 if $ac_init_version; then
   cat <<\_ACEOF
 configure
-generated by GNU Autoconf 2.60
+generated by GNU Autoconf 2.61
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@@ -1941,7 +1965,7 @@
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by $as_me, which was
-generated by GNU Autoconf 2.60.  Invocation command line was
+generated by GNU Autoconf 2.61.  Invocation command line was
 
   $ $0 $@
 
@@ -2498,7 +2522,8 @@
 rm -f conftest.sed
 
 
-am__api_version="1.9"
+am__api_version='1.10'
+
 
 
           test -n "$INSTALL" && kde_save_INSTALL_given=$INSTALL
@@ -2540,7 +2565,7 @@
     # by default.
     for ac_prog in ginstall scoinst install; do
       for ac_exec_ext in '' $ac_executable_extensions; do
-	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; }; then
+	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
 	  if test $ac_prog = install &&
 	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
 	    # AIX install.  It has an incompatible calling convention.
@@ -2670,38 +2695,53 @@
 echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
 fi
 
-if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
-  # We used to keeping the `.' as first argument, in order to
-  # allow $(mkdir_p) to be used without argument.  As in
-  #   $(mkdir_p) $(somedir)
-  # where $(somedir) is conditionally defined.  However this is wrong
-  # for two reasons:
-  #  1. if the package is installed by a user who cannot write `.'
-  #     make install will fail,
-  #  2. the above comment should most certainly read
-  #     $(mkdir_p) $(DESTDIR)$(somedir)
-  #     so it does not work when $(somedir) is undefined and
-  #     $(DESTDIR) is not.
-  #  To support the latter case, we have to write
-  #     test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
-  #  so the `.' trick is pointless.
-  mkdir_p='mkdir -p --'
-else
-  # On NextStep and OpenStep, the `mkdir' command does not
-  # recognize any option.  It will interpret all options as
-  # directories to create, and then abort because `.' already
-  # exists.
-  for d in ./-p ./--version;
-  do
-    test -d $d && rmdir $d
-  done
-  # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
-  if test -f "$ac_aux_dir/mkinstalldirs"; then
-    mkdir_p='$(mkinstalldirs)'
+{ echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
+echo $ECHO_N "checking for a thread-safe mkdir -p... $ECHO_C" >&6; }
+if test -z "$MKDIR_P"; then
+  if test "${ac_cv_path_mkdir+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_prog in mkdir gmkdir; do
+	 for ac_exec_ext in '' $ac_executable_extensions; do
+	   { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
+	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
+	     'mkdir (GNU coreutils) '* | \
+	     'mkdir (coreutils) '* | \
+	     'mkdir (fileutils) '4.1*)
+	       ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
+	       break 3;;
+	   esac
+	 done
+       done
+done
+IFS=$as_save_IFS
+
+fi
+
+  if test "${ac_cv_path_mkdir+set}" = set; then
+    MKDIR_P="$ac_cv_path_mkdir -p"
   else
-    mkdir_p='$(install_sh) -d'
+    # As a last resort, use the slow shell script.  Don't cache a
+    # value for MKDIR_P within a source directory, because that will
+    # break other packages using the cache if that directory is
+    # removed, or if the value is a relative name.
+    test -d ./--version && rmdir ./--version
+    MKDIR_P="$ac_install_sh -d"
   fi
 fi
+{ echo "$as_me:$LINENO: result: $MKDIR_P" >&5
+echo "${ECHO_T}$MKDIR_P" >&6; }
+
+mkdir_p="$MKDIR_P"
+case $mkdir_p in
+  [\\/$]* | ?:[\\/]*) ;;
+  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
+esac
 
 for ac_prog in gawk mawk nawk awk
 do
@@ -2721,7 +2761,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_AWK="$ac_prog"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2784,12 +2824,16 @@
 fi
 rmdir .tst 2>/dev/null
 
-# test to see if srcdir already configured
-if test "`cd $srcdir && pwd`" != "`pwd`" &&
-   test -f $srcdir/config.status; then
-  { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
+if test "`cd $srcdir && pwd`" != "`pwd`"; then
+  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
+  # is not polluted with repeated "-I."
+  am__isrc=' -I$(srcdir)'
+  # test to see if srcdir already configured
+  if test -f $srcdir/config.status; then
+    { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
 echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
    { (exit 1); exit 1; }; }
+  fi
 fi
 
 # test whether we have cygpath
@@ -2832,7 +2876,7 @@
 
 MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
 
-install_sh=${install_sh-"$am_aux_dir/install-sh"}
+install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
 
 # Installed binaries are usually stripped using `strip' when the user
 # run `make install-strip'.  However `strip' might not be the right
@@ -2856,7 +2900,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2896,7 +2940,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_STRIP="strip"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2936,7 +2980,7 @@
 fi
 
 fi
-INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 
 # We need awk for the "check" target.  The system "awk" is bad on
 # some platforms.
@@ -2950,6 +2994,29 @@
 
 
 
+{ 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
+else
+  USE_MAINTAINER_MODE=no
+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='#'
+else
+  MAINTAINER_MODE_TRUE='#'
+  MAINTAINER_MODE_FALSE=
+fi
+
+  MAINT=$MAINTAINER_MODE_TRUE
+
+
+
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
 # incompatible versions:
@@ -2986,7 +3053,7 @@
     # by default.
     for ac_prog in ginstall scoinst install; do
       for ac_exec_ext in '' $ac_executable_extensions; do
-	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; }; then
+	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
 	  if test $ac_prog = install &&
 	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
 	    # AIX install.  It has an incompatible calling convention.
@@ -3086,9 +3153,7 @@
   am_depcomp="$ac_aux_dir/depcomp"
   AMDEPBACKSLASH='\'
 fi
-
-
-if test "x$enable_dependency_tracking" != xno; then
+ if test "x$enable_dependency_tracking" != xno; then
   AMDEP_TRUE=
   AMDEP_FALSE='#'
 else
@@ -3100,7 +3165,6 @@
 
 
 
-
   # Check whether --enable-debug was given.
 if test "${enable_debug+set}" = set; then
   enableval=$enable_debug;
@@ -3197,7 +3261,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="${ac_tool_prefix}gcc"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -3237,7 +3301,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CC="gcc"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -3294,7 +3358,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="${ac_tool_prefix}cc"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -3335,7 +3399,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
        ac_prog_rejected=yes
        continue
@@ -3393,7 +3457,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -3437,7 +3501,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CC="$ac_prog"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -3578,7 +3642,7 @@
 # in a Makefile.  We should not override ac_cv_exeext if it was cached,
 # so that the user can short-circuit this test for compilers unknown to
 # Autoconf.
-for ac_file in $ac_files
+for ac_file in $ac_files ''
 do
   test -f "$ac_file" || continue
   case $ac_file in
@@ -3606,6 +3670,12 @@
 test "$ac_cv_exeext" = no && ac_cv_exeext=
 
 else
+  ac_file=''
+fi
+
+{ echo "$as_me:$LINENO: result: $ac_file" >&5
+echo "${ECHO_T}$ac_file" >&6; }
+if test -z "$ac_file"; then
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
@@ -3617,8 +3687,6 @@
 fi
 
 ac_exeext=$ac_cv_exeext
-{ 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.
@@ -3796,27 +3864,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_compiler_gnu=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -3871,27 +3922,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_prog_cc_g=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -3926,27 +3960,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   :
 else
   echo "$as_me: failed program was:" >&5
@@ -3982,27 +3999,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_prog_cc_g=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -4118,27 +4118,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_prog_cc_c89=$ac_arg
 else
   echo "$as_me: failed program was:" >&5
@@ -4242,6 +4225,7 @@
        depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
        $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
          >/dev/null 2>conftest.err &&
+       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
        grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
        grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
        ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
@@ -4271,9 +4255,7 @@
 echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }
 CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
 
-
-
-if
+ if
   test "x$enable_dependency_tracking" != xno \
   && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
   am__fastdepCC_TRUE=
@@ -4337,17 +4319,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   :
 else
   echo "$as_me: failed program was:" >&5
@@ -4381,17 +4356,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   # Broken: success on invalid input.
 continue
 else
@@ -4456,17 +4424,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   :
 else
   echo "$as_me: failed program was:" >&5
@@ -4500,17 +4461,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   # Broken: success on invalid input.
 continue
 else
@@ -4600,7 +4554,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -4644,7 +4598,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CXX="$ac_prog"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -4757,27 +4711,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_compiler_gnu=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -4832,27 +4769,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_prog_cxx_g=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -4887,27 +4807,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   :
 else
   echo "$as_me: failed program was:" >&5
@@ -4943,27 +4846,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_prog_cxx_g=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -5071,6 +4957,7 @@
        depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
        $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
          >/dev/null 2>conftest.err &&
+       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
        grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
        grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
        ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
@@ -5100,9 +4987,7 @@
 echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6; }
 CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
 
-
-
-if
+ if
   test "x$enable_dependency_tracking" != xno \
   && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then
   am__fastdepCXX_TRUE=
@@ -5153,27 +5038,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   kde_bad_compiler=no
 else
   echo "$as_me: failed program was:" >&5
@@ -5277,27 +5145,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   eval "kde_cv_prog_cxx_$kde_cache=yes"
 else
   echo "$as_me: failed program was:" >&5
@@ -5306,7 +5158,7 @@
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
   CXXFLAGS="$save_CXXFLAGS"
   ac_ext=c
@@ -5379,27 +5231,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   eval "kde_cv_prog_cxx_$kde_cache=yes"
 else
   echo "$as_me: failed program was:" >&5
@@ -5408,7 +5244,7 @@
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
   CXXFLAGS="$save_CXXFLAGS"
   ac_ext=c
@@ -5495,27 +5331,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   eval "kde_cv_prog_cxx_$kde_cache=yes"
 else
   echo "$as_me: failed program was:" >&5
@@ -5524,7 +5344,7 @@
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
   CXXFLAGS="$save_CXXFLAGS"
   ac_ext=c
@@ -5608,27 +5428,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   eval "kde_cv_prog_cxx_$kde_cache=yes"
 else
   echo "$as_me: failed program was:" >&5
@@ -5637,7 +5441,7 @@
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
   CXXFLAGS="$save_CXXFLAGS"
   ac_ext=c
@@ -5706,27 +5510,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   eval "kde_cv_prog_cc_$kde_cache=yes"
 else
   echo "$as_me: failed program was:" >&5
@@ -5735,7 +5523,7 @@
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
   CFLAGS="$save_CFLAGS"
   ac_ext=c
@@ -5809,27 +5597,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   eval "kde_cv_prog_cxx_$kde_cache=yes"
 else
   echo "$as_me: failed program was:" >&5
@@ -5838,7 +5610,7 @@
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
   CXXFLAGS="$save_CXXFLAGS"
   ac_ext=c
@@ -5910,27 +5682,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   eval "kde_cv_prog_cxx_$kde_cache=yes"
 else
   echo "$as_me: failed program was:" >&5
@@ -5939,7 +5695,7 @@
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
   CXXFLAGS="$save_CXXFLAGS"
   ac_ext=c
@@ -6011,27 +5767,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   eval "kde_cv_prog_cxx_$kde_cache=yes"
 else
   echo "$as_me: failed program was:" >&5
@@ -6040,7 +5780,7 @@
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
   CXXFLAGS="$save_CXXFLAGS"
   ac_ext=c
@@ -6132,27 +5872,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   eval "kde_cv_prog_cxx_$kde_cache=yes"
 else
   echo "$as_me: failed program was:" >&5
@@ -6161,7 +5885,7 @@
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
   CXXFLAGS="$save_CXXFLAGS"
   ac_ext=c
@@ -6239,27 +5963,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   eval "kde_cv_prog_cxx_$kde_cache=yes"
 else
   echo "$as_me: failed program was:" >&5
@@ -6268,7 +5976,7 @@
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
   CXXFLAGS="$save_CXXFLAGS"
   ac_ext=c
@@ -6340,27 +6048,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   eval "kde_cv_prog_cxx_$kde_cache=yes"
 else
   echo "$as_me: failed program was:" >&5
@@ -6369,7 +6061,7 @@
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
   CXXFLAGS="$save_CXXFLAGS"
   ac_ext=c
@@ -6441,27 +6133,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   eval "kde_cv_prog_cxx_$kde_cache=yes"
 else
   echo "$as_me: failed program was:" >&5
@@ -6470,7 +6146,7 @@
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
   CXXFLAGS="$save_CXXFLAGS"
   ac_ext=c
@@ -6542,27 +6218,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   eval "kde_cv_prog_cxx_$kde_cache=yes"
 else
   echo "$as_me: failed program was:" >&5
@@ -6571,7 +6231,7 @@
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
   CXXFLAGS="$save_CXXFLAGS"
   ac_ext=c
@@ -6672,27 +6332,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   kde_cv_opt_noinline_match=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -6702,7 +6346,7 @@
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 
     CFLAGS="$ac_cflags_save"
@@ -6716,9 +6360,7 @@
        CFLAGS="`echo "$CFLAGS" | sed "s/ -fno-inline//"`"
     fi
   fi
-
-
-if test "$kde_use_pch" = "yes" && test "$kde_gcc_supports_pch" = "yes"; then
+   if test "$kde_use_pch" = "yes" && test "$kde_gcc_supports_pch" = "yes"; then
   unsermake_enable_pch_TRUE=
   unsermake_enable_pch_FALSE='#'
 else
@@ -6777,27 +6419,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   eval "kde_cv_prog_cxx_$kde_cache=yes"
 else
   echo "$as_me: failed program was:" >&5
@@ -6806,7 +6432,7 @@
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
   CXXFLAGS="$save_CXXFLAGS"
   ac_ext=c
@@ -6879,27 +6505,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   eval "kde_cv_prog_cxx_$kde_cache=yes"
 else
   echo "$as_me: failed program was:" >&5
@@ -6908,7 +6518,7 @@
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
   CXXFLAGS="$save_CXXFLAGS"
   ac_ext=c
@@ -6980,27 +6590,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   eval "kde_cv_prog_cxx_$kde_cache=yes"
 else
   echo "$as_me: failed program was:" >&5
@@ -7009,7 +6603,7 @@
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
   CXXFLAGS="$save_CXXFLAGS"
   ac_ext=c
@@ -7081,27 +6675,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   eval "kde_cv_prog_cxx_$kde_cache=yes"
 else
   echo "$as_me: failed program was:" >&5
@@ -7110,7 +6688,7 @@
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
   CXXFLAGS="$save_CXXFLAGS"
   ac_ext=c
@@ -7182,27 +6760,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   eval "kde_cv_prog_cxx_$kde_cache=yes"
 else
   echo "$as_me: failed program was:" >&5
@@ -7211,7 +6773,7 @@
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
   CXXFLAGS="$save_CXXFLAGS"
   ac_ext=c
@@ -7283,27 +6845,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   eval "kde_cv_prog_cxx_$kde_cache=yes"
 else
   echo "$as_me: failed program was:" >&5
@@ -7312,7 +6858,7 @@
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
   CXXFLAGS="$save_CXXFLAGS"
   ac_ext=c
@@ -7486,17 +7032,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_cxx_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   :
 else
   echo "$as_me: failed program was:" >&5
@@ -7530,17 +7069,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_cxx_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   # Broken: success on invalid input.
 continue
 else
@@ -7605,17 +7137,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_cxx_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   :
 else
   echo "$as_me: failed program was:" >&5
@@ -7649,17 +7174,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_cxx_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   # Broken: success on invalid input.
 continue
 else
@@ -7744,27 +7262,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   eval "kde_cv_prog_cxx_$kde_cache=yes"
 else
   echo "$as_me: failed program was:" >&5
@@ -7773,7 +7275,7 @@
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
   CXXFLAGS="$save_CXXFLAGS"
   ac_ext=c
@@ -7884,27 +7386,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   eval "kde_cv_prog_cxx_$kde_cache=yes"
 else
   echo "$as_me: failed program was:" >&5
@@ -7913,7 +7399,7 @@
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
   CXXFLAGS="$save_CXXFLAGS"
   ac_ext=c
@@ -7986,27 +7472,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   eval "kde_cv_prog_cxx_$kde_cache=yes"
 else
   echo "$as_me: failed program was:" >&5
@@ -8015,7 +7485,7 @@
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
   CXXFLAGS="$save_CXXFLAGS"
   ac_ext=c
@@ -8080,211 +7550,6 @@
        KDE_USE_CLOSURE_TRUE="#"
        KDE_USE_CLOSURE_FALSE=""
        KDE_NO_UNDEFINED=""
-       case $host in
-         *-*-linux-gnu)
-
-{ echo "$as_me:$LINENO: checking whether $CXX supports -Wl,--no-undefined" >&5
-echo $ECHO_N "checking whether $CXX supports -Wl,--no-undefined... $ECHO_C" >&6; }
-kde_cache=`echo Wl,--no-undefined | sed 'y% .=/+-,%____p__%'`
-if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-
-   ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-
-
-  save_CXXFLAGS="$CXXFLAGS"
-  CXXFLAGS="$CXXFLAGS -Wl,--no-undefined"
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
- return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "kde_cv_prog_cxx_$kde_cache=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-  CXXFLAGS="$save_CXXFLAGS"
-  ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-fi
-
-if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
- :
-
-{ echo "$as_me:$LINENO: checking whether $CXX supports -Wl,--allow-shlib-undefined" >&5
-echo $ECHO_N "checking whether $CXX supports -Wl,--allow-shlib-undefined... $ECHO_C" >&6; }
-kde_cache=`echo Wl,--allow-shlib-undefined | sed 'y% .=/+-,%____p__%'`
-if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-
-   ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-
-
-  save_CXXFLAGS="$CXXFLAGS"
-  CXXFLAGS="$CXXFLAGS -Wl,--allow-shlib-undefined"
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
- return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "kde_cv_prog_cxx_$kde_cache=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-  CXXFLAGS="$save_CXXFLAGS"
-  ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-fi
-
-if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
- :
- KDE_NO_UNDEFINED="-Wl,--no-undefined -Wl,--allow-shlib-undefined"
-else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
- :
- KDE_NO_UNDEFINED=""
-fi
-
-else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
- :
- KDE_NO_UNDEFINED=""
-fi
-
-           ;;
-       esac
   fi
 
 
@@ -8473,7 +7738,7 @@
 # Add /usr/xpg4/bin/sed as it is typically found on Solaris
 # along with /bin/sed that truncates output.
 for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
-  test ! -f $lt_ac_sed && break
+  test ! -f $lt_ac_sed && continue
   cat /dev/null > conftest.in
   lt_ac_count=0
   echo $ECHO_N "0123456789$ECHO_C" >conftest.in
@@ -8526,7 +7791,7 @@
   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
+    { test -f "$ac_path_GREP" && $as_test_x "$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
@@ -8608,7 +7873,7 @@
   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
+    { test -f "$ac_path_EGREP" && $as_test_x "$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
@@ -8725,7 +7990,7 @@
     if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
       lt_cv_path_LD="$ac_dir/$ac_prog"
       # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some GNU ld's only accept -v.
+      # but apparently some variants of GNU ld only accept -v.
       # Break only if it was the GNU/non-GNU ld that we prefer.
       case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
       *GNU* | *'with BFD'*)
@@ -8759,7 +8024,7 @@
 if test "${lt_cv_prog_gnu_ld+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  # I'd rather use --version here, but apparently some GNU ld's only accept -v.
+  # I'd rather use --version here, but apparently some GNU lds only accept -v.
 case `$LD -v 2>&1 </dev/null` in
 *GNU* | *'with BFD'*)
   lt_cv_prog_gnu_ld=yes
@@ -8789,6 +8054,15 @@
 *) reload_flag=" $reload_flag" ;;
 esac
 reload_cmds='$LD$reload_flag -o $output$reload_objs'
+case $host_os in
+  darwin*)
+    if test "$GCC" = yes; then
+      reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
+    else
+      reload_cmds='$LD$reload_flag -o $output$reload_objs'
+    fi
+    ;;
+esac
 
 { echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
 echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6; }
@@ -8799,36 +8073,43 @@
   # Let the user override the test.
   lt_cv_path_NM="$NM"
 else
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-  for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
-    IFS="$lt_save_ifs"
-    test -z "$ac_dir" && ac_dir=.
-    tmp_nm="$ac_dir/${ac_tool_prefix}nm"
-    if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
-      # Check to see if the nm accepts a BSD-compat flag.
-      # Adding the `sed 1q' prevents false positives on HP-UX, which says:
-      #   nm: unknown option "B" ignored
-      # Tru64's nm complains that /dev/null is an invalid object file
-      case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
-      */dev/null* | *'Invalid file or object type'*)
-	lt_cv_path_NM="$tmp_nm -B"
-	break
-        ;;
-      *)
-	case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
-	*/dev/null*)
-	  lt_cv_path_NM="$tmp_nm -p"
+  lt_nm_to_check="${ac_tool_prefix}nm"
+  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
+    lt_nm_to_check="$lt_nm_to_check nm"
+  fi
+  for lt_tmp_nm in $lt_nm_to_check; do
+    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
+      IFS="$lt_save_ifs"
+      test -z "$ac_dir" && ac_dir=.
+      tmp_nm="$ac_dir/$lt_tmp_nm"
+      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
+	# Check to see if the nm accepts a BSD-compat flag.
+	# Adding the `sed 1q' prevents false positives on HP-UX, which says:
+	#   nm: unknown option "B" ignored
+	# Tru64's nm complains that /dev/null is an invalid object file
+	case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
+	*/dev/null* | *'Invalid file or object type'*)
+	  lt_cv_path_NM="$tmp_nm -B"
 	  break
 	  ;;
 	*)
-	  lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
-	  continue # so that we can try to find one that supports BSD flags
+	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
+	  */dev/null*)
+	    lt_cv_path_NM="$tmp_nm -p"
+	    break
+	    ;;
+	  *)
+	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
+	    continue # so that we can try to find one that supports BSD flags
+	    ;;
+	  esac
 	  ;;
 	esac
-      esac
-    fi
+      fi
+    done
+    IFS="$lt_save_ifs"
   done
-  IFS="$lt_save_ifs"
   test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
 fi
 fi
@@ -8875,44 +8156,36 @@
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-bsdi4*)
+bsdi[45]*)
   lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
   lt_cv_file_magic_cmd='/usr/bin/file -L'
   lt_cv_file_magic_test_file=/shlib/libc.so
   ;;
 
 cygwin*)
-  lt_cv_deplibs_check_method=pass_all
+  # func_win32_libid is a shell function defined in ltmain.sh
+  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+  lt_cv_file_magic_cmd='func_win32_libid'
   ;;
 
 mingw* | pw32*)
-  # win32_libid is a shell function defined in ltmain.sh
-  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-  lt_cv_file_magic_cmd='win32_libid'
+  # Base MSYS/MinGW do not provide the 'file' command needed by
+  # func_win32_libid shell function, so use a weaker test based on 'objdump'.
+  lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
+  lt_cv_file_magic_cmd='$OBJDUMP -f'
   ;;
 
 darwin* | rhapsody*)
-  # this will be overwritten by pass_all, but leave it in just in case
-  lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library'
-  lt_cv_file_magic_cmd='/usr/bin/file -L'
-  case "$host_os" in
-  rhapsody* | darwin1.[012])
-    lt_cv_file_magic_test_file=`/System/Library/Frameworks/System.framework/System`
-    ;;
-  *) # Darwin 1.3 on
-    lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib'
-    ;;
-  esac
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-freebsd* | kfreebsd*-gnu)
+freebsd* | dragonfly*)
   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
     case $host_cpu in
     i*86 )
       # Not sure whether the presence of OpenBSD here was a mistake.
       # Let's accept both of them until this is cleared up.
-      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library'
+      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library'
       lt_cv_file_magic_cmd=/usr/bin/file
       lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
       ;;
@@ -8928,7 +8201,7 @@
 
 hpux10.20* | hpux11*)
   lt_cv_file_magic_cmd=/usr/bin/file
-  case "$host_cpu" in
+  case $host_cpu in
   ia64*)
     lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64'
     lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
@@ -8944,43 +8217,27 @@
   esac
   ;;
 
+interix3*)
+  # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
+  lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$'
+  ;;
+
 irix5* | irix6* | nonstopux*)
-  case $host_os in
-  irix5* | nonstopux*)
-    # this will be overridden with pass_all, but let us keep it just in case
-    lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1"
-    ;;
-  *)
-    case $LD in
-    *-32|*"-32 ") libmagic=32-bit;;
-    *-n32|*"-n32 ") libmagic=N32;;
-    *-64|*"-64 ") libmagic=64-bit;;
-    *) libmagic=never-match;;
-    esac
-    # this will be overridden with pass_all, but let us keep it just in case
-    lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[1234] dynamic lib MIPS - version 1"
-    ;;
+  case $LD in
+  *-32|*"-32 ") libmagic=32-bit;;
+  *-n32|*"-n32 ") libmagic=N32;;
+  *-64|*"-64 ") libmagic=64-bit;;
+  *) libmagic=never-match;;
   esac
-  lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*`
   lt_cv_deplibs_check_method=pass_all
   ;;
 
 # This must be Linux ELF.
-linux*)
-  case $host_cpu in
-  alpha* | hppa* | i*86 | ia64* | m68* | mips* | powerpc* | sparc* | s390* | sh* | x86_64* )
-    lt_cv_deplibs_check_method=pass_all ;;
-  # the debian people say, arm and glibc 2.3.1 works for them with pass_all
-  arm* )
-    lt_cv_deplibs_check_method=pass_all ;;
-  *)
-    # glibc up to 2.1.1 does not perform some relocations on ARM
-    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' ;;
-  esac
-  lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
+linux* | k*bsd*-gnu)
+  lt_cv_deplibs_check_method=pass_all
   ;;
 
-netbsd*)
+netbsd* | netbsdelf*-gnu)
   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
     lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
   else
@@ -8999,32 +8256,22 @@
   ;;
 
 openbsd*)
-  lt_cv_file_magic_cmd=/usr/bin/file
-  lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
   if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object'
+    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$'
   else
-    lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library'
+    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
   fi
   ;;
 
 osf3* | osf4* | osf5*)
-  # this will be overridden with pass_all, but let us keep it just in case
-  lt_cv_deplibs_check_method='file_magic COFF format alpha shared library'
-  lt_cv_file_magic_test_file=/shlib/libc.so
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sco3.2v5*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
 solaris*)
   lt_cv_deplibs_check_method=pass_all
-  lt_cv_file_magic_test_file=/lib/libc.so
   ;;
 
-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+sysv4 | sysv4.3*)
   case $host_vendor in
   motorola)
     lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
@@ -9045,10 +8292,13 @@
   siemens)
     lt_cv_deplibs_check_method=pass_all
     ;;
+  pc)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
   esac
   ;;
 
-sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7* | sysv4*uw2*)
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 esac
@@ -9064,6 +8314,9 @@
 # If no C compiler was specified, use CC.
 LTCC=${LTCC-"$CC"}
 
+# If no C compiler flags were specified, use CFLAGS.
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+
 # Allow CC to be a program name with arguments.
 compiler=$CC
 
@@ -9098,7 +8351,7 @@
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 9101 "configure"' > conftest.$ac_ext
+  echo '#line 8354 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -9141,14 +8394,13 @@
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-    case "`/usr/bin/file conftest.o`" in
+    case `/usr/bin/file conftest.o` in
     *32-bit*)
-      LINUX_64_MODE="32"
       case $host in
         x86_64-*linux*)
           LD="${LD-ld} -m elf_i386"
           ;;
-        ppc64-*linux*)
+        ppc64-*linux*|powerpc64-*linux*)
           LD="${LD-ld} -m elf32ppclinux"
           ;;
         s390x-*linux*)
@@ -9160,7 +8412,6 @@
       esac
       ;;
     *64-bit*)
-      LINUX_64_MODE="64"
       case $host in
         x86_64-*linux*)
           LD="${LD-ld} -m elf_x86_64"
@@ -9224,27 +8475,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   lt_cv_cc_needs_belf=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -9253,7 +8488,7 @@
 	lt_cv_cc_needs_belf=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
      ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -9269,6 +8504,26 @@
     CFLAGS="$SAVE_CFLAGS"
   fi
   ;;
+sparc*-*solaris*)
+  # Find out which ABI we are using.
+  echo 'int i;' > conftest.$ac_ext
+  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+    case `/usr/bin/file conftest.o` in
+    *64-bit*)
+      case $lt_cv_prog_gnu_ld in
+      yes*) LD="${LD-ld} -m elf64_sparc" ;;
+      *)    LD="${LD-ld} -64" ;;
+      esac
+      ;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+
 
 esac
 
@@ -9313,27 +8568,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_header_stdc=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -9509,27 +8747,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   eval "$as_ac_Header=yes"
 else
   echo "$as_me: failed program was:" >&5
@@ -9592,27 +8813,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -9648,17 +8852,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -9717,32 +8914,265 @@
 
 done
 
-ac_ext=f
-ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
-ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_f77_compiler_gnu
-if test -n "$ac_tool_prefix"; then
-  for ac_prog in g77 f77 xlf frt pgf77 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; }
-if test "${ac_cv_prog_F77+set}" = set; then
+
+
+if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
+    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
+    (test "X$CXX" != "Xg++"))) ; then
+  ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_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; }
+if test -z "$CXXCPP"; then
+  if test "${ac_cv_prog_CXXCPP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  if test -n "$F77"; then
-  ac_cv_prog_F77="$F77" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
+      # Double quotes because CXXCPP needs to be expanded
+    for CXXCPP in "$CXX -E" "/lib/cpp"
+    do
+      ac_preproc_ok=false
+for ac_cxx_preproc_warn_flag in '' yes
 do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  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
+  # Use a header file that comes with gcc, so configuring glibc
+  # with a fresh cross-compiler works.
+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+  # <limits.h> exists even on freestanding compilers.
+  # On the NeXT, cc -E runs the code through the compiler's parser,
+  # not just through cpp. "Syntax error" is here to catch this case.
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+		     Syntax error
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
+  :
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  # Broken: fails on valid input.
+continue
+fi
+
+rm -f conftest.err conftest.$ac_ext
+
+  # OK, works on sane cases.  Now check whether nonexistent headers
+  # can be detected and how.
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <ac_nonexistent.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
+  # Broken: success on invalid input.
+continue
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+
+rm -f conftest.err conftest.$ac_ext
+
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then
+  break
+fi
+
+    done
+    ac_cv_prog_CXXCPP=$CXXCPP
+
+fi
+  CXXCPP=$ac_cv_prog_CXXCPP
+else
+  ac_cv_prog_CXXCPP=$CXXCPP
+fi
+{ echo "$as_me:$LINENO: result: $CXXCPP" >&5
+echo "${ECHO_T}$CXXCPP" >&6; }
+ac_preproc_ok=false
+for ac_cxx_preproc_warn_flag in '' yes
+do
+  # Use a header file that comes with gcc, so configuring glibc
+  # with a fresh cross-compiler works.
+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+  # <limits.h> exists even on freestanding compilers.
+  # On the NeXT, cc -E runs the code through the compiler's parser,
+  # not just through cpp. "Syntax error" is here to catch this case.
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+		     Syntax error
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
+  :
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  # Broken: fails on valid input.
+continue
+fi
+
+rm -f conftest.err conftest.$ac_ext
+
+  # OK, works on sane cases.  Now check whether nonexistent headers
+  # can be detected and how.
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <ac_nonexistent.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
+  # Broken: success on invalid input.
+continue
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+
+rm -f conftest.err conftest.$ac_ext
+
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then
+  :
+else
+  { { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check
+See \`config.log' for more details." >&5
+echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+fi
+
+ac_ext=f
+ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
+ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_f77_compiler_gnu
+if test -n "$ac_tool_prefix"; then
+  for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort 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; }
+if test "${ac_cv_prog_F77+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$F77"; then
+  ac_cv_prog_F77="$F77" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
@@ -9766,7 +9196,7 @@
 fi
 if test -z "$F77"; then
   ac_ct_F77=$F77
-  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
+  for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort 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
@@ -9784,7 +9214,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_F77="$ac_prog"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -9891,27 +9321,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_f77_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_compiler_gnu=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -9954,27 +9367,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_f77_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_prog_f77_g=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -10022,7 +9418,7 @@
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
     i=0
-  testring="ABCD"
+  teststring="ABCD"
 
   case $build_os in
   msdosdjgpp*)
@@ -10051,20 +9447,70 @@
     lt_cv_sys_max_cmd_len=8192;
     ;;
 
- *)
+  amigaos*)
+    # On AmigaOS with pdksh, this test takes hours, literally.
+    # So we just punt and use a minimum line length of 8192.
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
+  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
+    # This has been around since 386BSD, at least.  Likely further.
+    if test -x /sbin/sysctl; then
+      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
+    elif test -x /usr/sbin/sysctl; then
+      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
+    else
+      lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
+    fi
+    # And add a safety zone
+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+    ;;
+
+  interix*)
+    # We know the value 262144 and hardcode it with a safety zone (like BSD)
+    lt_cv_sys_max_cmd_len=196608
+    ;;
+
+  osf*)
+    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
+    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
+    # nice to cause kernel panics so lets avoid the loop below.
+    # First set a reasonable default.
+    lt_cv_sys_max_cmd_len=16384
+    #
+    if test -x /sbin/sysconfig; then
+      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
+        *1*) lt_cv_sys_max_cmd_len=-1 ;;
+      esac
+    fi
+    ;;
+  sco3.2v5*)
+    lt_cv_sys_max_cmd_len=102400
+    ;;
+  sysv5* | sco5v6* | sysv4.2uw2*)
+    kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
+    if test -n "$kargmax"; then
+      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[ 	]//'`
+    else
+      lt_cv_sys_max_cmd_len=32768
+    fi
+    ;;
+  *)
     # If test is not a shell built-in, we'll probably end up computing a
     # maximum length that is only half of the actual maximum length, but
     # we can't tell.
-    while (test "X"`$CONFIG_SHELL $0 --fallback-echo "X$testring" 2>/dev/null` \
-	       = "XX$testring") >/dev/null 2>&1 &&
-	    new_result=`expr "X$testring" : ".*" 2>&1` &&
+    SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
+    while (test "X"`$SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \
+	       = "XX$teststring") >/dev/null 2>&1 &&
+	    new_result=`expr "X$teststring" : ".*" 2>&1` &&
 	    lt_cv_sys_max_cmd_len=$new_result &&
 	    test $i != 17 # 1/2 MB should be enough
     do
       i=`expr $i + 1`
-      testring=$testring$testring
+      teststring=$teststring$teststring
     done
-    testring=
+    teststring=
     # Add a significant safety factor because C++ compilers can tack on massive
     # amounts of additional arguments before passing them to the linker.
     # It appears as though 1/2 is a usable value.
@@ -10101,9 +9547,6 @@
 # Regexp to match symbols that can be accessed directly from C.
 sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
 
-# Transform the above into a raw symbol and a C symbol.
-symxfrm='\1 \2\3 \3'
-
 # Transform an extracted symbol line into a proper C declaration
 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
 
@@ -10125,14 +9568,30 @@
   lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
   lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
   ;;
+linux* | k*bsd*-gnu)
+  if test "$host_cpu" = ia64; then
+    symcode='[ABCDGIRSTW]'
+    lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
+    lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
+  fi
+  ;;
 irix* | nonstopux*)
   symcode='[BCDEGRST]'
   ;;
 osf*)
   symcode='[BCDEGQRST]'
   ;;
-solaris* | sysv5*)
-  symcode='[BDT]'
+solaris*)
+  symcode='[BDRT]'
+  ;;
+sco3.2v5*)
+  symcode='[DT]'
+  ;;
+sysv4.2uw2*)
+  symcode='[DT]'
+  ;;
+sysv5* | sco5v6* | unixware* | OpenUNIX*)
+  symcode='[ABDT]'
   ;;
 sysv4)
   symcode='[DFNSTU]'
@@ -10150,14 +9609,17 @@
 # If we're using GNU nm, then use its standard symbol codes.
 case `$NM -V 2>&1` in
 *GNU* | *'with BFD'*)
-  symcode='[ABCDGISTW]' ;;
+  symcode='[ABCDGIRSTW]' ;;
 esac
 
 # Try without a prefix undercore, then with it.
 for ac_symprfx in "" "_"; do
 
+  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
+  symxfrm="\\1 $ac_symprfx\\2 \\2"
+
   # Write the raw and C identifiers.
-  lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ 	]\($symcode$symcode*\)[ 	][ 	]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'"
+  lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ 	]\($symcode$symcode*\)[ 	][ 	]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
 
   # Check to see that the pipe works correctly.
   pipe_works=no
@@ -10319,7 +9781,7 @@
 
 # Sed substitution that helps us do robust quoting.  It backslashifies
 # metacharacters that are still active within double-quoted strings.
-Xsed='sed -e s/^X//'
+Xsed='sed -e 1s/^X//'
 sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'
 
 # Same as above, but do not quote variable references.
@@ -10339,7 +9801,7 @@
 default_ofile=libtool
 can_build_shared=yes
 
-# All known linkers require a `.a' archive for static linking (except M$VC,
+# All known linkers require a `.a' archive for static linking (except MSVC,
 # which needs '.lib').
 libext=a
 ltmain="$ac_aux_dir/ltmain.sh"
@@ -10363,7 +9825,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_AR="${ac_tool_prefix}ar"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -10403,7 +9865,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_AR="ar"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -10459,7 +9921,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -10499,7 +9961,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_RANLIB="ranlib"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -10555,7 +10017,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -10595,7 +10057,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_STRIP="strip"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -10644,6 +10106,7 @@
 test -z "$AS" && AS=as
 test -z "$CC" && CC=cc
 test -z "$LTCC" && LTCC=$CC
+test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
 test -z "$DLLTOOL" && DLLTOOL=dlltool
 test -z "$LD" && LD=ld
 test -z "$LN_S" && LN_S="ln -s"
@@ -10663,15 +10126,26 @@
 if test -n "$RANLIB"; then
   case $host_os in
   openbsd*)
-    old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
     ;;
   *)
-    old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
     ;;
   esac
   old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
 fi
 
+for cc_temp in $compiler""; do
+  case $cc_temp in
+    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+    \-*) ;;
+    *) break;;
+  esac
+done
+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+
+
 # Only perform the check for file, if the check method requires it
 case $deplibs_check_method in
 file_magic*)
@@ -10697,7 +10171,7 @@
       if test -n "$file_magic_test_file"; then
 	case $deplibs_check_method in
 	"file_magic "*)
-	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
+	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
 	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
 	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
 	    $EGREP "$file_magic_regex" > /dev/null; then
@@ -10759,7 +10233,7 @@
       if test -n "$file_magic_test_file"; then
 	case $deplibs_check_method in
 	"file_magic "*)
-	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
+	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
 	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
 	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
 	    $EGREP "$file_magic_regex" > /dev/null; then
@@ -10854,68 +10328,25 @@
 # If no C compiler was specified, use CC.
 LTCC=${LTCC-"$CC"}
 
+# If no C compiler flags were specified, use CFLAGS.
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+
 # Allow CC to be a program name with arguments.
 compiler=$CC
 
 
-#
-# Check for any special shared library compilation flags.
-#
-lt_prog_cc_shlib=
-if test "$GCC" = no; then
-  case $host_os in
-  sco3.2v5*)
-    lt_prog_cc_shlib='-belf'
-    ;;
-  esac
-fi
-if test -n "$lt_prog_cc_shlib"; then
-  { echo "$as_me:$LINENO: WARNING: \`$CC' requires \`$lt_prog_cc_shlib' to build shared libraries" >&5
-echo "$as_me: WARNING: \`$CC' requires \`$lt_prog_cc_shlib' to build shared libraries" >&2;}
-  if echo "$old_CC $old_CFLAGS " | grep "[ 	]$lt_prog_cc_shlib[ 	]" >/dev/null; then :
-  else
-    { echo "$as_me:$LINENO: WARNING: add \`$lt_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&5
-echo "$as_me: WARNING: add \`$lt_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&2;}
-    lt_cv_prog_cc_can_build_shared=no
-  fi
-fi
-
-
-#
-# Check to make sure the static flag actually works.
-#
-{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_prog_compiler_static works" >&5
-echo $ECHO_N "checking if $compiler static flag $lt_prog_compiler_static works... $ECHO_C" >&6; }
-if test "${lt_prog_compiler_static_works+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  lt_prog_compiler_static_works=no
-   save_LDFLAGS="$LDFLAGS"
-   LDFLAGS="$LDFLAGS $lt_prog_compiler_static"
-   printf "$lt_simple_link_test_code" > conftest.$ac_ext
-   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     if test -s conftest.err; then
-       # Append any errors to the config.log.
-       cat conftest.err 1>&5
-     else
-       lt_prog_compiler_static_works=yes
-     fi
-   fi
-   $rm conftest*
-   LDFLAGS="$save_LDFLAGS"
-
-fi
-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5
-echo "${ECHO_T}$lt_prog_compiler_static_works" >&6; }
-
-if test x"$lt_prog_compiler_static_works" = xyes; then
-    :
-else
-    lt_prog_compiler_static=
-fi
-
+# save warnings/boilerplate of simple test code
+ac_outfile=conftest.$ac_objext
+printf "$lt_simple_compile_test_code" >conftest.$ac_ext
+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_compiler_boilerplate=`cat conftest.err`
+$rm conftest*
+
+ac_outfile=conftest.$ac_objext
+printf "$lt_simple_link_test_code" >conftest.$ac_ext
+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_linker_boilerplate=`cat conftest.err`
+$rm conftest*
 
 
 ## CAVEAT EMPTOR:
@@ -10944,18 +10375,20 @@
    # with a dollar sign (not a hyphen), so the echo should work correctly.
    # The option is referenced via a variable to avoid confusing sed.
    lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:10950: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:10381: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:10954: \$? = $ac_status" >&5
+   echo "$as_me:10385: \$? = $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
-     if test ! -s conftest.err; then
+     # So say no if there are warnings other than the usual output.
+     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
        lt_cv_prog_compiler_rtti_exceptions=yes
      fi
    fi
@@ -11016,6 +10449,11 @@
       lt_prog_compiler_pic='-fno-common'
       ;;
 
+    interix3*)
+      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+      # Instead, we relocate shared libraries at runtime.
+      ;;
+
     msdosdjgpp*)
       # Just because we use GCC doesn't mean we suddenly get shared libraries
       # on systems that don't support them.
@@ -11032,7 +10470,7 @@
     hpux*)
       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
       # not for PA HP-UX.
-      case "$host_cpu" in
+      case $host_cpu in
       hppa*64*|ia64*)
 	# +Z the default
 	;;
@@ -11058,6 +10496,16 @@
 	lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
       fi
       ;;
+      darwin*)
+        # PIC is the default on this platform
+        # Common symbols not allowed in MH_DYLIB files
+       case $cc_basename in
+         xlc*)
+         lt_prog_compiler_pic='-qnocommon'
+         lt_prog_compiler_wl='-Wl,'
+         ;;
+       esac
+       ;;
 
     mingw* | pw32* | os2*)
       # This hack is so that the source file can tell whether it is being
@@ -11069,7 +10517,7 @@
       lt_prog_compiler_wl='-Wl,'
       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
       # not for PA HP-UX.
-      case "$host_cpu" in
+      case $host_cpu in
       hppa*64*|ia64*)
 	# +Z the default
 	;;
@@ -11092,13 +10540,20 @@
       lt_prog_compiler_static='-Bstatic'
       ;;
 
-    linux*)
-      case $CC in
+    linux* | k*bsd*-gnu)
+      case $cc_basename in
       icc* | ecc*)
 	lt_prog_compiler_wl='-Wl,'
 	lt_prog_compiler_pic='-KPIC'
 	lt_prog_compiler_static='-static'
         ;;
+      pgcc* | pgf77* | pgf90* | pgf95*)
+        # Portland Group compilers (*not* the Pentium gcc compiler,
+	# which looks to be a dead project)
+	lt_prog_compiler_wl='-Wl,'
+	lt_prog_compiler_pic='-fpic'
+	lt_prog_compiler_static='-Bstatic'
+        ;;
       ccc*)
         lt_prog_compiler_wl='-Wl,'
         # All Alpha code is PIC.
@@ -11113,15 +10568,15 @@
       lt_prog_compiler_static='-non_shared'
       ;;
 
-    sco3.2v5*)
-      lt_prog_compiler_pic='-Kpic'
-      lt_prog_compiler_static='-dn'
-      ;;
-
     solaris*)
-      lt_prog_compiler_wl='-Wl,'
       lt_prog_compiler_pic='-KPIC'
       lt_prog_compiler_static='-Bstatic'
+      case $cc_basename in
+      f77* | f90* | f95*)
+	lt_prog_compiler_wl='-Qoption ld ';;
+      *)
+	lt_prog_compiler_wl='-Wl,';;
+      esac
       ;;
 
     sunos4*)
@@ -11130,7 +10585,7 @@
       lt_prog_compiler_static='-Bstatic'
       ;;
 
-    sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+    sysv4 | sysv4.2uw2* | sysv4.3*)
       lt_prog_compiler_wl='-Wl,'
       lt_prog_compiler_pic='-KPIC'
       lt_prog_compiler_static='-Bstatic'
@@ -11143,6 +10598,17 @@
       fi
       ;;
 
+    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+      lt_prog_compiler_wl='-Wl,'
+      lt_prog_compiler_pic='-KPIC'
+      lt_prog_compiler_static='-Bstatic'
+      ;;
+
+    unicos*)
+      lt_prog_compiler_wl='-Wl,'
+      lt_prog_compiler_can_build_shared=no
+      ;;
+
     uts4*)
       lt_prog_compiler_pic='-pic'
       lt_prog_compiler_static='-Bstatic'
@@ -11177,18 +10643,20 @@
    # with a dollar sign (not a hyphen), so the echo should work correctly.
    # The option is referenced via a variable to avoid confusing sed.
    lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:11183: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:10649: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:11187: \$? = $ac_status" >&5
+   echo "$as_me:10653: \$? = $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
-     if test ! -s conftest.err; then
+     # So say no if there are warnings other than the usual output.
+     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
        lt_prog_compiler_pic_works=yes
      fi
    fi
@@ -11209,7 +10677,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=
@@ -11219,6 +10687,48 @@
     ;;
 esac
 
+#
+# 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; }
+if test "${lt_prog_compiler_static_works+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  lt_prog_compiler_static_works=no
+   save_LDFLAGS="$LDFLAGS"
+   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
+   printf "$lt_simple_link_test_code" > conftest.$ac_ext
+   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+     # The linker can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     if test -s conftest.err; then
+       # Append any errors to the config.log.
+       cat conftest.err 1>&5
+       $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
+       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+       if diff conftest.exp conftest.er2 >/dev/null; then
+         lt_prog_compiler_static_works=yes
+       fi
+     else
+       lt_prog_compiler_static_works=yes
+     fi
+   fi
+   $rm conftest*
+   LDFLAGS="$save_LDFLAGS"
+
+fi
+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5
+echo "${ECHO_T}$lt_prog_compiler_static_works" >&6; }
+
+if test x"$lt_prog_compiler_static_works" = xyes; then
+    :
+else
+    lt_prog_compiler_static=
+fi
+
+
 { 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
@@ -11231,38 +10741,36 @@
    mkdir out
    printf "$lt_simple_compile_test_code" > conftest.$ac_ext
 
-   # According to Tom Tromey, Ian Lance Taylor reported there are C compilers
-   # that will create temporary files in the current directory regardless of
-   # the output directory.  Thus, making CWD read-only will cause this test
-   # to fail, enabling locking or at least warning the user not to do parallel
-   # builds.
-   chmod -w .
-
    lt_compiler_flag="-o out/conftest2.$ac_objext"
    # Insert the option either (1) after the last *FLAGS variable, or
    # (2) before a word containing "conftest.", or (3) at the end.
    # Note that $ac_compile itself does not contain backslashes and begins
    # with a dollar sign (not a hyphen), so the echo should work correctly.
    lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:11250: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:10753: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:11254: \$? = $ac_status" >&5
+   echo "$as_me:10757: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
-     if test ! -s out/conftest.err; then
+     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
+     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
        lt_cv_prog_compiler_c_o=yes
      fi
    fi
-   chmod u+w .
-   $rm conftest* out/*
-   rmdir out
+   chmod u+w . 2>&5
+   $rm conftest*
+   # SGI C++ compiler will create directory out/ii_files/ for
+   # template instantiation
+   test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
+   $rm out/* && rmdir out
    cd ..
    rmdir conftest
    $rm conftest*
@@ -11333,6 +10841,16 @@
   # rely on this symbol name, it's probably fine to never include it in
   # preloaded symbol tables.
   extract_expsyms_cmds=
+  # Just being paranoid about ensuring that cc_basename is set.
+  for cc_temp in $compiler""; do
+  case $cc_temp in
+    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+    \-*) ;;
+    *) break;;
+  esac
+done
+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
 
   case $host_os in
   cygwin* | mingw* | pw32*)
@@ -11343,6 +10861,10 @@
       with_gnu_ld=no
     fi
     ;;
+  interix*)
+    # we just hope/assume this is gcc and not c89 (= MSVC++)
+    with_gnu_ld=yes
+    ;;
   openbsd*)
     with_gnu_ld=no
     ;;
@@ -11353,6 +10875,27 @@
     # If archive_cmds runs LD, not CC, wlarc should be empty
     wlarc='${wl}'
 
+    # Set some defaults for GNU ld with shared library support. These
+    # are reset later if shared libraries are not supported. Putting them
+    # here allows them to be overridden if necessary.
+    runpath_var=LD_RUN_PATH
+    hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir'
+    export_dynamic_flag_spec='${wl}--export-dynamic'
+    # ancient GNU ld didn't support --whole-archive et. al.
+    if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
+	whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+      else
+  	whole_archive_flag_spec=
+    fi
+    supports_anon_versioning=no
+    case `$LD -v 2>/dev/null` in
+      *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
+      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
+      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
+      *\ 2.11.*) ;; # other 2.11 versions
+      *) supports_anon_versioning=yes ;;
+    esac
+
     # See if GNU ld supports shared libraries.
     case $host_os in
     aix3* | aix4* | aix5*)
@@ -11390,7 +10933,7 @@
 	allow_undefined_flag=unsupported
 	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
 	# support --undefined.  This deserves some investigation.  FIXME
-	archive_cmds='$CC -nostart $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
+	archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
       else
 	ld_shlibs=no
       fi
@@ -11400,13 +10943,13 @@
       # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
       # as there is no search path for DLLs.
       hardcode_libdir_flag_spec='-L$libdir'
-      allow_undefined_flag=no
+      allow_undefined_flag=unsupported
       always_export_symbols=no
       enable_shared_with_static_runtimes=yes
-      export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
+      export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
 
       if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
-        archive_cmds='$CC -shared $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
+        archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
 	# If the export-symbols file already is a .def file (1st line
 	# is EXPORTS), use it as is; otherwise, prepend...
 	archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
@@ -11415,23 +10958,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
+      ;;
+
+    interix3*)
+      hardcode_direct=no
+      hardcode_shlibpath_var=no
+      hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+      export_dynamic_flag_spec='${wl}-E'
+      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+      # Instead, shared libraries are loaded at an image base (0x10000000 by
+      # default) and relocated if they conflict, which is a slow very memory
+      # consuming and fragmenting process.  To avoid this, we pick a random,
+      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
+      archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      ;;
+
+    linux* | k*bsd*-gnu)
+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+	tmp_addflag=
+	case $cc_basename,$host_cpu in
+	pgcc*)				# Portland Group C compiler
+	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+	  tmp_addflag=' $pic_flag'
+	  ;;
+	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
+	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+	  tmp_addflag=' $pic_flag -Mnomain' ;;
+	ecc*,ia64* | icc*,ia64*)		# Intel C compiler on ia64
+	  tmp_addflag=' -i_dynamic' ;;
+	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
+	  tmp_addflag=' -i_dynamic -nofor_main' ;;
+	ifc* | ifort*)			# Intel Fortran compiler
+	  tmp_addflag=' -nofor_main' ;;
+	esac
+	archive_cmds='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+
+	if test $supports_anon_versioning = yes; then
+	  archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~
+  cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+  $echo "local: *; };" >> $output_objdir/$libname.ver~
+	  $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
       ;;
 
-    netbsd*)
+    netbsd* | netbsdelf*-gnu)
       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
 	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
 	wlarc=
       else
-	archive_cmds='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
       fi
       ;;
 
-    solaris* | sysv5*)
+    solaris*)
       if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
 	ld_shlibs=no
 	cat <<EOF 1>&2
@@ -11445,13 +11035,40 @@
 
 EOF
       elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	archive_cmds='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
       else
 	ld_shlibs=no
       fi
       ;;
 
+    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
+      case `$LD -v 2>&1` in
+        *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
+	ld_shlibs=no
+	cat <<_LT_EOF 1>&2
+
+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
+*** reliably create shared libraries on SCO systems.  Therefore, libtool
+*** is disabling shared libraries support.  We urge you to upgrade GNU
+*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
+
+_LT_EOF
+	;;
+	*)
+	  if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+	    hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
+	    archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib'
+	    archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib'
+	  else
+	    ld_shlibs=no
+	  fi
+	;;
+      esac
+      ;;
+
     sunos4*)
       archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
       wlarc=
@@ -11461,24 +11078,19 @@
 
     *)
       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	archive_cmds='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
       else
 	ld_shlibs=no
       fi
       ;;
     esac
 
-    if test "$ld_shlibs" = yes; then
-      runpath_var=LD_RUN_PATH
-      hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir'
-      export_dynamic_flag_spec='${wl}--export-dynamic'
-      # ancient GNU ld didn't support --whole-archive et. al.
-      if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
- 	whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-      else
-  	whole_archive_flag_spec=
-      fi
+    if test "$ld_shlibs" = no; then
+      runpath_var=
+      hardcode_libdir_flag_spec=
+      export_dynamic_flag_spec=
+      whole_archive_flag_spec=
     fi
   else
     # PORTME fill in a description of your system's linker (not GNU ld)
@@ -11490,7 +11102,7 @@
       # Note: this linker hardcodes the directories in LIBPATH if there
       # are no directories specified by -L.
       hardcode_minus_L=yes
-      if test "$GCC" = yes && test -z "$link_static_flag"; then
+      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
 	# Neither direct hardcoding nor static linking is supported with a
 	# broken collect2.
 	hardcode_direct=unsupported
@@ -11512,9 +11124,21 @@
 	else
 	  export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
 	fi
+	aix_use_runtimelinking=no
+
+	# Test if we are trying to use run time linking or normal
+	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
+	# need to do runtime linking.
+	case $host_os in aix4.[23]|aix4.[23].*|aix5*)
+	  for ld_flag in $LDFLAGS; do
+  	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+  	    aix_use_runtimelinking=yes
+  	    break
+  	  fi
+	  done
+	  ;;
+	esac
 
-	# KDE requires run time linking.  Make it the default.
-	aix_use_runtimelinking=yes
 	exp_sym_flag='-bexport'
 	no_entry_flag='-bnoentry'
       fi
@@ -11531,7 +11155,7 @@
       link_all_deplibs=yes
 
       if test "$GCC" = yes; then
-	case $host_os in aix4.012|aix4.012.*)
+	case $host_os in aix4.[012]|aix4.[012].*)
 	# We only want to do this on AIX 4.2 and lower, the check
 	# below for broken collect2 doesn't work under 4.3+
 	  collect2name=`${CC} -print-prog-name=collect2`
@@ -11550,8 +11174,12 @@
   	  hardcode_libdir_flag_spec='-L$libdir'
   	  hardcode_libdir_separator=
 	  fi
+	  ;;
 	esac
 	shared_flag='-shared'
+	if test "$aix_use_runtimelinking" = yes; then
+	  shared_flag="$shared_flag "'${wl}-G'
+	fi
       else
 	# not using gcc
 	if test "$host_cpu" = ia64; then
@@ -11559,22 +11187,23 @@
   	# chokes on -Wl,-G. The following line is correct:
 	  shared_flag='-G'
 	else
-  	if test "$aix_use_runtimelinking" = yes; then
-	    shared_flag='-qmkshrobj ${wl}-G'
+	  if test "$aix_use_runtimelinking" = yes; then
+	    shared_flag='${wl}-G'
 	  else
-	    shared_flag='-qmkshrobj'
-  	fi
+	    shared_flag='${wl}-bM:SRE'
+	  fi
 	fi
       fi
 
-      # Let the compiler handle the export list.
-      always_export_symbols=no
+      # It seems that -bexpall does not export symbols beginning with
+      # underscore (_), so it is better to generate a list of symbols to export.
+      always_export_symbols=yes
       if test "$aix_use_runtimelinking" = yes; then
 	# Warning - without using the other runtime loading flags (-brtl),
 	# -berok will link without error, but may produce a broken library.
 	allow_undefined_flag='-berok'
        # Determine the default libpath from the value encoded in an empty executable.
-	cat >conftest.$ac_ext <<_ACEOF
+       cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -11602,27 +11231,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
 
 aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
 }'`
@@ -11636,18 +11249,17 @@
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 
-	hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-	archive_cmds="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '" $shared_flag"
-	archive_expsym_cmds="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+       hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
+	archive_expsym_cmds="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
        else
 	if test "$host_cpu" = ia64; then
 	  hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
 	  allow_undefined_flag="-z nodefs"
-	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
+	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
 	else
 	 # Determine the default libpath from the value encoded in an empty executable.
 	 cat >conftest.$ac_ext <<_ACEOF
@@ -11678,27 +11290,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
 
 aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
 }'`
@@ -11712,7 +11308,7 @@
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 
@@ -11721,13 +11317,11 @@
 	  # -berok will link without error, but may produce a broken library.
 	  no_undefined_flag=' ${wl}-bernotok'
 	  allow_undefined_flag=' ${wl}-berok'
-	  # -bexpall does not export symbols beginning with underscore (_)
-	  always_export_symbols=yes
 	  # Exported symbols can be pulled into shared objects from archives
-	  whole_archive_flag_spec=' '
+	  whole_archive_flag_spec='$convenience'
 	  archive_cmds_need_lc=yes
-	  # This is similar to how AIX traditionally builds it's shared libraries.
-	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+	  # This is similar to how AIX traditionally builds its shared libraries.
+	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
 	fi
       fi
       ;;
@@ -11740,7 +11334,7 @@
       ld_shlibs=no
       ;;
 
-    bsdi4*)
+    bsdi[45]*)
       export_dynamic_flag_spec=-rdynamic
       ;;
 
@@ -11750,13 +11344,13 @@
       # hardcode_libdir_flag_spec is actually meaningless, as there is
       # no search path for DLLs.
       hardcode_libdir_flag_spec=' '
-      allow_undefined_flag=no
+      allow_undefined_flag=unsupported
       # Tell ltmain to make .lib files, not .a files.
       libext=lib
       # Tell ltmain to make .dll files, not .so files.
-      shrext=".dll"
+      shrext_cmds=".dll"
       # FIXME: Setting linknames here is a bad hack.
-      archive_cmds='$CC -o $lib $compiler_flags $libobjs `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
+      archive_cmds='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
       # The linker will automatically build a .lib file if we build a DLL.
       old_archive_From_new_cmds='true'
       # FIXME: Should let the user specify the lib program.
@@ -11766,52 +11360,52 @@
       ;;
 
     darwin* | rhapsody*)
-    if test "$GXX" = yes ; then
-      archive_cmds_need_lc=no
-      case "$host_os" in
-      rhapsody* | darwin1.[012])
-	allow_undefined_flag='-Wl,-undefined -Wl,suppress'
-	;;
-      *) # Darwin 1.3 on
-	if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-	  allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
-	else
-	  case ${MACOSX_DEPLOYMENT_TARGET} in
-	    10.012)
-	      allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
-	      ;;
-	    10.*)
-	      allow_undefined_flag='-Wl,-undefined -Wl,dynamic_lookup'
-	      ;;
-	  esac
-	fi
-	;;
+      case $host_os in
+        rhapsody* | darwin1.[012])
+         allow_undefined_flag='${wl}-undefined ${wl}suppress'
+         ;;
+       *) # Darwin 1.3 on
+         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+           allow_undefined_flag='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
+         else
+           case ${MACOSX_DEPLOYMENT_TARGET} in
+             10.[012])
+               allow_undefined_flag='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
+               ;;
+             10.*)
+               allow_undefined_flag='${wl}-undefined ${wl}dynamic_lookup'
+               ;;
+           esac
+         fi
+         ;;
       esac
-    	lt_int_apple_cc_single_mod=no
-    	output_verbose_link_cmd='echo'
-    	if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
-    	  lt_int_apple_cc_single_mod=yes
-    	fi
-    	if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-    	  archive_cmds='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring'
-    	else
-        archive_cmds='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring'
-      fi
-      module_cmds='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs'
-      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
-        if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-          archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-        else
-          archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-        fi
-          module_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+      archive_cmds_need_lc=no
       hardcode_direct=no
       hardcode_automatic=yes
       hardcode_shlibpath_var=unsupported
-      whole_archive_flag_spec='-all_load $convenience'
+      whole_archive_flag_spec=''
       link_all_deplibs=yes
+    if test "$GCC" = yes ; then
+    	output_verbose_link_cmd='echo'
+        archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+      module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+      archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+      module_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
     else
-      ld_shlibs=no
+      case $cc_basename in
+        xlc*)
+         output_verbose_link_cmd='echo'
+         archive_cmds='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
+         module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+         archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+          module_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+          ;;
+       *)
+         ld_shlibs=no
+          ;;
+      esac
     fi
       ;;
 
@@ -11845,8 +11439,8 @@
       ;;
 
     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd* | kfreebsd*-gnu)
-      archive_cmds='$CC -shared -o $lib $compiler_flags $libobjs $deplibs'
+    freebsd* | dragonfly*)
+      archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
       hardcode_libdir_flag_spec='-R$libdir'
       hardcode_direct=yes
       hardcode_shlibpath_var=no
@@ -11854,7 +11448,7 @@
 
     hpux9*)
       if test "$GCC" = yes; then
-	archive_cmds='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $compiler_flags $libobjs $deplibs~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+	archive_cmds='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
       else
 	archive_cmds='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
       fi
@@ -11868,47 +11462,62 @@
       export_dynamic_flag_spec='${wl}-E'
       ;;
 
-    hpux10* | hpux11*)
+    hpux10*)
       if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-	case "$host_cpu" in
-	hppa*64*|ia64*)
-	  archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
-	  ;;
-	*)
-	  archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $compiler_flags $libobjs $deplibs'
-	  ;;
-	esac
+	archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
       else
-	case "$host_cpu" in
-	hppa*64*|ia64*)
-	  archive_cmds='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  ;;
-	*)
-	  archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-	  ;;
-	esac
+	archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
       fi
       if test "$with_gnu_ld" = no; then
-	case "$host_cpu" in
+	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+	hardcode_libdir_separator=:
+
+	hardcode_direct=yes
+	export_dynamic_flag_spec='${wl}-E'
+
+	# hardcode_minus_L: Not really in the search PATH,
+	# but as the default location of the library.
+	hardcode_minus_L=yes
+      fi
+      ;;
+
+    hpux11*)
+      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+	case $host_cpu in
 	hppa*64*)
-	  hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-	  hardcode_libdir_flag_spec_ld='+b $libdir'
-	  hardcode_libdir_separator=:
-	  hardcode_direct=no
-	  hardcode_shlibpath_var=no
+	  archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	ia64*)
+	  archive_cmds='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	*)
+	  archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	esac
+      else
+	case $host_cpu in
+	hppa*64*)
+	  archive_cmds='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	ia64*)
-	  hardcode_libdir_flag_spec='-L$libdir'
+	  archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	*)
+	  archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	esac
+      fi
+      if test "$with_gnu_ld" = no; then
+	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+	hardcode_libdir_separator=:
+
+	case $host_cpu in
+	hppa*64*|ia64*)
+	  hardcode_libdir_flag_spec_ld='+b $libdir'
 	  hardcode_direct=no
 	  hardcode_shlibpath_var=no
-
-	  # hardcode_minus_L: Not really in the search PATH,
-	  # but as the default location of the library.
-	  hardcode_minus_L=yes
 	  ;;
 	*)
-	  hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-	  hardcode_libdir_separator=:
 	  hardcode_direct=yes
 	  export_dynamic_flag_spec='${wl}-E'
 
@@ -11922,7 +11531,7 @@
 
     irix5* | irix6* | nonstopux*)
       if test "$GCC" = yes; then
-	archive_cmds='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
       else
 	archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
 	hardcode_libdir_flag_spec_ld='-rpath $libdir'
@@ -11932,7 +11541,7 @@
       link_all_deplibs=yes
       ;;
 
-    netbsd*)
+    netbsd* | netbsdelf*-gnu)
       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
 	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
       else
@@ -11955,7 +11564,8 @@
       hardcode_direct=yes
       hardcode_shlibpath_var=no
       if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-	archive_cmds='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs'
+	archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
 	hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
 	export_dynamic_flag_spec='${wl}-E'
       else
@@ -11965,7 +11575,7 @@
 	   hardcode_libdir_flag_spec='-R$libdir'
 	   ;;
 	 *)
-	   archive_cmds='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs'
+	   archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
 	   hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
 	   ;;
        esac
@@ -11976,14 +11586,14 @@
       hardcode_libdir_flag_spec='-L$libdir'
       hardcode_minus_L=yes
       allow_undefined_flag=unsupported
-      archive_cmds='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $compiler_flags $libobjs $deplibs$output_objdir/$libname.def'
+      archive_cmds='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
       old_archive_From_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
       ;;
 
     osf3*)
       if test "$GCC" = yes; then
 	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
-	archive_cmds='$CC -shared${allow_undefined_flag} $compiler_flags $libobjs $deplibs ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
       else
 	allow_undefined_flag=' -expect_unresolved \*'
 	archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
@@ -11995,13 +11605,13 @@
     osf4* | osf5*)	# as osf3* with the addition of -msym flag
       if test "$GCC" = yes; then
 	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
-	archive_cmds='$CC -shared${allow_undefined_flag} $compiler_flags $libobjs $deplibs ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 	hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
       else
 	allow_undefined_flag=' -expect_unresolved \*'
 	archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
 	archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
-	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
+	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
 
 	# Both c and cxx compiler support -rpath directly
 	hardcode_libdir_flag_spec='-rpath $libdir'
@@ -12009,21 +11619,15 @@
       hardcode_libdir_separator=:
       ;;
 
-    sco3.2v5*)
-      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_shlibpath_var=no
-      export_dynamic_flag_spec='${wl}-Bexport'
-      runpath_var=LD_RUN_PATH
-      hardcode_runpath_var=yes
-      ;;
-
     solaris*)
       no_undefined_flag=' -z text'
       if test "$GCC" = yes; then
-	archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
+	wlarc='${wl}'
+	archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
 	archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs~$rm $lib.exp'
+	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
       else
+	wlarc=''
 	archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
 	archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
   	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
@@ -12032,8 +11636,18 @@
       hardcode_shlibpath_var=no
       case $host_os in
       solaris2.[0-5] | solaris2.[0-5].*) ;;
-      *) # Supported since Solaris 2.6 (maybe 2.5.1?)
-	whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;;
+      *)
+ 	# The compiler driver will combine linker options so we
+ 	# cannot just pass the convience library names through
+ 	# without $wl, iff we do not link with $LD.
+ 	# Luckily, gcc supports the same syntax we need for Sun Studio.
+ 	# Supported since Solaris 2.6 (maybe 2.5.1?)
+ 	case $wlarc in
+ 	'')
+ 	  whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;;
+ 	*)
+ 	  whole_archive_flag_spec='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
+ 	esac ;;
       esac
       link_all_deplibs=yes
       ;;
@@ -12042,7 +11656,7 @@
       if test "x$host_vendor" = xsequent; then
 	# Use $CC to link under sequent, because it throws in some extra .o
 	# files that make .init and .fini sections work.
-	archive_cmds='$CC -G ${wl}-h $soname -o $lib $compiler_flags $libobjs $deplibs'
+	archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
       else
 	archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
       fi
@@ -12090,36 +11704,45 @@
       fi
       ;;
 
-    sysv4.2uw2*)
-      archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_direct=yes
-      hardcode_minus_L=no
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)
+      no_undefined_flag='${wl}-z,text'
+      archive_cmds_need_lc=no
       hardcode_shlibpath_var=no
-      hardcode_runpath_var=yes
-      runpath_var=LD_RUN_PATH
-      ;;
+      runpath_var='LD_RUN_PATH'
 
-   sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[78]* | unixware7*)
-      no_undefined_flag='${wl}-z ${wl}text'
       if test "$GCC" = yes; then
-	archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
+	archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
       else
-	archive_cmds='$CC -G ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
+	archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
       fi
-      runpath_var='LD_RUN_PATH'
-      hardcode_shlibpath_var=no
       ;;
 
-    sysv5*)
-      no_undefined_flag=' -z text'
-      # $CC -shared without GNU ld will not create a library from C++
-      # object files and a static libstdc++, better avoid it by now
-      archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-  		$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-      hardcode_libdir_flag_spec=
+    sysv5* | sco3.2v5* | sco5v6*)
+      # Note: We can NOT use -z defs as we might desire, because we do not
+      # link with -lc, and that would cause any symbols used from libc to
+      # always be unresolved, which means just about no library would
+      # ever link correctly.  If we're not using GNU ld we use -z text
+      # though, which does catch some bad symbols but isn't as heavy-handed
+      # as -z defs.
+      no_undefined_flag='${wl}-z,text'
+      allow_undefined_flag='${wl}-z,nodefs'
+      archive_cmds_need_lc=no
       hardcode_shlibpath_var=no
+      hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
+      hardcode_libdir_separator=':'
+      link_all_deplibs=yes
+      export_dynamic_flag_spec='${wl}-Bexport'
       runpath_var='LD_RUN_PATH'
+
+      if test "$GCC" = yes; then
+	archive_cmds='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	archive_cmds='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+      fi
       ;;
 
     uts4*)
@@ -12138,11 +11761,6 @@
 echo "${ECHO_T}$ld_shlibs" >&6; }
 test "$ld_shlibs" = no && can_build_shared=no
 
-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test "$GCC" = yes; then
-  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-fi
-
 #
 # Do we need to explicitly link libc?
 #
@@ -12175,6 +11793,7 @@
         libobjs=conftest.$ac_objext
         deplibs=
         wl=$lt_prog_compiler_wl
+	pic_flag=$lt_prog_compiler_pic
         compiler_flags=-v
         linker_flags=-v
         verstring=
@@ -12210,7 +11829,7 @@
 library_names_spec=
 libname_spec='lib$name'
 soname_spec=
-shrext=".so"
+shrext_cmds=".so"
 postinstall_cmds=
 postuninstall_cmds=
 finish_cmds=
@@ -12220,7 +11839,20 @@
 version_type=none
 dynamic_linker="$host_os ld.so"
 sys_lib_dlsearch_path_spec="/lib /usr/lib"
-sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+if test "$GCC" = yes; then
+  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
+    # if the path contains ";" then we assume it to be the separator
+    # otherwise default to the standard path separator (i.e. ":") - it is
+    # assumed that no part of a normal pathname contains ";" but that should
+    # okay in the real world where ";" in dirpaths is itself problematic.
+    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+  else
+    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
+  fi
+else
+  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+fi
 need_lib_prefix=unknown
 hardcode_into_libs=no
 
@@ -12285,7 +11917,7 @@
 amigaos*)
   library_names_spec='$libname.ixlibrary $libname.a'
   # Create ${libname}_ixlibrary.a entries in /sys/libs.
-  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done'
+  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
   ;;
 
 beos*)
@@ -12294,7 +11926,7 @@
   shlibpath_var=LIBRARY_PATH
   ;;
 
-bsdi4*)
+bsdi[45]*)
   version_type=linux
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -12310,7 +11942,7 @@
 
 cygwin* | mingw* | pw32*)
   version_type=windows
-  shrext=".dll"
+  shrext_cmds=".dll"
   need_version=no
   need_lib_prefix=no
 
@@ -12322,7 +11954,8 @@
       dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
       dldir=$destdir/`dirname \$dlpath`~
       test -d \$dldir || mkdir -p \$dldir~
-      $install_prog $dir/$dlname \$dldir/$dlname'
+      $install_prog $dir/$dlname \$dldir/$dlname~
+      chmod a+x \$dldir/$dlname'
     postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
       dlpath=$dir/\$dldll~
        $rm \$dlpath'
@@ -12352,7 +11985,7 @@
       ;;
     pw32*)
       # pw32 DLLs use 'pw' prefix rather than 'lib'
-      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}'
+      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
       ;;
     esac
     ;;
@@ -12375,7 +12008,7 @@
   soname_spec='${libname}${release}${major}$shared_ext'
   shlibpath_overrides_runpath=yes
   shlibpath_var=DYLD_LIBRARY_PATH
-  shrext='$(test .$module = .yes && echo .so || echo .dylib)'
+  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
   # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
   if test "$GCC" = yes; then
     sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
@@ -12398,20 +12031,17 @@
   dynamic_linker=no
   ;;
 
-kfreebsd*-gnu*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='GNU ld.so'
-  ;;
-
-freebsd*)
-  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
+freebsd* | dragonfly*)
+  # DragonFly does not have aout.  When/if they implement a new
+  # versioning mechanism, adjust this.
+  if test -x /usr/bin/objformat; then
+    objformat=`/usr/bin/objformat`
+  else
+    case $host_os in
+    freebsd[123]*) objformat=aout ;;
+    *) objformat=elf ;;
+    esac
+  fi
   version_type=freebsd-$objformat
   case $version_type in
     freebsd-elf*)
@@ -12429,14 +12059,19 @@
   freebsd2*)
     shlibpath_overrides_runpath=yes
     ;;
-  freebsd3.01* | freebsdelf3.01*)
+  freebsd3.[01]* | freebsdelf3.[01]*)
     shlibpath_overrides_runpath=yes
     hardcode_into_libs=yes
     ;;
-  *) # from 3.2 on
+  freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
+  freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
     shlibpath_overrides_runpath=no
     hardcode_into_libs=yes
     ;;
+  freebsd*) # from 4.6 on
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
   esac
   ;;
 
@@ -12456,9 +12091,9 @@
   version_type=sunos
   need_lib_prefix=no
   need_version=no
-  case "$host_cpu" in
+  case $host_cpu in
   ia64*)
-    shrext='.so'
+    shrext_cmds='.so'
     hardcode_into_libs=yes
     dynamic_linker="$host_os dld.so"
     shlibpath_var=LD_LIBRARY_PATH
@@ -12473,7 +12108,7 @@
     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
     ;;
    hppa*64*)
-     shrext='.sl'
+     shrext_cmds='.sl'
      hardcode_into_libs=yes
      dynamic_linker="$host_os dld.sl"
      shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
@@ -12484,7 +12119,7 @@
      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
      ;;
    *)
-    shrext='.sl'
+    shrext_cmds='.sl'
     dynamic_linker="$host_os dld.sl"
     shlibpath_var=SHLIB_PATH
     shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
@@ -12496,6 +12131,18 @@
   postinstall_cmds='chmod 555 $lib'
   ;;
 
+interix3*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
 irix5* | irix6* | nonstopux*)
   case $host_os in
     nonstopux*) version_type=nonstopux ;;
@@ -12539,29 +12186,26 @@
   ;;
 
 # This must be Linux ELF.
-linux*)
+linux* | k*bsd*-gnu)
   version_type=linux
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
   finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-  libsuff=
-  if test "x$LINUX_64_MODE" = x64; then
-    # Some platforms are per default 64-bit, so there's no /lib64
-    if test -d /lib64 -a ! -h /lib64; then
-      libsuff=64
-    fi
-  fi
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=no
-  sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}"
-  sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
   # This implies no fast_install, which is unacceptable.
   # Some rework will be needed to allow for fast_install
   # before this can be enabled.
   hardcode_into_libs=yes
 
+  # Append ld.so.conf contents to the search path
+  if test -f /etc/ld.so.conf; then
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+  fi
+
   # We used to test for /lib/ld.so.1 and disable shared libraries on
   # powerpc, because MkLinux only supported shared libraries with the
   # GNU dynamic linker.  Since this was broken with cross compilers,
@@ -12571,6 +12215,18 @@
   dynamic_linker='GNU/Linux ld.so'
   ;;
 
+netbsdelf*-gnu)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='NetBSD ld.elf_so'
+  ;;
+
 netbsd*)
   version_type=sunos
   need_lib_prefix=no
@@ -12580,7 +12236,7 @@
     finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
     dynamic_linker='NetBSD (a.out) ld.so'
   else
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} ${libname}${shared_ext}'
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
     soname_spec='${libname}${release}${shared_ext}$major'
     dynamic_linker='NetBSD ld.elf_so'
   fi
@@ -12608,8 +12264,13 @@
 
 openbsd*)
   version_type=sunos
+  sys_lib_dlsearch_path_spec="/usr/lib"
   need_lib_prefix=no
-  need_version=no
+  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
+  case $host_os in
+    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
+    *)                         need_version=no  ;;
+  esac
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
   finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
   shlibpath_var=LD_LIBRARY_PATH
@@ -12629,7 +12290,7 @@
 
 os2*)
   libname_spec='$name'
-  shrext=".dll"
+  shrext_cmds=".dll"
   need_lib_prefix=no
   library_names_spec='$libname${shared_ext} $libname.a'
   dynamic_linker='OS/2 ld.exe'
@@ -12647,13 +12308,6 @@
   sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
   ;;
 
-sco3.2v5*)
-  version_type=osf
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
 solaris*)
   version_type=linux
   need_lib_prefix=no
@@ -12679,7 +12333,7 @@
   need_version=yes
   ;;
 
-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+sysv4 | sysv4.3*)
   version_type=linux
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
@@ -12712,6 +12366,29 @@
   fi
   ;;
 
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+  version_type=freebsd-elf
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  hardcode_into_libs=yes
+  if test "$with_gnu_ld" = yes; then
+    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
+    shlibpath_overrides_runpath=no
+  else
+    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
+    shlibpath_overrides_runpath=yes
+    case $host_os in
+      sco3.2v5*)
+        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
+	;;
+    esac
+  fi
+  sys_lib_dlsearch_path_spec='/usr/lib'
+  ;;
+
 uts4*)
   version_type=linux
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -12727,12 +12404,17 @@
 echo "${ECHO_T}$dynamic_linker" >&6; }
 test "$dynamic_linker" = no && can_build_shared=no
 
+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+if test "$GCC" = yes; then
+  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+fi
+
 { 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 " || \
-   test "X$hardcode_automatic"="Xyes" ; then
+   test -n "$runpath_var" || \
+   test "X$hardcode_automatic" = "Xyes" ; then
 
   # We can hardcode non-existant directories.
   if test "$hardcode_direct" != no &&
@@ -12862,27 +12544,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_dl_dlopen=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -12891,7 +12557,7 @@
 	ac_cv_lib_dl_dlopen=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
@@ -12973,27 +12639,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_func_shl_load=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -13002,7 +12652,7 @@
 	ac_cv_func_shl_load=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
 { echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
@@ -13052,27 +12702,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_dld_shl_load=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -13081,7 +12715,7 @@
 	ac_cv_lib_dld_shl_load=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
@@ -13153,27 +12787,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_func_dlopen=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -13182,7 +12800,7 @@
 	ac_cv_func_dlopen=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
 { echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
@@ -13232,27 +12850,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_dl_dlopen=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -13261,7 +12863,7 @@
 	ac_cv_lib_dl_dlopen=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
@@ -13312,27 +12914,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_svld_dlopen=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -13341,7 +12927,7 @@
 	ac_cv_lib_svld_dlopen=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
@@ -13392,27 +12978,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_dld_dld_link=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -13421,7 +12991,7 @@
 	ac_cv_lib_dld_dld_link=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
@@ -13461,7 +13031,7 @@
     test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
 
     save_LDFLAGS="$LDFLAGS"
-    eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
+    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
 
     save_LIBS="$LIBS"
     LIBS="$lt_cv_dlopen_libs $LIBS"
@@ -13477,7 +13047,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 13480 "configure"
+#line 13050 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -13534,6 +13104,8 @@
       else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
       /* dlclose (self); */
     }
+  else
+    puts (dlerror ());
 
     exit (status);
 }
@@ -13543,12 +13115,12 @@
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
-    (./conftest; exit; ) 2>/dev/null
+    (./conftest; exit; ) >&5 2>/dev/null
     lt_status=$?
     case x$lt_status in
       x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
       x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
-      x$lt_unknown|x*) lt_cv_dlopen_self=no ;;
+      x$lt_dlunknown|x*) lt_cv_dlopen_self=no ;;
     esac
   else :
     # compilation failed
@@ -13563,7 +13135,7 @@
 echo "${ECHO_T}$lt_cv_dlopen_self" >&6; }
 
     if test "x$lt_cv_dlopen_self" = xyes; then
-      LDFLAGS="$LDFLAGS $link_static_flag"
+      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
       { 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
@@ -13575,7 +13147,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 13578 "configure"
+#line 13150 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -13632,6 +13204,8 @@
       else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
       /* dlclose (self); */
     }
+  else
+    puts (dlerror ());
 
     exit (status);
 }
@@ -13641,12 +13215,12 @@
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
-    (./conftest; exit; ) 2>/dev/null
+    (./conftest; exit; ) >&5 2>/dev/null
     lt_status=$?
     case x$lt_status in
       x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
       x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
-      x$lt_unknown|x*) lt_cv_dlopen_self_static=no ;;
+      x$lt_dlunknown|x*) lt_cv_dlopen_self_static=no ;;
     esac
   else :
     # compilation failed
@@ -13679,7 +13253,7 @@
 fi
 
 
-# Report which librarie types wil actually be built
+# 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
@@ -13691,7 +13265,7 @@
 
 # On AIX, shared libraries and static libraries use the same namespace, and
 # are all built from PIC.
-case "$host_os" in
+case $host_os in
 aix3*)
   test "$enable_shared" = yes && enable_static=no
   if test -n "$RANLIB"; then
@@ -13700,47 +13274,10 @@
   fi
   ;;
 
-aix4*)
+aix4* | aix5*)
   if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
     test "$enable_shared" = yes && enable_static=no
   fi
-  ;;
-  darwin* | rhapsody*)
-  if test "$GCC" = yes; then
-    archive_cmds_need_lc=no
-    case "$host_os" in
-    rhapsody* | darwin1.[012])
-      allow_undefined_flag='-Wl,-undefined -Wl,suppress'
-      ;;
-    *) # Darwin 1.3 on
-      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-	allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
-      else
-	case ${MACOSX_DEPLOYMENT_TARGET} in
-	  10.012)
-	    allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
-	    ;;
-	  10.*)
-	    allow_undefined_flag='-Wl,-undefined -Wl,dynamic_lookup'
-	    ;;
-	esac
-      fi
-      ;;
-    esac
-    output_verbose_link_cmd='echo'
-    archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring'
-    module_cmds='$CC $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs'
-    # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
-    archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag  -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-    module_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-    hardcode_direct=no
-    hardcode_automatic=yes
-    hardcode_shlibpath_var=unsupported
-    whole_archive_flag_spec='-all_load $convenience'
-    link_all_deplibs=yes
-  else
-    ld_shlibs=no
-  fi
     ;;
 esac
 { echo "$as_me:$LINENO: result: $enable_shared" >&5
@@ -13766,7 +13303,8 @@
   # Now quote all the things that may contain metacharacters while being
   # careful not to overquote the AC_SUBSTed values.  We take copies of the
   # variables and quote the copies for generation of the libtool script.
-  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL \
+  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
+    SED SHELL STRIP \
     libname_spec library_names_spec soname_spec extract_expsyms_cmds \
     old_striplib striplib file_magic_cmd finish_cmds finish_eval \
     deplibs_check_method reload_flag reload_cmds need_locks \
@@ -13880,11 +13418,11 @@
 SED=$lt_SED
 
 # Sed that helps us avoid accidentally triggering echo(1) options like -n.
-Xsed="$SED -e s/^X//"
+Xsed="$SED -e 1s/^X//"
 
 # The HP-UX ksh and POSIX shell print the target directory to stdout
 # if CDPATH is set.
-if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
 # The names of the tagged configurations supported by this script.
 available_tags=
@@ -13914,6 +13452,12 @@
 # The host system.
 host_alias=$host_alias
 host=$host
+host_os=$host_os
+
+# The build system.
+build_alias=$build_alias
+build=$build
+build_os=$build_os
 
 # An echo program that does not interpret backslashes.
 echo=$lt_echo
@@ -13925,6 +13469,9 @@
 # A C compiler.
 LTCC=$lt_LTCC
 
+# LTCC compiler flags.
+LTCFLAGS=$lt_LTCFLAGS
+
 # A language-specific compiler.
 CC=$lt_compiler
 
@@ -13944,7 +13491,7 @@
 NM=$lt_NM
 
 # A symbol stripping program
-STRIP=$STRIP
+STRIP=$lt_STRIP
 
 # Used to examine libraries when file_magic_cmd begins "file"
 MAGIC_CMD=$MAGIC_CMD
@@ -13975,7 +13522,7 @@
 libext="$libext"
 
 # Shared library suffix (normally ".so").
-shrext='$shrext'
+shrext_cmds='$shrext_cmds'
 
 # Executable file suffix (normally "").
 exeext="$exeext"
@@ -13990,7 +13537,7 @@
 # Does compiler simultaneously support -c and -o options?
 compiler_c_o=$lt_lt_cv_prog_compiler_c_o
 
-# Must we lock files when doing compilation ?
+# Must we lock files when doing compilation?
 need_locks=$lt_need_locks
 
 # Do we need the lib prefix for modules?
@@ -14217,7 +13764,10 @@
   # If there is no Makefile yet, we rely on a make rule to execute
   # `config.status --recheck' to rerun these tests and create the
   # libtool script then.
-  test -f Makefile && make "$ltmain"
+  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
+  if test -f "$ltmain_in"; then
+    test -f Makefile && make "$ltmain"
+  fi
 fi
 
 
@@ -14252,6 +13802,9 @@
 echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;}
     fi
   fi
+  if test -z "$LTCFLAGS"; then
+    eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`"
+  fi
 
   # Extract list of available tagged configurations in $ofile.
   # Note that this assumes the entire list is on one line.
@@ -14282,7 +13835,9 @@
 
       case $tagname in
       CXX)
-	if test -n "$CXX" && test "X$CXX" != "Xno"; then
+	if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
+	    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
+	    (test "X$CXX" != "Xg++"))) ; then
 	  ac_ext=cpp
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -14302,6 +13857,7 @@
 hardcode_libdir_flag_spec_ld_CXX=
 hardcode_libdir_separator_CXX=
 hardcode_minus_L_CXX=no
+hardcode_shlibpath_var_CXX=unsupported
 hardcode_automatic_CXX=no
 module_cmds_CXX=
 module_expsym_cmds_CXX=
@@ -14319,7 +13875,7 @@
 compiler_lib_search_path_CXX=
 
 # Source file extension for C++ test sources.
-ac_ext=cc
+ac_ext=cpp
 
 # Object file extension for compiled C++ test sources.
 objext=o
@@ -14329,17 +13885,34 @@
 lt_simple_compile_test_code="int some_variable = 0;\n"
 
 # Code to be used in simple link tests
-lt_simple_link_test_code='int main(int, char *) { return(0); }\n'
+lt_simple_link_test_code='int main(int, char *[]) { return(0); }\n'
 
 # ltmain only uses $CC for tagged configurations so make sure $CC is set.
 
 # If no C compiler was specified, use CC.
 LTCC=${LTCC-"$CC"}
 
+# If no C compiler flags were specified, use CFLAGS.
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+
 # Allow CC to be a program name with arguments.
 compiler=$CC
 
 
+# save warnings/boilerplate of simple test code
+ac_outfile=conftest.$ac_objext
+printf "$lt_simple_compile_test_code" >conftest.$ac_ext
+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_compiler_boilerplate=`cat conftest.err`
+$rm conftest*
+
+ac_outfile=conftest.$ac_objext
+printf "$lt_simple_link_test_code" >conftest.$ac_ext
+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_linker_boilerplate=`cat conftest.err`
+$rm conftest*
+
+
 # Allow CC to be a program name with arguments.
 lt_save_CC=$CC
 lt_save_LD=$LD
@@ -14350,18 +13923,27 @@
 if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
   lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
 else
-  unset lt_cv_prog_gnu_ld
+  $as_unset lt_cv_prog_gnu_ld
 fi
 if test -n "${lt_cv_path_LDCXX+set}"; then
   lt_cv_path_LD=$lt_cv_path_LDCXX
 else
-  unset lt_cv_path_LD
+  $as_unset lt_cv_path_LD
 fi
 test -z "${LDCXX+set}" || LD=$LDCXX
 CC=${CXX-"c++"}
 compiler=$CC
 compiler_CXX=$CC
-cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
+for cc_temp in $compiler""; do
+  case $cc_temp in
+    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+    \-*) ;;
+    *) break;;
+  esac
+done
+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+
 
 # We don't want -fno-exception wen compiling C++ code, so set the
 # no_builtin_flag separately
@@ -14432,7 +14014,7 @@
     if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
       lt_cv_path_LD="$ac_dir/$ac_prog"
       # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some GNU ld's only accept -v.
+      # but apparently some variants of GNU ld only accept -v.
       # Break only if it was the GNU/non-GNU ld that we prefer.
       case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
       *GNU* | *'with BFD'*)
@@ -14466,7 +14048,7 @@
 if test "${lt_cv_prog_gnu_ld+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  # I'd rather use --version here, but apparently some GNU ld's only accept -v.
+  # I'd rather use --version here, but apparently some GNU lds only accept -v.
 case `$LD -v 2>&1 </dev/null` in
 *GNU* | *'with BFD'*)
   lt_cv_prog_gnu_ld=yes
@@ -14485,8 +14067,8 @@
   # Check if GNU C++ uses GNU ld as the underlying linker, since the
   # archiving commands below assume that GNU ld is being used.
   if test "$with_gnu_ld" = yes; then
-    archive_cmds_CXX='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib'
-    archive_expsym_cmds_CXX='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+    archive_expsym_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
 
     hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
     export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
@@ -14512,7 +14094,7 @@
     # linker, instead of GNU ld.  If possible, this setting should
     # overridden to take advantage of the native linker features on
     # the platform it is being used on.
-    archive_cmds_CXX='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -o $lib'
+    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
   fi
 
   # Commands to make compiler produce verbose output that lists
@@ -14543,8 +14125,23 @@
       exp_sym_flag='-Bexport'
       no_entry_flag=""
     else
-      # KDE requires run time linking.  Make it the default.
-      aix_use_runtimelinking=yes
+      aix_use_runtimelinking=no
+
+      # Test if we are trying to use run time linking or normal
+      # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+      # need to do runtime linking.
+      case $host_os in aix4.[23]|aix4.[23].*|aix5*)
+	for ld_flag in $LDFLAGS; do
+	  case $ld_flag in
+	  *-brtl*)
+	    aix_use_runtimelinking=yes
+	    break
+	    ;;
+	  esac
+	done
+	;;
+      esac
+
       exp_sym_flag='-bexport'
       no_entry_flag='-bnoentry'
     fi
@@ -14561,7 +14158,7 @@
     link_all_deplibs_CXX=yes
 
     if test "$GXX" = yes; then
-      case $host_os in aix4.012|aix4.012.*)
+      case $host_os in aix4.[012]|aix4.[012].*)
       # We only want to do this on AIX 4.2 and lower, the check
       # below for broken collect2 doesn't work under 4.3+
 	collect2name=`${CC} -print-prog-name=collect2`
@@ -14580,8 +14177,12 @@
 	  hardcode_libdir_flag_spec_CXX='-L$libdir'
 	  hardcode_libdir_separator_CXX=
 	fi
+	;;
       esac
       shared_flag='-shared'
+      if test "$aix_use_runtimelinking" = yes; then
+	shared_flag="$shared_flag "'${wl}-G'
+      fi
     else
       # not using gcc
       if test "$host_cpu" = ia64; then
@@ -14590,15 +14191,16 @@
 	shared_flag='-G'
       else
 	if test "$aix_use_runtimelinking" = yes; then
-	  shared_flag='-qmkshrobj ${wl}-G'
+	  shared_flag='${wl}-G'
 	else
-	  shared_flag='-qmkshrobj'
+	  shared_flag='${wl}-bM:SRE'
 	fi
       fi
     fi
 
-    # Let the compiler handle the export list.
-    always_export_symbols_CXX=no
+    # It seems that -bexpall does not export symbols beginning with
+    # underscore (_), so it is better to generate a list of symbols to export.
+    always_export_symbols_CXX=yes
     if test "$aix_use_runtimelinking" = yes; then
       # Warning - without using the other runtime loading flags (-brtl),
       # -berok will link without error, but may produce a broken library.
@@ -14632,27 +14234,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
 
 aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
 }'`
@@ -14666,19 +14252,18 @@
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 
       hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
 
-      archive_cmds_CXX="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '" $shared_flag"
-      archive_expsym_cmds_CXX="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+      archive_expsym_cmds_CXX="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
      else
       if test "$host_cpu" = ia64; then
 	hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib'
 	allow_undefined_flag_CXX="-z nodefs"
-	archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
+	archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
       else
 	# Determine the default libpath from the value encoded in an empty executable.
 	cat >conftest.$ac_ext <<_ACEOF
@@ -14709,27 +14294,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
 
 aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
 }'`
@@ -14743,7 +14312,7 @@
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 
@@ -14752,16 +14321,26 @@
 	# -berok will link without error, but may produce a broken library.
 	no_undefined_flag_CXX=' ${wl}-bernotok'
 	allow_undefined_flag_CXX=' ${wl}-berok'
-	# -bexpall does not export symbols beginning with underscore (_)
-	always_export_symbols_CXX=yes
 	# Exported symbols can be pulled into shared objects from archives
-	whole_archive_flag_spec_CXX=' '
+	whole_archive_flag_spec_CXX='$convenience'
 	archive_cmds_need_lc_CXX=yes
-	# This is similar to how AIX traditionally builds it's shared libraries.
-	archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+	# This is similar to how AIX traditionally builds its shared libraries.
+	archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
       fi
     fi
     ;;
+
+  beos*)
+    if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+      allow_undefined_flag_CXX=unsupported
+      # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+      # support --undefined.  This deserves some investigation.  FIXME
+      archive_cmds_CXX='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+    else
+      ld_shlibs_CXX=no
+    fi
+    ;;
+
   chorus*)
     case $cc_basename in
       *)
@@ -14775,12 +14354,12 @@
     # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
     # as there is no search path for DLLs.
     hardcode_libdir_flag_spec_CXX='-L$libdir'
-    allow_undefined_flag_CXX=no
+    allow_undefined_flag_CXX=unsupported
     always_export_symbols_CXX=no
     enable_shared_with_static_runtimes_CXX=yes
 
     if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
-      archive_cmds_CXX='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
+      archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
       # If the export-symbols file already is a .def file (1st line
       # is EXPORTS), use it as is; otherwise, prepend...
       archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
@@ -14789,70 +14368,81 @@
 	echo EXPORTS > $output_objdir/$soname.def;
 	cat $export_symbols >> $output_objdir/$soname.def;
       fi~
-      $CC -shared -nostdlib $output_objdir/$soname.def $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
+      $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
     else
       ld_shlibs_CXX=no
     fi
   ;;
+      darwin* | rhapsody*)
+        case $host_os in
+        rhapsody* | darwin1.[012])
+         allow_undefined_flag_CXX='${wl}-undefined ${wl}suppress'
+         ;;
+       *) # Darwin 1.3 on
+         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+           allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
+         else
+           case ${MACOSX_DEPLOYMENT_TARGET} in
+             10.[012])
+               allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
+               ;;
+             10.*)
+               allow_undefined_flag_CXX='${wl}-undefined ${wl}dynamic_lookup'
+               ;;
+           esac
+         fi
+         ;;
+        esac
+      archive_cmds_need_lc_CXX=no
+      hardcode_direct_CXX=no
+      hardcode_automatic_CXX=yes
+      hardcode_shlibpath_var_CXX=unsupported
+      whole_archive_flag_spec_CXX=''
+      link_all_deplibs_CXX=yes
 
-  darwin* | rhapsody*)
-  if test "$GXX" = yes; then
-    archive_cmds_need_lc_CXX=no
-    case "$host_os" in
-    rhapsody* | darwin1.[012])
-      allow_undefined_flag_CXX='-Wl,-undefined -Wl,suppress'
-      ;;
-    *) # Darwin 1.3 on
-      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-	allow_undefined_flag_CXX='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
-      else
-	case ${MACOSX_DEPLOYMENT_TARGET} in
-	  10.012)
-	    allow_undefined_flag_CXX='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
-	    ;;
-	  10.*)
-	    allow_undefined_flag_CXX='-Wl,-undefined -Wl,dynamic_lookup'
-	    ;;
-	esac
+    if test "$GXX" = yes ; then
+      lt_int_apple_cc_single_mod=no
+      output_verbose_link_cmd='echo'
+      if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then
+       lt_int_apple_cc_single_mod=yes
       fi
-      ;;
-    esac
-    lt_int_apple_cc_single_mod=no
-    output_verbose_link_cmd='echo'
-    if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
-      lt_int_apple_cc_single_mod=yes
-    fi
-    if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-      archive_cmds_CXX='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring'
-    else
-      archive_cmds_CXX='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring'
-    fi
-    module_cmds_CXX='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs'
-
-    # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
-    if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-      archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-    else
-      archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-    fi
-    module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-    hardcode_direct_CXX=no
-    hardcode_automatic_CXX=yes
-    hardcode_shlibpath_var_CXX=unsupported
-    whole_archive_flag_spec_CXX='-all_load $convenience'
-    link_all_deplibs_CXX=yes
-  else
-    ld_shlibs_CXX=no
-  fi
-    ;;
+      if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+       archive_cmds_CXX='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+      else
+          archive_cmds_CXX='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+        fi
+        module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+        # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+          if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+            archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+          else
+            archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+          fi
+            module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+      else
+      case $cc_basename in
+        xlc*)
+         output_verbose_link_cmd='echo'
+          archive_cmds_CXX='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
+          module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+          archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+          module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+          ;;
+       *)
+         ld_shlibs_CXX=no
+          ;;
+      esac
+      fi
+        ;;
 
   dgux*)
     case $cc_basename in
-      ec++)
+      ec++*)
 	# FIXME: insert proper C++ library support
 	ld_shlibs_CXX=no
 	;;
-      ghcx)
+      ghcx*)
 	# Green Hills C++ Compiler
 	# FIXME: insert proper C++ library support
 	ld_shlibs_CXX=no
@@ -14863,14 +14453,14 @@
 	;;
     esac
     ;;
-  freebsd12*)
+  freebsd[12]*)
     # C++ shared libraries reported to be fairly broken before switch to ELF
     ld_shlibs_CXX=no
     ;;
   freebsd-elf*)
     archive_cmds_need_lc_CXX=no
     ;;
-  freebsd* | kfreebsd*-gnu)
+  freebsd* | dragonfly*)
     # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
     # conventions
     ld_shlibs_CXX=yes
@@ -14887,12 +14477,12 @@
 				# location of the library.
 
     case $cc_basename in
-    CC)
+    CC*)
       # FIXME: insert proper C++ library support
       ld_shlibs_CXX=no
       ;;
-    aCC)
-      archive_cmds_CXX='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+    aCC*)
+      archive_cmds_CXX='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
       # Commands to make compiler produce verbose output that lists
       # what "hidden" libraries, object files and flags are used when
       # linking a shared library.
@@ -14901,11 +14491,11 @@
       # explicitly linking system object files so we need to strip them
       # from the output so that they don't get included in the library
       # dependencies.
-      output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | egrep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+      output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[-]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
       ;;
     *)
       if test "$GXX" = yes; then
-        archive_cmds_CXX='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+        archive_cmds_CXX='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
       else
         # FIXME: insert proper C++ library support
         ld_shlibs_CXX=no
@@ -14915,33 +14505,22 @@
     ;;
   hpux10*|hpux11*)
     if test $with_gnu_ld = no; then
-      case "$host_cpu" in
-      hppa*64*)
-	hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
+      hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
+      hardcode_libdir_separator_CXX=:
+
+      case $host_cpu in
+      hppa*64*|ia64*)
 	hardcode_libdir_flag_spec_ld_CXX='+b $libdir'
-	hardcode_libdir_separator_CXX=:
-        ;;
-      ia64*)
-	hardcode_libdir_flag_spec_CXX='-L$libdir'
         ;;
       *)
-	hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
-	hardcode_libdir_separator_CXX=:
 	export_dynamic_flag_spec_CXX='${wl}-E'
         ;;
       esac
     fi
-    case "$host_cpu" in
-    hppa*64*)
-      hardcode_direct_CXX=no
-      hardcode_shlibpath_var_CXX=no
-      ;;
-    ia64*)
+    case $host_cpu in
+    hppa*64*|ia64*)
       hardcode_direct_CXX=no
       hardcode_shlibpath_var_CXX=no
-      hardcode_minus_L_CXX=yes # Not in the search PATH,
-					      # but as the default
-					      # location of the library.
       ;;
     *)
       hardcode_direct_CXX=yes
@@ -14952,17 +14531,20 @@
     esac
 
     case $cc_basename in
-      CC)
+      CC*)
 	# FIXME: insert proper C++ library support
 	ld_shlibs_CXX=no
 	;;
-      aCC)
-	case "$host_cpu" in
-	hppa*64*|ia64*)
-	  archive_cmds_CXX='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
+      aCC*)
+	case $host_cpu in
+	hppa*64*)
+	  archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	  ;;
+	ia64*)
+	  archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 	  ;;
 	*)
-	  archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects'
+	  archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 	  ;;
 	esac
 	# Commands to make compiler produce verbose output that lists
@@ -14978,12 +14560,15 @@
       *)
 	if test "$GXX" = yes; then
 	  if test $with_gnu_ld = no; then
-	    case "$host_cpu" in
-	    ia64*|hppa*64*)
-	      archive_cmds_CXX='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
+	    case $host_cpu in
+	    hppa*64*)
+	      archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	      ;;
+	    ia64*)
+	      archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 	      ;;
 	    *)
-	      archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects'
+	      archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 	      ;;
 	    esac
 	  fi
@@ -14994,11 +14579,25 @@
 	;;
     esac
     ;;
+  interix3*)
+    hardcode_direct_CXX=no
+    hardcode_shlibpath_var_CXX=no
+    hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
+    export_dynamic_flag_spec_CXX='${wl}-E'
+    # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+    # Instead, shared libraries are loaded at an image base (0x10000000 by
+    # default) and relocated if they conflict, which is a slow very memory
+    # consuming and fragmenting process.  To avoid this, we pick a random,
+    # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+    # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
+    archive_cmds_CXX='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+    archive_expsym_cmds_CXX='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+    ;;
   irix5* | irix6*)
     case $cc_basename in
-      CC)
+      CC*)
 	# SGI C++
-	archive_cmds_CXX='$CC -shared -all -multigot $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
+	archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
 
 	# Archives containing C++ object files must be created using
 	# "CC -ar", where "CC" is the IRIX C++ compiler.  This is
@@ -15009,9 +14608,9 @@
       *)
 	if test "$GXX" = yes; then
 	  if test "$with_gnu_ld" = no; then
-	    archive_cmds_CXX='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
+	    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 	  else
-	    archive_cmds_CXX='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
+	    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
 	  fi
 	fi
 	link_all_deplibs_CXX=yes
@@ -15020,16 +14619,16 @@
     hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
     hardcode_libdir_separator_CXX=:
     ;;
-  linux*)
+  linux* | k*bsd*-gnu)
     case $cc_basename in
-      KCC)
+      KCC*)
 	# Kuck and Associates, Inc. (KAI) C++ Compiler
 
 	# KCC will only create a shared library if the output file
 	# ends with ".so" (or ".sl" for HP-UX), so rename the library
 	# to its proper name (with version) after linking.
-	archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib; mv \$templib $lib'
-	archive_expsym_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
+	archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+	archive_expsym_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
 	# Commands to make compiler produce verbose output that lists
 	# what "hidden" libraries, object files and flags are used when
 	# linking a shared library.
@@ -15047,20 +14646,44 @@
 	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
 	old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
 	;;
-      icpc)
+      icpc*)
 	# Intel C++
 	with_gnu_ld=yes
+	# version 8.0 and above of icpc choke on multiply defined symbols
+	# if we add $predep_objects and $postdep_objects, however 7.1 and
+	# earlier do not add the objects themselves.
+	case `$CC -V 2>&1` in
+	*"Version 7."*)
+  	  archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+  	  archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	  ;;
+	*)  # Version 8.0 or newer
+	  tmp_idyn=
+	  case $host_cpu in
+	    ia64*) tmp_idyn=' -i_dynamic';;
+	  esac
+  	  archive_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	  archive_expsym_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	  ;;
+	esac
 	archive_cmds_need_lc_CXX=no
-	archive_cmds_CXX='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds_CXX='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
 	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
 	export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
 	whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
 	;;
-      cxx)
+      pgCC*)
+        # Portland Group C++ compiler
+	archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+  	archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+
+	hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
+	export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
+	whole_archive_flag_spec_CXX='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+        ;;
+      cxx*)
 	# Compaq C++
-	archive_cmds_CXX='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds_CXX='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
+	archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
 
 	runpath_var=LD_RUN_PATH
 	hardcode_libdir_flag_spec_CXX='-rpath $libdir'
@@ -15088,7 +14711,7 @@
     ;;
   mvs*)
     case $cc_basename in
-      cxx)
+      cxx*)
 	# FIXME: insert proper C++ library support
 	ld_shlibs_CXX=no
 	;;
@@ -15098,7 +14721,7 @@
 	;;
     esac
     ;;
-  netbsd*)
+  netbsd* | netbsdelf*-gnu)
     if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
       archive_cmds_CXX='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
       wlarc=
@@ -15109,15 +14732,31 @@
     # Workaround some broken pre-1.5 toolchains
     output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
     ;;
+  openbsd2*)
+    # C++ shared libraries are fairly broken
+    ld_shlibs_CXX=no
+    ;;
+  openbsd*)
+    hardcode_direct_CXX=yes
+    hardcode_shlibpath_var_CXX=no
+    archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+    hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
+    if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+      archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
+      export_dynamic_flag_spec_CXX='${wl}-E'
+      whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+    fi
+    output_verbose_link_cmd='echo'
+    ;;
   osf3*)
     case $cc_basename in
-      KCC)
+      KCC*)
 	# Kuck and Associates, Inc. (KAI) C++ Compiler
 
 	# KCC will only create a shared library if the output file
 	# ends with ".so" (or ".sl" for HP-UX), so rename the library
 	# to its proper name (with version) after linking.
-	archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib; mv \$templib $lib'
+	archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
 
 	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
 	hardcode_libdir_separator_CXX=:
@@ -15127,14 +14766,14 @@
 	old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
 
 	;;
-      RCC)
+      RCC*)
 	# Rational C++ 2.4.1
 	# FIXME: insert proper C++ library support
 	ld_shlibs_CXX=no
 	;;
-      cxx)
+      cxx*)
 	allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
-	archive_cmds_CXX='$CC -shared${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
+	archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
 
 	hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
 	hardcode_libdir_separator_CXX=:
@@ -15152,7 +14791,7 @@
       *)
 	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
 	  allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
-	  archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
+	  archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 
 	  hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
 	  hardcode_libdir_separator_CXX=:
@@ -15171,13 +14810,13 @@
     ;;
   osf4* | osf5*)
     case $cc_basename in
-      KCC)
+      KCC*)
 	# Kuck and Associates, Inc. (KAI) C++ Compiler
 
 	# KCC will only create a shared library if the output file
 	# ends with ".so" (or ".sl" for HP-UX), so rename the library
 	# to its proper name (with version) after linking.
-	archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib; mv \$templib $lib'
+	archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
 
 	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
 	hardcode_libdir_separator_CXX=:
@@ -15186,17 +14825,17 @@
 	# the KAI C++ compiler.
 	old_archive_cmds_CXX='$CC -o $oldlib $oldobjs'
 	;;
-      RCC)
+      RCC*)
 	# Rational C++ 2.4.1
 	# FIXME: insert proper C++ library support
 	ld_shlibs_CXX=no
 	;;
-      cxx)
+      cxx*)
 	allow_undefined_flag_CXX=' -expect_unresolved \*'
-	archive_cmds_CXX='$CC -shared${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
+	archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
 	archive_expsym_cmds_CXX='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
 	  echo "-hidden">> $lib.exp~
-	  $CC -shared$allow_undefined_flag $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -msym -soname $soname -Wl,-input -Wl,$lib.exp  `test -n "$verstring" && echo -set_version	$verstring` -update_registry $objdir/so_locations -o $lib~
+	  $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp  `test -n "$verstring" && echo -set_version	$verstring` -update_registry ${output_objdir}/so_locations -o $lib~
 	  $rm $lib.exp'
 
 	hardcode_libdir_flag_spec_CXX='-rpath $libdir'
@@ -15215,7 +14854,7 @@
       *)
 	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
 	  allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
-	 archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
+	 archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 
 	  hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
 	  hardcode_libdir_separator_CXX=:
@@ -15236,27 +14875,14 @@
     # FIXME: insert proper C++ library support
     ld_shlibs_CXX=no
     ;;
-  sco*)
-    archive_cmds_need_lc_CXX=no
-    case $cc_basename in
-      CC)
-	# FIXME: insert proper C++ library support
-	ld_shlibs_CXX=no
-	;;
-      *)
-	# FIXME: insert proper C++ library support
-	ld_shlibs_CXX=no
-	;;
-    esac
-    ;;
   sunos4*)
     case $cc_basename in
-      CC)
+      CC*)
 	# Sun C++ 4.x
 	# FIXME: insert proper C++ library support
 	ld_shlibs_CXX=no
 	;;
-      lcc)
+      lcc*)
 	# Lucid
 	# FIXME: insert proper C++ library support
 	ld_shlibs_CXX=no
@@ -15269,36 +14895,33 @@
     ;;
   solaris*)
     case $cc_basename in
-      CC)
+      CC*)
 	# Sun C++ 4.2, 5.x and Centerline C++
+        archive_cmds_need_lc_CXX=yes
 	no_undefined_flag_CXX=' -zdefs'
-	archive_cmds_CXX='$CC -G${allow_undefined_flag} -nolib -h$soname -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects'
+	archive_cmds_CXX='$CC -G${allow_undefined_flag}  -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 	archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-	$CC -G${allow_undefined_flag} -nolib ${wl}-M ${wl}$lib.exp -h$soname -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~$rm $lib.exp'
+	$CC -G${allow_undefined_flag}  ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
 
 	hardcode_libdir_flag_spec_CXX='-R$libdir'
 	hardcode_shlibpath_var_CXX=no
 	case $host_os in
-	  solaris2.0-5 | solaris2.0-5.*) ;;
+	  solaris2.[0-5] | solaris2.[0-5].*) ;;
 	  *)
 	    # The C++ compiler is used as linker so we must use $wl
 	    # flag to pass the commands to the underlying system
-	    # linker.
+	    # linker. We must also pass each convience library through
+	    # to the system linker between allextract/defaultextract.
+	    # The C++ compiler will combine linker options so we
+	    # cannot just pass the convience library names through
+	    # without $wl.
 	    # Supported since Solaris 2.6 (maybe 2.5.1?)
-	    whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+	    whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract'
 	    ;;
 	esac
 	link_all_deplibs_CXX=yes
 
-	# Commands to make compiler produce verbose output that lists
-	# what "hidden" libraries, object files and flags are used when
-	# linking a shared library.
-	#
-	# There doesn't appear to be a way to prevent this compiler from
-	# explicitly linking system object files so we need to strip them
-	# from the output so that they don't get included in the library
-	# dependencies.
-	output_verbose_link_cmd='templist=`$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep "\-[LR]"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+	output_verbose_link_cmd='echo'
 
 	# Archives containing C++ object files must be created using
 	# "CC -xar", where "CC" is the Sun C++ compiler.  This is
@@ -15306,9 +14929,9 @@
 	# in the archive.
 	old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
 	;;
-      gcx)
+      gcx*)
 	# Green Hills C++ Compiler
-	archive_cmds_CXX='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-h $wl$soname -o $lib'
+	archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
 
 	# The C++ compiler must be used to create the archive.
 	old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
@@ -15318,9 +14941,9 @@
 	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
 	  no_undefined_flag_CXX=' ${wl}-z ${wl}defs'
 	  if $CC --version | grep -v '^2\.7' > /dev/null; then
-	    archive_cmds_CXX='$CC -shared -nostdlib $LDFLAGS $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-h $wl$soname -o $lib'
+	    archive_cmds_CXX='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
 	    archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-		$CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~$rm $lib.exp'
+		$CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
 
 	    # Commands to make compiler produce verbose output that lists
 	    # what "hidden" libraries, object files and flags are used when
@@ -15329,9 +14952,9 @@
 	  else
 	    # g++ 2.7 appears to require `-G' NOT `-shared' on this
 	    # platform.
-	    archive_cmds_CXX='$CC -G -nostdlib $LDFLAGS $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-h $wl$soname -o $lib'
+	    archive_cmds_CXX='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
 	    archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-		$CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~$rm $lib.exp'
+		$CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
 
 	    # Commands to make compiler produce verbose output that lists
 	    # what "hidden" libraries, object files and flags are used when
@@ -15344,12 +14967,63 @@
 	;;
     esac
     ;;
-  sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*)
+  sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
+    no_undefined_flag_CXX='${wl}-z,text'
+    archive_cmds_need_lc_CXX=no
+    hardcode_shlibpath_var_CXX=no
+    runpath_var='LD_RUN_PATH'
+
+    case $cc_basename in
+      CC*)
+	archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	;;
+      *)
+	archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	;;
+    esac
+    ;;
+  sysv5* | sco3.2v5* | sco5v6*)
+    # Note: We can NOT use -z defs as we might desire, because we do not
+    # link with -lc, and that would cause any symbols used from libc to
+    # always be unresolved, which means just about no library would
+    # ever link correctly.  If we're not using GNU ld we use -z text
+    # though, which does catch some bad symbols but isn't as heavy-handed
+    # as -z defs.
+    # For security reasons, it is highly recommended that you always
+    # use absolute paths for naming shared libraries, and exclude the
+    # DT_RUNPATH tag from executables and libraries.  But doing so
+    # requires that you compile everything twice, which is a pain.
+    # So that behaviour is only enabled if SCOABSPATH is set to a
+    # non-empty value in the environment.  Most likely only useful for
+    # creating official distributions of packages.
+    # This is a hack until libtool officially supports absolute path
+    # names for shared libraries.
+    no_undefined_flag_CXX='${wl}-z,text'
+    allow_undefined_flag_CXX='${wl}-z,nodefs'
     archive_cmds_need_lc_CXX=no
+    hardcode_shlibpath_var_CXX=no
+    hardcode_libdir_flag_spec_CXX='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
+    hardcode_libdir_separator_CXX=':'
+    link_all_deplibs_CXX=yes
+    export_dynamic_flag_spec_CXX='${wl}-Bexport'
+    runpath_var='LD_RUN_PATH'
+
+    case $cc_basename in
+      CC*)
+	archive_cmds_CXX='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	;;
+      *)
+	archive_cmds_CXX='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	;;
+    esac
     ;;
   tandem*)
     case $cc_basename in
-      NCC)
+      NCC*)
 	# NonStop-UX NCC 3.20
 	# FIXME: insert proper C++ library support
 	ld_shlibs_CXX=no
@@ -15406,7 +15080,7 @@
   # The `*' in the case matches for architectures that use `case' in
   # $output_verbose_cmd can trigger glob expansion during the loop
   # eval without this substitution.
-  output_verbose_link_cmd="`$echo \"X$output_verbose_link_cmd\" | $Xsed -e \"$no_glob_subst\"`"
+  output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"`
 
   for p in `eval $output_verbose_link_cmd`; do
     case $p in
@@ -15446,7 +15120,7 @@
        fi
        ;;
 
-    *.$objext|*.$libext)
+    *.$objext)
        # This assumes that the test object file only shows up
        # once in the compiler output.
        if test "$p" = "conftest.$objext"; then
@@ -15482,6 +15156,29 @@
 
 $rm -f confest.$objext
 
+# PORTME: override above test on systems where it is broken
+case $host_os in
+interix3*)
+  # Interix 3.5 installs completely hosed .la files for C++, so rather than
+  # hack all around it, let's just trust "g++" to DTRT.
+  predep_objects_CXX=
+  postdep_objects_CXX=
+  postdeps_CXX=
+  ;;
+
+solaris*)
+  case $cc_basename in
+  CC*)
+    # Adding this requires a known-good setup of shared libraries for
+    # Sun compiler versions before 5.6, else PIC objects from an old
+    # archive will be linked into the output, leading to subtle bugs.
+    postdeps_CXX='-lCstd -lCrun'
+    ;;
+  esac
+  ;;
+esac
+
+
 case " $postdeps_CXX " in
 *" -lc "*) archive_cmds_need_lc_CXX=no ;;
 esac
@@ -15529,6 +15226,10 @@
       # DJGPP does not support shared libraries at all
       lt_prog_compiler_pic_CXX=
       ;;
+    interix3*)
+      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+      # Instead, we relocate shared libraries at runtime.
+      ;;
     sysv4*MP*)
       if test -d /usr/nec; then
 	lt_prog_compiler_pic_CXX=-Kconform_pic
@@ -15537,7 +15238,7 @@
     hpux*)
       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
       # not for PA HP-UX.
-      case "$host_cpu" in
+      case $host_cpu in
       hppa*64*|ia64*)
 	;;
       *)
@@ -15562,18 +15263,28 @@
 	;;
       chorus*)
 	case $cc_basename in
-	cxch68)
+	cxch68*)
 	  # Green Hills C++ Compiler
 	  # _LT_AC_TAGVAR(lt_prog_compiler_static, CXX)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
 	  ;;
 	esac
 	;;
+       darwin*)
+         # PIC is the default on this platform
+         # Common symbols not allowed in MH_DYLIB files
+         case $cc_basename in
+           xlc*)
+           lt_prog_compiler_pic_CXX='-qnocommon'
+           lt_prog_compiler_wl_CXX='-Wl,'
+           ;;
+         esac
+       ;;
       dgux*)
 	case $cc_basename in
-	  ec++)
+	  ec++*)
 	    lt_prog_compiler_pic_CXX='-KPIC'
 	    ;;
-	  ghcx)
+	  ghcx*)
 	    # Green Hills C++ Compiler
 	    lt_prog_compiler_pic_CXX='-pic'
 	    ;;
@@ -15581,22 +15292,22 @@
 	    ;;
 	esac
 	;;
-      freebsd* | kfreebsd*-gnu)
+      freebsd* | dragonfly*)
 	# FreeBSD uses GNU C++
 	;;
       hpux9* | hpux10* | hpux11*)
 	case $cc_basename in
-	  CC)
+	  CC*)
 	    lt_prog_compiler_wl_CXX='-Wl,'
-	    lt_prog_compiler_static_CXX="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
+	    lt_prog_compiler_static_CXX='${wl}-a ${wl}archive'
 	    if test "$host_cpu" != ia64; then
 	      lt_prog_compiler_pic_CXX='+Z'
 	    fi
 	    ;;
-	  aCC)
+	  aCC*)
 	    lt_prog_compiler_wl_CXX='-Wl,'
-	    lt_prog_compiler_static_CXX="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
-	    case "$host_cpu" in
+	    lt_prog_compiler_static_CXX='${wl}-a ${wl}archive'
+	    case $host_cpu in
 	    hppa*64*|ia64*)
 	      # +Z the default
 	      ;;
@@ -15609,9 +15320,13 @@
 	    ;;
 	esac
 	;;
+      interix*)
+	# This is c89, which is MS Visual C++ (no shared libs)
+	# Anyone wants to do a port?
+	;;
       irix5* | irix6* | nonstopux*)
 	case $cc_basename in
-	  CC)
+	  CC*)
 	    lt_prog_compiler_wl_CXX='-Wl,'
 	    lt_prog_compiler_static_CXX='-non_shared'
 	    # CC pic flag -KPIC is the default.
@@ -15620,20 +15335,26 @@
 	    ;;
 	esac
 	;;
-      linux*)
+      linux* | k*bsd*-gnu)
 	case $cc_basename in
-	  KCC)
+	  KCC*)
 	    # KAI C++ Compiler
 	    lt_prog_compiler_wl_CXX='--backend -Wl,'
 	    lt_prog_compiler_pic_CXX='-fPIC'
 	    ;;
-	  icpc)
+	  icpc* | ecpc*)
 	    # Intel C++
 	    lt_prog_compiler_wl_CXX='-Wl,'
 	    lt_prog_compiler_pic_CXX='-KPIC'
 	    lt_prog_compiler_static_CXX='-static'
 	    ;;
-	  cxx)
+	  pgCC*)
+	    # Portland Group C++ compiler.
+	    lt_prog_compiler_wl_CXX='-Wl,'
+	    lt_prog_compiler_pic_CXX='-fpic'
+	    lt_prog_compiler_static_CXX='-Bstatic'
+	    ;;
+	  cxx*)
 	    # Compaq C++
 	    # Make sure the PIC flag is empty.  It appears that all Alpha
 	    # Linux and Compaq Tru64 Unix objects are PIC.
@@ -15650,25 +15371,25 @@
 	;;
       mvs*)
 	case $cc_basename in
-	  cxx)
+	  cxx*)
 	    lt_prog_compiler_pic_CXX='-W c,exportall'
 	    ;;
 	  *)
 	    ;;
 	esac
 	;;
-      netbsd*)
+      netbsd* | netbsdelf*-gnu)
 	;;
       osf3* | osf4* | osf5*)
 	case $cc_basename in
-	  KCC)
+	  KCC*)
 	    lt_prog_compiler_wl_CXX='--backend -Wl,'
 	    ;;
-	  RCC)
+	  RCC*)
 	    # Rational C++ 2.4.1
 	    lt_prog_compiler_pic_CXX='-pic'
 	    ;;
-	  cxx)
+	  cxx*)
 	    # Digital/Compaq C++
 	    lt_prog_compiler_wl_CXX='-Wl,'
 	    # Make sure the PIC flag is empty.  It appears that all Alpha
@@ -15682,24 +15403,15 @@
 	;;
       psos*)
 	;;
-      sco*)
-	case $cc_basename in
-	  CC)
-	    lt_prog_compiler_pic_CXX='-fPIC'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
       solaris*)
 	case $cc_basename in
-	  CC)
+	  CC*)
 	    # Sun C++ 4.2, 5.x and Centerline C++
 	    lt_prog_compiler_pic_CXX='-KPIC'
 	    lt_prog_compiler_static_CXX='-Bstatic'
 	    lt_prog_compiler_wl_CXX='-Qoption ld '
 	    ;;
-	  gcx)
+	  gcx*)
 	    # Green Hills C++ Compiler
 	    lt_prog_compiler_pic_CXX='-PIC'
 	    ;;
@@ -15709,12 +15421,12 @@
 	;;
       sunos4*)
 	case $cc_basename in
-	  CC)
+	  CC*)
 	    # Sun C++ 4.x
 	    lt_prog_compiler_pic_CXX='-pic'
 	    lt_prog_compiler_static_CXX='-Bstatic'
 	    ;;
-	  lcc)
+	  lcc*)
 	    # Lucid
 	    lt_prog_compiler_pic_CXX='-pic'
 	    ;;
@@ -15724,7 +15436,7 @@
 	;;
       tandem*)
 	case $cc_basename in
-	  NCC)
+	  NCC*)
 	    # NonStop-UX NCC 3.20
 	    lt_prog_compiler_pic_CXX='-KPIC'
 	    ;;
@@ -15732,7 +15444,14 @@
 	    ;;
 	esac
 	;;
-      unixware*)
+      sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+	case $cc_basename in
+	  CC*)
+	    lt_prog_compiler_wl_CXX='-Wl,'
+	    lt_prog_compiler_pic_CXX='-KPIC'
+	    lt_prog_compiler_static_CXX='-Bstatic'
+	    ;;
+	esac
 	;;
       vxworks*)
 	;;
@@ -15765,18 +15484,20 @@
    # with a dollar sign (not a hyphen), so the echo should work correctly.
    # The option is referenced via a variable to avoid confusing sed.
    lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15771: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15490: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:15775: \$? = $ac_status" >&5
+   echo "$as_me:15494: \$? = $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
-     if test ! -s conftest.err; then
+     # So say no if there are warnings other than the usual output.
+     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
        lt_prog_compiler_pic_works_CXX=yes
      fi
    fi
@@ -15797,7 +15518,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=
@@ -15807,6 +15528,48 @@
     ;;
 esac
 
+#
+# 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; }
+if test "${lt_prog_compiler_static_works_CXX+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  lt_prog_compiler_static_works_CXX=no
+   save_LDFLAGS="$LDFLAGS"
+   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
+   printf "$lt_simple_link_test_code" > conftest.$ac_ext
+   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+     # The linker can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     if test -s conftest.err; then
+       # Append any errors to the config.log.
+       cat conftest.err 1>&5
+       $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
+       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+       if diff conftest.exp conftest.er2 >/dev/null; then
+         lt_prog_compiler_static_works_CXX=yes
+       fi
+     else
+       lt_prog_compiler_static_works_CXX=yes
+     fi
+   fi
+   $rm conftest*
+   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; }
+
+if test x"$lt_prog_compiler_static_works_CXX" = xyes; then
+    :
+else
+    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
@@ -15819,38 +15582,36 @@
    mkdir out
    printf "$lt_simple_compile_test_code" > conftest.$ac_ext
 
-   # According to Tom Tromey, Ian Lance Taylor reported there are C compilers
-   # that will create temporary files in the current directory regardless of
-   # the output directory.  Thus, making CWD read-only will cause this test
-   # to fail, enabling locking or at least warning the user not to do parallel
-   # builds.
-   chmod -w .
-
    lt_compiler_flag="-o out/conftest2.$ac_objext"
    # Insert the option either (1) after the last *FLAGS variable, or
    # (2) before a word containing "conftest.", or (3) at the end.
    # Note that $ac_compile itself does not contain backslashes and begins
    # with a dollar sign (not a hyphen), so the echo should work correctly.
    lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15838: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15594: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:15842: \$? = $ac_status" >&5
+   echo "$as_me:15598: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
-     if test ! -s out/conftest.err; then
+     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
+     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
        lt_cv_prog_compiler_c_o_CXX=yes
      fi
    fi
-   chmod u+w .
-   $rm conftest* out/*
-   rmdir out
+   chmod u+w . 2>&5
+   $rm conftest*
+   # SGI C++ compiler will create directory out/ii_files/ for
+   # template instantiation
+   test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
+   $rm out/* && rmdir out
    cd ..
    rmdir conftest
    $rm conftest*
@@ -15900,7 +15661,10 @@
     export_symbols_cmds_CXX="$ltdll_cmds"
   ;;
   cygwin* | mingw*)
-    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
+    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([^ ]*\) [^ ]*/\1 DATA/;/^I /d;/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
+  ;;
+  linux* | k*bsd*-gnu)
+    link_all_deplibs_CXX=no
   ;;
   *)
     export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
@@ -15911,11 +15675,6 @@
 echo "${ECHO_T}$ld_shlibs_CXX" >&6; }
 test "$ld_shlibs_CXX" = no && can_build_shared=no
 
-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test "$GCC" = yes; then
-  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-fi
-
 #
 # Do we need to explicitly link libc?
 #
@@ -15948,6 +15707,7 @@
         libobjs=conftest.$ac_objext
         deplibs=
         wl=$lt_prog_compiler_wl_CXX
+	pic_flag=$lt_prog_compiler_pic_CXX
         compiler_flags=-v
         linker_flags=-v
         verstring=
@@ -15983,7 +15743,7 @@
 library_names_spec=
 libname_spec='lib$name'
 soname_spec=
-shrext=".so"
+shrext_cmds=".so"
 postinstall_cmds=
 postuninstall_cmds=
 finish_cmds=
@@ -15993,10 +15753,23 @@
 version_type=none
 dynamic_linker="$host_os ld.so"
 sys_lib_dlsearch_path_spec="/lib /usr/lib"
-sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-need_lib_prefix=unknown
-hardcode_into_libs=no
-
+if test "$GCC" = yes; then
+  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
+    # if the path contains ";" then we assume it to be the separator
+    # otherwise default to the standard path separator (i.e. ":") - it is
+    # assumed that no part of a normal pathname contains ";" but that should
+    # okay in the real world where ";" in dirpaths is itself problematic.
+    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+  else
+    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
+  fi
+else
+  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+fi
+need_lib_prefix=unknown
+hardcode_into_libs=no
+
 # when you set need_version to no, make sure it does not cause -set_version
 # flags to be left without arguments
 need_version=unknown
@@ -16058,7 +15831,7 @@
 amigaos*)
   library_names_spec='$libname.ixlibrary $libname.a'
   # Create ${libname}_ixlibrary.a entries in /sys/libs.
-  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done'
+  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
   ;;
 
 beos*)
@@ -16067,7 +15840,7 @@
   shlibpath_var=LIBRARY_PATH
   ;;
 
-bsdi4*)
+bsdi[45]*)
   version_type=linux
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -16083,7 +15856,7 @@
 
 cygwin* | mingw* | pw32*)
   version_type=windows
-  shrext=".dll"
+  shrext_cmds=".dll"
   need_version=no
   need_lib_prefix=no
 
@@ -16095,7 +15868,8 @@
       dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
       dldir=$destdir/`dirname \$dlpath`~
       test -d \$dldir || mkdir -p \$dldir~
-      $install_prog $dir/$dlname \$dldir/$dlname'
+      $install_prog $dir/$dlname \$dldir/$dlname~
+      chmod a+x \$dldir/$dlname'
     postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
       dlpath=$dir/\$dldll~
        $rm \$dlpath'
@@ -16125,7 +15899,7 @@
       ;;
     pw32*)
       # pw32 DLLs use 'pw' prefix rather than 'lib'
-      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}'
+      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
       ;;
     esac
     ;;
@@ -16148,7 +15922,7 @@
   soname_spec='${libname}${release}${major}$shared_ext'
   shlibpath_overrides_runpath=yes
   shlibpath_var=DYLD_LIBRARY_PATH
-  shrext='$(test .$module = .yes && echo .so || echo .dylib)'
+  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
   # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
   if test "$GCC" = yes; then
     sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
@@ -16171,20 +15945,17 @@
   dynamic_linker=no
   ;;
 
-kfreebsd*-gnu*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='GNU ld.so'
-  ;;
-
-freebsd*)
-  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
+freebsd* | dragonfly*)
+  # DragonFly does not have aout.  When/if they implement a new
+  # versioning mechanism, adjust this.
+  if test -x /usr/bin/objformat; then
+    objformat=`/usr/bin/objformat`
+  else
+    case $host_os in
+    freebsd[123]*) objformat=aout ;;
+    *) objformat=elf ;;
+    esac
+  fi
   version_type=freebsd-$objformat
   case $version_type in
     freebsd-elf*)
@@ -16202,14 +15973,19 @@
   freebsd2*)
     shlibpath_overrides_runpath=yes
     ;;
-  freebsd3.01* | freebsdelf3.01*)
+  freebsd3.[01]* | freebsdelf3.[01]*)
     shlibpath_overrides_runpath=yes
     hardcode_into_libs=yes
     ;;
-  *) # from 3.2 on
+  freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
+  freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
     shlibpath_overrides_runpath=no
     hardcode_into_libs=yes
     ;;
+  freebsd*) # from 4.6 on
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
   esac
   ;;
 
@@ -16229,9 +16005,9 @@
   version_type=sunos
   need_lib_prefix=no
   need_version=no
-  case "$host_cpu" in
+  case $host_cpu in
   ia64*)
-    shrext='.so'
+    shrext_cmds='.so'
     hardcode_into_libs=yes
     dynamic_linker="$host_os dld.so"
     shlibpath_var=LD_LIBRARY_PATH
@@ -16246,7 +16022,7 @@
     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
     ;;
    hppa*64*)
-     shrext='.sl'
+     shrext_cmds='.sl'
      hardcode_into_libs=yes
      dynamic_linker="$host_os dld.sl"
      shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
@@ -16257,7 +16033,7 @@
      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
      ;;
    *)
-    shrext='.sl'
+    shrext_cmds='.sl'
     dynamic_linker="$host_os dld.sl"
     shlibpath_var=SHLIB_PATH
     shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
@@ -16269,6 +16045,18 @@
   postinstall_cmds='chmod 555 $lib'
   ;;
 
+interix3*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
 irix5* | irix6* | nonstopux*)
   case $host_os in
     nonstopux*) version_type=nonstopux ;;
@@ -16312,29 +16100,26 @@
   ;;
 
 # This must be Linux ELF.
-linux*)
+linux* | k*bsd*-gnu)
   version_type=linux
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
   finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-  libsuff=
-  if test "x$LINUX_64_MODE" = x64; then
-    # Some platforms are per default 64-bit, so there's no /lib64
-    if test -d /lib64 -a ! -h /lib64; then
-      libsuff=64
-    fi
-  fi
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=no
-  sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}"
-  sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
   # This implies no fast_install, which is unacceptable.
   # Some rework will be needed to allow for fast_install
   # before this can be enabled.
   hardcode_into_libs=yes
 
+  # Append ld.so.conf contents to the search path
+  if test -f /etc/ld.so.conf; then
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+  fi
+
   # We used to test for /lib/ld.so.1 and disable shared libraries on
   # powerpc, because MkLinux only supported shared libraries with the
   # GNU dynamic linker.  Since this was broken with cross compilers,
@@ -16344,6 +16129,18 @@
   dynamic_linker='GNU/Linux ld.so'
   ;;
 
+netbsdelf*-gnu)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='NetBSD ld.elf_so'
+  ;;
+
 netbsd*)
   version_type=sunos
   need_lib_prefix=no
@@ -16353,7 +16150,7 @@
     finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
     dynamic_linker='NetBSD (a.out) ld.so'
   else
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} ${libname}${shared_ext}'
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
     soname_spec='${libname}${release}${shared_ext}$major'
     dynamic_linker='NetBSD ld.elf_so'
   fi
@@ -16381,8 +16178,13 @@
 
 openbsd*)
   version_type=sunos
+  sys_lib_dlsearch_path_spec="/usr/lib"
   need_lib_prefix=no
-  need_version=no
+  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
+  case $host_os in
+    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
+    *)                         need_version=no  ;;
+  esac
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
   finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
   shlibpath_var=LD_LIBRARY_PATH
@@ -16402,7 +16204,7 @@
 
 os2*)
   libname_spec='$name'
-  shrext=".dll"
+  shrext_cmds=".dll"
   need_lib_prefix=no
   library_names_spec='$libname${shared_ext} $libname.a'
   dynamic_linker='OS/2 ld.exe'
@@ -16420,13 +16222,6 @@
   sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
   ;;
 
-sco3.2v5*)
-  version_type=osf
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
 solaris*)
   version_type=linux
   need_lib_prefix=no
@@ -16452,7 +16247,7 @@
   need_version=yes
   ;;
 
-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+sysv4 | sysv4.3*)
   version_type=linux
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
@@ -16485,6 +16280,29 @@
   fi
   ;;
 
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+  version_type=freebsd-elf
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  hardcode_into_libs=yes
+  if test "$with_gnu_ld" = yes; then
+    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
+    shlibpath_overrides_runpath=no
+  else
+    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
+    shlibpath_overrides_runpath=yes
+    case $host_os in
+      sco3.2v5*)
+        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
+	;;
+    esac
+  fi
+  sys_lib_dlsearch_path_spec='/usr/lib'
+  ;;
+
 uts4*)
   version_type=linux
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -16500,12 +16318,17 @@
 echo "${ECHO_T}$dynamic_linker" >&6; }
 test "$dynamic_linker" = no && can_build_shared=no
 
+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+if test "$GCC" = yes; then
+  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+fi
+
 { 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" || \
-   test "X$hardcode_automatic_CXX"="Xyes" ; then
+   test -n "$runpath_var_CXX" || \
+   test "X$hardcode_automatic_CXX" = "Xyes" ; then
 
   # We can hardcode non-existant directories.
   if test "$hardcode_direct_CXX" != no &&
@@ -16537,1213 +16360,309 @@
   enable_fast_install=needless
 fi
 
-striplib=
-old_striplib=
-{ echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
-echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6; }
-if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
-  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
-  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-else
-# FIXME - insert some real tests, host_os isn't really good enough
-  case $host_os in
-   darwin*)
-       if test -n "$STRIP" ; then
-         striplib="$STRIP -x"
-         { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-       else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-       ;;
-   *)
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-    ;;
-  esac
-fi
 
-if test "x$enable_dlopen" != xyes; then
-  enable_dlopen=unknown
-  enable_dlopen_self=unknown
-  enable_dlopen_self_static=unknown
-else
-  lt_cv_dlopen=no
-  lt_cv_dlopen_libs=
+# The else clause should only fire when bootstrapping the
+# libtool distribution, otherwise you forgot to ship ltmain.sh
+# with your package, and you will get complaints that there are
+# no rules to generate ltmain.sh.
+if test -f "$ltmain"; then
+  # See if we are running on zsh, and set the options which allow our commands through
+  # without removal of \ escapes.
+  if test -n "${ZSH_VERSION+set}" ; then
+    setopt NO_GLOB_SUBST
+  fi
+  # Now quote all the things that may contain metacharacters while being
+  # careful not to overquote the AC_SUBSTed values.  We take copies of the
+  # variables and quote the copies for generation of the libtool script.
+  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
+    SED SHELL STRIP \
+    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
+    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
+    deplibs_check_method reload_flag reload_cmds need_locks \
+    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
+    lt_cv_sys_global_symbol_to_c_name_address \
+    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
+    old_postinstall_cmds old_postuninstall_cmds \
+    compiler_CXX \
+    CC_CXX \
+    LD_CXX \
+    lt_prog_compiler_wl_CXX \
+    lt_prog_compiler_pic_CXX \
+    lt_prog_compiler_static_CXX \
+    lt_prog_compiler_no_builtin_flag_CXX \
+    export_dynamic_flag_spec_CXX \
+    thread_safe_flag_spec_CXX \
+    whole_archive_flag_spec_CXX \
+    enable_shared_with_static_runtimes_CXX \
+    old_archive_cmds_CXX \
+    old_archive_from_new_cmds_CXX \
+    predep_objects_CXX \
+    postdep_objects_CXX \
+    predeps_CXX \
+    postdeps_CXX \
+    compiler_lib_search_path_CXX \
+    archive_cmds_CXX \
+    archive_expsym_cmds_CXX \
+    postinstall_cmds_CXX \
+    postuninstall_cmds_CXX \
+    old_archive_from_expsyms_cmds_CXX \
+    allow_undefined_flag_CXX \
+    no_undefined_flag_CXX \
+    export_symbols_cmds_CXX \
+    hardcode_libdir_flag_spec_CXX \
+    hardcode_libdir_flag_spec_ld_CXX \
+    hardcode_libdir_separator_CXX \
+    hardcode_automatic_CXX \
+    module_cmds_CXX \
+    module_expsym_cmds_CXX \
+    lt_cv_prog_compiler_c_o_CXX \
+    exclude_expsyms_CXX \
+    include_expsyms_CXX; do
 
-  case $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 | \
+    archive_cmds_CXX | \
+    archive_expsym_cmds_CXX | \
+    module_cmds_CXX | \
+    module_expsym_cmds_CXX | \
+    old_archive_from_expsyms_cmds_CXX | \
+    export_symbols_cmds_CXX | \
+    extract_expsyms_cmds | reload_cmds | finish_cmds | \
+    postinstall_cmds | postuninstall_cmds | \
+    old_postinstall_cmds | old_postuninstall_cmds | \
+    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
+      # Double-quote double-evaled strings.
+      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
+      ;;
+    *)
+      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
+      ;;
+    esac
+  done
+
+  case $lt_echo in
+  *'\$0 --fallback-echo"')
+    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
     ;;
+  esac
 
-  mingw* | pw32*)
-    lt_cv_dlopen="LoadLibrary"
-    lt_cv_dlopen_libs=
-   ;;
+cfgfile="$ofile"
 
-  cygwin*)
-    lt_cv_dlopen="dlopen"
-    lt_cv_dlopen_libs=
-   ;;
+  cat <<__EOF__ >> "$cfgfile"
+# ### BEGIN LIBTOOL TAG CONFIG: $tagname
 
-  darwin*)
-  # if libdl is installed we need to link against it
-    { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldl  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
 
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dlopen ();
-int
-main ()
-{
-return dlopen ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_dl_dlopen=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+# Shell to use when invoking shell scripts.
+SHELL=$lt_SHELL
 
-	ac_cv_lib_dl_dlopen=no
-fi
+# Whether or not to build shared libraries.
+build_libtool_libs=$enable_shared
 
-rm -f core conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
-if test $ac_cv_lib_dl_dlopen = yes; then
-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
-else
+# Whether or not to build static libraries.
+build_old_libs=$enable_static
 
-    lt_cv_dlopen="dyld"
-    lt_cv_dlopen_libs=
-    lt_cv_dlopen_self=yes
+# Whether or not to add -lc for building shared libraries.
+build_libtool_need_lc=$archive_cmds_need_lc_CXX
 
-fi
+# Whether or not to disallow shared libs when runtime libs are static
+allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX
 
-   ;;
+# Whether or not to optimize for fast installation.
+fast_install=$enable_fast_install
 
-  *)
-    { echo "$as_me:$LINENO: checking for shl_load" >&5
-echo $ECHO_N "checking for shl_load... $ECHO_C" >&6; }
-if test "${ac_cv_func_shl_load+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define shl_load innocuous_shl_load
+# The host system.
+host_alias=$host_alias
+host=$host
+host_os=$host_os
 
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char shl_load (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
+# The build system.
+build_alias=$build_alias
+build=$build
+build_os=$build_os
 
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
+# An echo program that does not interpret backslashes.
+echo=$lt_echo
 
-#undef shl_load
+# The archiver.
+AR=$lt_AR
+AR_FLAGS=$lt_AR_FLAGS
 
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char shl_load ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_shl_load || defined __stub___shl_load
-choke me
-#endif
+# A C compiler.
+LTCC=$lt_LTCC
 
-int
-main ()
-{
-return shl_load ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_func_shl_load=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+# LTCC compiler flags.
+LTCFLAGS=$lt_LTCFLAGS
 
-	ac_cv_func_shl_load=no
-fi
+# A language-specific compiler.
+CC=$lt_compiler_CXX
 
-rm -f core conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
-echo "${ECHO_T}$ac_cv_func_shl_load" >&6; }
-if test $ac_cv_func_shl_load = yes; then
-  lt_cv_dlopen="shl_load"
-else
-  { echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
-echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6; }
-if test "${ac_cv_lib_dld_shl_load+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldld  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+# Is the compiler the GNU C compiler?
+with_gcc=$GCC_CXX
 
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char shl_load ();
-int
-main ()
-{
-return shl_load ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_dld_shl_load=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+# An ERE matcher.
+EGREP=$lt_EGREP
 
-	ac_cv_lib_dld_shl_load=no
-fi
+# The linker used to build libraries.
+LD=$lt_LD_CXX
 
-rm -f core conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
-echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; }
-if test $ac_cv_lib_dld_shl_load = yes; then
-  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"
-else
-  { echo "$as_me:$LINENO: checking for dlopen" >&5
-echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; }
-if test "${ac_cv_func_dlopen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define dlopen innocuous_dlopen
+# Whether we need hard or soft links.
+LN_S=$lt_LN_S
 
-/* 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.  */
+# A BSD-compatible nm program.
+NM=$lt_NM
 
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
+# A symbol stripping program
+STRIP=$lt_STRIP
 
-#undef dlopen
+# Used to examine libraries when file_magic_cmd begins "file"
+MAGIC_CMD=$MAGIC_CMD
 
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dlopen ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_dlopen || defined __stub___dlopen
-choke me
-#endif
+# Used on cygwin: DLL creation program.
+DLLTOOL="$DLLTOOL"
 
-int
-main ()
-{
-return dlopen ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_func_dlopen=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+# Used on cygwin: object dumper.
+OBJDUMP="$OBJDUMP"
 
-	ac_cv_func_dlopen=no
-fi
+# Used on cygwin: assembler.
+AS="$AS"
 
-rm -f core conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
-echo "${ECHO_T}$ac_cv_func_dlopen" >&6; }
-if test $ac_cv_func_dlopen = yes; then
-  lt_cv_dlopen="dlopen"
-else
-  { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldl  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+# The name of the directory that contains temporary libtool files.
+objdir=$objdir
 
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dlopen ();
-int
-main ()
-{
-return dlopen ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_dl_dlopen=yes
-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
 
-	ac_cv_lib_dl_dlopen=no
-fi
+# How to pass a linker flag through the compiler.
+wl=$lt_lt_prog_compiler_wl_CXX
 
-rm -f core conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
-if test $ac_cv_lib_dl_dlopen = yes; then
-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
-else
-  { echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
-echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6; }
-if test "${ac_cv_lib_svld_dlopen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lsvld  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+# Object file suffix (normally "o").
+objext="$ac_objext"
 
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dlopen ();
-int
-main ()
-{
-return dlopen ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_svld_dlopen=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+# Old archive suffix (normally "a").
+libext="$libext"
 
-	ac_cv_lib_svld_dlopen=no
-fi
+# Shared library suffix (normally ".so").
+shrext_cmds='$shrext_cmds'
 
-rm -f core conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6; }
-if test $ac_cv_lib_svld_dlopen = yes; then
-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
-else
-  { echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
-echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6; }
-if test "${ac_cv_lib_dld_dld_link+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldld  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+# Executable file suffix (normally "").
+exeext="$exeext"
 
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dld_link ();
-int
-main ()
-{
-return dld_link ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_dld_dld_link=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+# Additional compiler flags for building library objects.
+pic_flag=$lt_lt_prog_compiler_pic_CXX
+pic_mode=$pic_mode
 
-	ac_cv_lib_dld_dld_link=no
-fi
+# What is the maximum length of a command?
+max_cmd_len=$lt_cv_sys_max_cmd_len
 
-rm -f core conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
-echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; }
-if test $ac_cv_lib_dld_dld_link = yes; then
-  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
-fi
+# Does compiler simultaneously support -c and -o options?
+compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
 
+# Must we lock files when doing compilation?
+need_locks=$lt_need_locks
 
-fi
+# Do we need the lib prefix for modules?
+need_lib_prefix=$need_lib_prefix
 
+# Do we need a version for libraries?
+need_version=$need_version
 
-fi
+# Whether dlopen is supported.
+dlopen_support=$enable_dlopen
 
+# Whether dlopen of programs is supported.
+dlopen_self=$enable_dlopen_self
 
-fi
+# Whether dlopen of statically linked programs is supported.
+dlopen_self_static=$enable_dlopen_self_static
 
+# Compiler flag to prevent dynamic linking.
+link_static_flag=$lt_lt_prog_compiler_static_CXX
 
-fi
+# Compiler flag to turn off builtin functions.
+no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX
 
+# Compiler flag to allow reflexive dlopens.
+export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX
 
-fi
+# Compiler flag to generate shared objects directly from archives.
+whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX
 
-    ;;
-  esac
+# Compiler flag to generate thread-safe objects.
+thread_safe_flag_spec=$lt_thread_safe_flag_spec_CXX
 
-  if test "x$lt_cv_dlopen" != xno; then
-    enable_dlopen=yes
-  else
-    enable_dlopen=no
-  fi
+# Library versioning type.
+version_type=$version_type
 
-  case $lt_cv_dlopen in
-  dlopen)
-    save_CPPFLAGS="$CPPFLAGS"
-    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
+# Format of library name prefix.
+libname_spec=$lt_libname_spec
 
-    save_LDFLAGS="$LDFLAGS"
-    eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
+# List of archive names.  First name is the real one, the rest are links.
+# The last name is the one that the linker finds with -lNAME.
+library_names_spec=$lt_library_names_spec
 
-    save_LIBS="$LIBS"
-    LIBS="$lt_cv_dlopen_libs $LIBS"
+# The coded name of the library, if different from the real name.
+soname_spec=$lt_soname_spec
 
-    { 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 17253 "configure"
-#include "confdefs.h"
+# 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
 
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
+# Create an old-style archive from a shared archive.
+old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX
 
-#include <stdio.h>
+# 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
 
-#ifdef RTLD_GLOBAL
-#  define LT_DLGLOBAL		RTLD_GLOBAL
-#else
-#  ifdef DL_GLOBAL
-#    define LT_DLGLOBAL		DL_GLOBAL
-#  else
-#    define LT_DLGLOBAL		0
-#  endif
-#endif
+# 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
 
-/* 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
+# Commands used to build a loadable module (assumed same as above if empty)
+module_cmds=$lt_module_cmds_CXX
+module_expsym_cmds=$lt_module_expsym_cmds_CXX
 
-#ifdef __cplusplus
-extern "C" void exit (int);
-#endif
+# Commands to strip libraries.
+old_striplib=$lt_old_striplib
+striplib=$lt_striplib
 
-void fnord() { int i=42;}
-int main ()
-{
-  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-  int status = $lt_dlunknown;
+# Dependencies to place before the objects being linked to create a
+# shared library.
+predep_objects=$lt_predep_objects_CXX
 
-  if (self)
-    {
-      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
-      /* dlclose (self); */
-    }
+# Dependencies to place after the objects being linked to create a
+# shared library.
+postdep_objects=$lt_postdep_objects_CXX
 
-    exit (status);
-}
-EOF
-  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
-    (./conftest; exit; ) 2>/dev/null
-    lt_status=$?
-    case x$lt_status in
-      x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
-      x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
-      x$lt_unknown|x*) lt_cv_dlopen_self=no ;;
-    esac
-  else :
-    # compilation failed
-    lt_cv_dlopen_self=no
-  fi
-fi
-rm -fr conftest*
+# Dependencies to place before the objects being linked to create a
+# shared library.
+predeps=$lt_predeps_CXX
 
+# Dependencies to place after the objects being linked to create a
+# shared library.
+postdeps=$lt_postdeps_CXX
 
-fi
-{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
-echo "${ECHO_T}$lt_cv_dlopen_self" >&6; }
+# 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 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 17351 "configure"
-#include "confdefs.h"
+# Method to check whether dependent libraries are shared objects.
+deplibs_check_method=$lt_deplibs_check_method
 
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
+# Command to use when deplibs_check_method == file_magic.
+file_magic_cmd=$lt_file_magic_cmd
 
-#include <stdio.h>
+# Flag that allows shared libraries with undefined symbols to be built.
+allow_undefined_flag=$lt_allow_undefined_flag_CXX
 
-#ifdef RTLD_GLOBAL
-#  define LT_DLGLOBAL		RTLD_GLOBAL
-#else
-#  ifdef DL_GLOBAL
-#    define LT_DLGLOBAL		DL_GLOBAL
-#  else
-#    define LT_DLGLOBAL		0
-#  endif
-#endif
-
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
-   find out it does not work in some platform. */
-#ifndef LT_DLLAZY_OR_NOW
-#  ifdef RTLD_LAZY
-#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
-#  else
-#    ifdef DL_LAZY
-#      define LT_DLLAZY_OR_NOW		DL_LAZY
-#    else
-#      ifdef RTLD_NOW
-#        define LT_DLLAZY_OR_NOW	RTLD_NOW
-#      else
-#        ifdef DL_NOW
-#          define LT_DLLAZY_OR_NOW	DL_NOW
-#        else
-#          define LT_DLLAZY_OR_NOW	0
-#        endif
-#      endif
-#    endif
-#  endif
-#endif
-
-#ifdef __cplusplus
-extern "C" void exit (int);
-#endif
-
-void fnord() { int i=42;}
-int main ()
-{
-  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-  int status = $lt_dlunknown;
-
-  if (self)
-    {
-      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
-      /* dlclose (self); */
-    }
-
-    exit (status);
-}
-EOF
-  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
-    (./conftest; exit; ) 2>/dev/null
-    lt_status=$?
-    case x$lt_status in
-      x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
-      x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
-      x$lt_unknown|x*) lt_cv_dlopen_self_static=no ;;
-    esac
-  else :
-    # compilation failed
-    lt_cv_dlopen_self_static=no
-  fi
-fi
-rm -fr conftest*
-
-
-fi
-{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
-echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6; }
-    fi
-
-    CPPFLAGS="$save_CPPFLAGS"
-    LDFLAGS="$save_LDFLAGS"
-    LIBS="$save_LIBS"
-    ;;
-  esac
-
-  case $lt_cv_dlopen_self in
-  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
-  *) enable_dlopen_self=unknown ;;
-  esac
-
-  case $lt_cv_dlopen_self_static in
-  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
-  *) enable_dlopen_self_static=unknown ;;
-  esac
-fi
-
-
-# The else clause should only fire when bootstrapping the
-# libtool distribution, otherwise you forgot to ship ltmain.sh
-# with your package, and you will get complaints that there are
-# no rules to generate ltmain.sh.
-if test -f "$ltmain"; then
-  # See if we are running on zsh, and set the options which allow our commands through
-  # without removal of \ escapes.
-  if test -n "${ZSH_VERSION+set}" ; then
-    setopt NO_GLOB_SUBST
-  fi
-  # Now quote all the things that may contain metacharacters while being
-  # careful not to overquote the AC_SUBSTed values.  We take copies of the
-  # variables and quote the copies for generation of the libtool script.
-  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL \
-    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
-    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
-    deplibs_check_method reload_flag reload_cmds need_locks \
-    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
-    lt_cv_sys_global_symbol_to_c_name_address \
-    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
-    old_postinstall_cmds old_postuninstall_cmds \
-    compiler_CXX \
-    CC_CXX \
-    LD_CXX \
-    lt_prog_compiler_wl_CXX \
-    lt_prog_compiler_pic_CXX \
-    lt_prog_compiler_static_CXX \
-    lt_prog_compiler_no_builtin_flag_CXX \
-    export_dynamic_flag_spec_CXX \
-    thread_safe_flag_spec_CXX \
-    whole_archive_flag_spec_CXX \
-    enable_shared_with_static_runtimes_CXX \
-    old_archive_cmds_CXX \
-    old_archive_from_new_cmds_CXX \
-    predep_objects_CXX \
-    postdep_objects_CXX \
-    predeps_CXX \
-    postdeps_CXX \
-    compiler_lib_search_path_CXX \
-    archive_cmds_CXX \
-    archive_expsym_cmds_CXX \
-    postinstall_cmds_CXX \
-    postuninstall_cmds_CXX \
-    old_archive_from_expsyms_cmds_CXX \
-    allow_undefined_flag_CXX \
-    no_undefined_flag_CXX \
-    export_symbols_cmds_CXX \
-    hardcode_libdir_flag_spec_CXX \
-    hardcode_libdir_flag_spec_ld_CXX \
-    hardcode_libdir_separator_CXX \
-    hardcode_automatic_CXX \
-    module_cmds_CXX \
-    module_expsym_cmds_CXX \
-    lt_cv_prog_compiler_c_o_CXX \
-    exclude_expsyms_CXX \
-    include_expsyms_CXX; do
-
-    case $var in
-    old_archive_cmds_CXX | \
-    old_archive_from_new_cmds_CXX | \
-    archive_cmds_CXX | \
-    archive_expsym_cmds_CXX | \
-    module_cmds_CXX | \
-    module_expsym_cmds_CXX | \
-    old_archive_from_expsyms_cmds_CXX | \
-    export_symbols_cmds_CXX | \
-    extract_expsyms_cmds | reload_cmds | finish_cmds | \
-    postinstall_cmds | postuninstall_cmds | \
-    old_postinstall_cmds | old_postuninstall_cmds | \
-    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
-      # Double-quote double-evaled strings.
-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
-      ;;
-    *)
-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
-      ;;
-    esac
-  done
-
-  case $lt_echo in
-  *'\$0 --fallback-echo"')
-    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
-    ;;
-  esac
-
-cfgfile="$ofile"
-
-  cat <<__EOF__ >> "$cfgfile"
-# ### BEGIN LIBTOOL TAG CONFIG: $tagname
-
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-
-# Shell to use when invoking shell scripts.
-SHELL=$lt_SHELL
-
-# Whether or not to build shared libraries.
-build_libtool_libs=$enable_shared
-
-# Whether or not to build static libraries.
-build_old_libs=$enable_static
-
-# Whether or not to add -lc for building shared libraries.
-build_libtool_need_lc=$archive_cmds_need_lc_CXX
-
-# Whether or not to disallow shared libs when runtime libs are static
-allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX
-
-# Whether or not to optimize for fast installation.
-fast_install=$enable_fast_install
-
-# The host system.
-host_alias=$host_alias
-host=$host
-
-# An echo program that does not interpret backslashes.
-echo=$lt_echo
-
-# The archiver.
-AR=$lt_AR
-AR_FLAGS=$lt_AR_FLAGS
-
-# A C compiler.
-LTCC=$lt_LTCC
-
-# A language-specific compiler.
-CC=$lt_compiler_CXX
-
-# Is the compiler the GNU C compiler?
-with_gcc=$GCC_CXX
-
-# An ERE matcher.
-EGREP=$lt_EGREP
-
-# The linker used to build libraries.
-LD=$lt_LD_CXX
-
-# Whether we need hard or soft links.
-LN_S=$lt_LN_S
-
-# A BSD-compatible nm program.
-NM=$lt_NM
-
-# A symbol stripping program
-STRIP=$STRIP
-
-# Used to examine libraries when file_magic_cmd begins "file"
-MAGIC_CMD=$MAGIC_CMD
-
-# Used on cygwin: DLL creation program.
-DLLTOOL="$DLLTOOL"
-
-# Used on cygwin: object dumper.
-OBJDUMP="$OBJDUMP"
-
-# Used on cygwin: assembler.
-AS="$AS"
-
-# The name of the directory that contains temporary libtool files.
-objdir=$objdir
-
-# How to create reloadable object files.
-reload_flag=$lt_reload_flag
-reload_cmds=$lt_reload_cmds
-
-# How to pass a linker flag through the compiler.
-wl=$lt_lt_prog_compiler_wl_CXX
-
-# Object file suffix (normally "o").
-objext="$ac_objext"
-
-# Old archive suffix (normally "a").
-libext="$libext"
-
-# Shared library suffix (normally ".so").
-shrext='$shrext'
-
-# Executable file suffix (normally "").
-exeext="$exeext"
-
-# Additional compiler flags for building library objects.
-pic_flag=$lt_lt_prog_compiler_pic_CXX
-pic_mode=$pic_mode
-
-# What is the maximum length of a command?
-max_cmd_len=$lt_cv_sys_max_cmd_len
-
-# Does compiler simultaneously support -c and -o options?
-compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
-
-# Must we lock files when doing compilation ?
-need_locks=$lt_need_locks
-
-# Do we need the lib prefix for modules?
-need_lib_prefix=$need_lib_prefix
-
-# Do we need a version for libraries?
-need_version=$need_version
-
-# Whether dlopen is supported.
-dlopen_support=$enable_dlopen
-
-# Whether dlopen of programs is supported.
-dlopen_self=$enable_dlopen_self
-
-# Whether dlopen of statically linked programs is supported.
-dlopen_self_static=$enable_dlopen_self_static
-
-# Compiler flag to prevent dynamic linking.
-link_static_flag=$lt_lt_prog_compiler_static_CXX
-
-# Compiler flag to turn off builtin functions.
-no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX
-
-# Compiler flag to allow reflexive dlopens.
-export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX
-
-# Compiler flag to generate shared objects directly from archives.
-whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX
-
-# Compiler flag to generate thread-safe objects.
-thread_safe_flag_spec=$lt_thread_safe_flag_spec_CXX
-
-# Library versioning type.
-version_type=$version_type
-
-# Format of library name prefix.
-libname_spec=$lt_libname_spec
-
-# List of archive names.  First name is the real one, the rest are links.
-# The last name is the one that the linker finds with -lNAME.
-library_names_spec=$lt_library_names_spec
-
-# The coded name of the library, if different from the real name.
-soname_spec=$lt_soname_spec
-
-# Commands used to build and install an old-style archive.
-RANLIB=$lt_RANLIB
-old_archive_cmds=$lt_old_archive_cmds_CXX
-old_postinstall_cmds=$lt_old_postinstall_cmds
-old_postuninstall_cmds=$lt_old_postuninstall_cmds
-
-# Create an old-style archive from a shared archive.
-old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX
-
-# Create a temporary old-style archive to link instead of a shared archive.
-old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_CXX
-
-# Commands used to build and install a shared archive.
-archive_cmds=$lt_archive_cmds_CXX
-archive_expsym_cmds=$lt_archive_expsym_cmds_CXX
-postinstall_cmds=$lt_postinstall_cmds
-postuninstall_cmds=$lt_postuninstall_cmds
-
-# Commands used to build a loadable module (assumed same as above if empty)
-module_cmds=$lt_module_cmds_CXX
-module_expsym_cmds=$lt_module_expsym_cmds_CXX
-
-# Commands to strip libraries.
-old_striplib=$lt_old_striplib
-striplib=$lt_striplib
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predep_objects=$lt_predep_objects_CXX
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdep_objects=$lt_postdep_objects_CXX
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predeps=$lt_predeps_CXX
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdeps=$lt_postdeps_CXX
-
-# The library search path used internally by the compiler when linking
-# a shared library.
-compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
-
-# Method to check whether dependent libraries are shared objects.
-deplibs_check_method=$lt_deplibs_check_method
-
-# Command to use when deplibs_check_method == file_magic.
-file_magic_cmd=$lt_file_magic_cmd
-
-# Flag that allows shared libraries with undefined symbols to be built.
-allow_undefined_flag=$lt_allow_undefined_flag_CXX
-
-# Flag that forces no undefined symbols.
-no_undefined_flag=$lt_no_undefined_flag_CXX
+# 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
@@ -17843,7 +16762,10 @@
   # If there is no Makefile yet, we rely on a make rule to execute
   # `config.status --recheck' to rerun these tests and create the
   # libtool script then.
-  test -f Makefile && make "$ltmain"
+  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
+  if test -f "$ltmain_in"; then
+    test -f Makefile && make "$ltmain"
+  fi
 fi
 
 
@@ -17915,16 +16837,42 @@
 # If no C compiler was specified, use CC.
 LTCC=${LTCC-"$CC"}
 
+# If no C compiler flags were specified, use CFLAGS.
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+
 # Allow CC to be a program name with arguments.
 compiler=$CC
 
 
+# save warnings/boilerplate of simple test code
+ac_outfile=conftest.$ac_objext
+printf "$lt_simple_compile_test_code" >conftest.$ac_ext
+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_compiler_boilerplate=`cat conftest.err`
+$rm conftest*
+
+ac_outfile=conftest.$ac_objext
+printf "$lt_simple_link_test_code" >conftest.$ac_ext
+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_linker_boilerplate=`cat conftest.err`
+$rm conftest*
+
+
 # Allow CC to be a program name with arguments.
 lt_save_CC="$CC"
 CC=${F77-"f77"}
 compiler=$CC
 compiler_F77=$CC
-cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
+for cc_temp in $compiler""; do
+  case $cc_temp in
+    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+    \-*) ;;
+    *) break;;
+  esac
+done
+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+
 
 { echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
 echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; }
@@ -17937,7 +16885,7 @@
 
 # On AIX, shared libraries and static libraries use the same namespace, and
 # are all built from PIC.
-case "$host_os" in
+case $host_os in
 aix3*)
   test "$enable_shared" = yes && enable_static=no
   if test -n "$RANLIB"; then
@@ -17945,8 +16893,10 @@
     postinstall_cmds='$RANLIB $lib'
   fi
   ;;
-aix4*)
-  test "$enable_shared" = yes && enable_static=no
+aix4* | aix5*)
+  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+    test "$enable_shared" = yes && enable_static=no
+  fi
   ;;
 esac
 { echo "$as_me:$LINENO: result: $enable_shared" >&5
@@ -17959,8 +16909,6 @@
 { echo "$as_me:$LINENO: result: $enable_static" >&5
 echo "${ECHO_T}$enable_static" >&6; }
 
-test "$ld_shlibs_F77" = no && can_build_shared=no
-
 GCC_F77="$G77"
 LD_F77="$LD"
 
@@ -18007,6 +16955,11 @@
       lt_prog_compiler_pic_F77='-fno-common'
       ;;
 
+    interix3*)
+      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+      # Instead, we relocate shared libraries at runtime.
+      ;;
+
     msdosdjgpp*)
       # Just because we use GCC doesn't mean we suddenly get shared libraries
       # on systems that don't support them.
@@ -18023,7 +16976,7 @@
     hpux*)
       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
       # not for PA HP-UX.
-      case "$host_cpu" in
+      case $host_cpu in
       hppa*64*|ia64*)
 	# +Z the default
 	;;
@@ -18049,6 +17002,16 @@
 	lt_prog_compiler_static_F77='-bnso -bI:/lib/syscalls.exp'
       fi
       ;;
+      darwin*)
+        # PIC is the default on this platform
+        # Common symbols not allowed in MH_DYLIB files
+       case $cc_basename in
+         xlc*)
+         lt_prog_compiler_pic_F77='-qnocommon'
+         lt_prog_compiler_wl_F77='-Wl,'
+         ;;
+       esac
+       ;;
 
     mingw* | pw32* | os2*)
       # This hack is so that the source file can tell whether it is being
@@ -18060,7 +17023,7 @@
       lt_prog_compiler_wl_F77='-Wl,'
       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
       # not for PA HP-UX.
-      case "$host_cpu" in
+      case $host_cpu in
       hppa*64*|ia64*)
 	# +Z the default
 	;;
@@ -18083,13 +17046,20 @@
       lt_prog_compiler_static_F77='-Bstatic'
       ;;
 
-    linux*)
-      case $CC in
+    linux* | k*bsd*-gnu)
+      case $cc_basename in
       icc* | ecc*)
 	lt_prog_compiler_wl_F77='-Wl,'
 	lt_prog_compiler_pic_F77='-KPIC'
 	lt_prog_compiler_static_F77='-static'
         ;;
+      pgcc* | pgf77* | pgf90* | pgf95*)
+        # Portland Group compilers (*not* the Pentium gcc compiler,
+	# which looks to be a dead project)
+	lt_prog_compiler_wl_F77='-Wl,'
+	lt_prog_compiler_pic_F77='-fpic'
+	lt_prog_compiler_static_F77='-Bstatic'
+        ;;
       ccc*)
         lt_prog_compiler_wl_F77='-Wl,'
         # All Alpha code is PIC.
@@ -18104,15 +17074,15 @@
       lt_prog_compiler_static_F77='-non_shared'
       ;;
 
-    sco3.2v5*)
-      lt_prog_compiler_pic_F77='-Kpic'
-      lt_prog_compiler_static_F77='-dn'
-      ;;
-
     solaris*)
-      lt_prog_compiler_wl_F77='-Wl,'
       lt_prog_compiler_pic_F77='-KPIC'
       lt_prog_compiler_static_F77='-Bstatic'
+      case $cc_basename in
+      f77* | f90* | f95*)
+	lt_prog_compiler_wl_F77='-Qoption ld ';;
+      *)
+	lt_prog_compiler_wl_F77='-Wl,';;
+      esac
       ;;
 
     sunos4*)
@@ -18121,7 +17091,7 @@
       lt_prog_compiler_static_F77='-Bstatic'
       ;;
 
-    sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+    sysv4 | sysv4.2uw2* | sysv4.3*)
       lt_prog_compiler_wl_F77='-Wl,'
       lt_prog_compiler_pic_F77='-KPIC'
       lt_prog_compiler_static_F77='-Bstatic'
@@ -18134,6 +17104,17 @@
       fi
       ;;
 
+    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+      lt_prog_compiler_wl_F77='-Wl,'
+      lt_prog_compiler_pic_F77='-KPIC'
+      lt_prog_compiler_static_F77='-Bstatic'
+      ;;
+
+    unicos*)
+      lt_prog_compiler_wl_F77='-Wl,'
+      lt_prog_compiler_can_build_shared_F77=no
+      ;;
+
     uts4*)
       lt_prog_compiler_pic_F77='-pic'
       lt_prog_compiler_static_F77='-Bstatic'
@@ -18168,18 +17149,20 @@
    # with a dollar sign (not a hyphen), so the echo should work correctly.
    # The option is referenced via a variable to avoid confusing sed.
    lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:18174: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:17155: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:18178: \$? = $ac_status" >&5
+   echo "$as_me:17159: \$? = $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
-     if test ! -s conftest.err; then
+     # So say no if there are warnings other than the usual output.
+     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
        lt_prog_compiler_pic_works_F77=yes
      fi
    fi
@@ -18200,7 +17183,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=
@@ -18210,6 +17193,48 @@
     ;;
 esac
 
+#
+# 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; }
+if test "${lt_prog_compiler_static_works_F77+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  lt_prog_compiler_static_works_F77=no
+   save_LDFLAGS="$LDFLAGS"
+   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
+   printf "$lt_simple_link_test_code" > conftest.$ac_ext
+   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+     # The linker can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     if test -s conftest.err; then
+       # Append any errors to the config.log.
+       cat conftest.err 1>&5
+       $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
+       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+       if diff conftest.exp conftest.er2 >/dev/null; then
+         lt_prog_compiler_static_works_F77=yes
+       fi
+     else
+       lt_prog_compiler_static_works_F77=yes
+     fi
+   fi
+   $rm conftest*
+   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; }
+
+if test x"$lt_prog_compiler_static_works_F77" = xyes; then
+    :
+else
+    lt_prog_compiler_static_F77=
+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_F77+set}" = set; then
@@ -18222,38 +17247,36 @@
    mkdir out
    printf "$lt_simple_compile_test_code" > conftest.$ac_ext
 
-   # According to Tom Tromey, Ian Lance Taylor reported there are C compilers
-   # that will create temporary files in the current directory regardless of
-   # the output directory.  Thus, making CWD read-only will cause this test
-   # to fail, enabling locking or at least warning the user not to do parallel
-   # builds.
-   chmod -w .
-
    lt_compiler_flag="-o out/conftest2.$ac_objext"
    # Insert the option either (1) after the last *FLAGS variable, or
    # (2) before a word containing "conftest.", or (3) at the end.
    # Note that $ac_compile itself does not contain backslashes and begins
    # with a dollar sign (not a hyphen), so the echo should work correctly.
    lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:18241: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:17259: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:18245: \$? = $ac_status" >&5
+   echo "$as_me:17263: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
-     if test ! -s out/conftest.err; then
+     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
+     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
        lt_cv_prog_compiler_c_o_F77=yes
      fi
    fi
-   chmod u+w .
-   $rm conftest* out/*
-   rmdir out
+   chmod u+w . 2>&5
+   $rm conftest*
+   # SGI C++ compiler will create directory out/ii_files/ for
+   # template instantiation
+   test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
+   $rm out/* && rmdir out
    cd ..
    rmdir conftest
    $rm conftest*
@@ -18324,6 +17347,16 @@
   # rely on this symbol name, it's probably fine to never include it in
   # preloaded symbol tables.
   extract_expsyms_cmds=
+  # Just being paranoid about ensuring that cc_basename is set.
+  for cc_temp in $compiler""; do
+  case $cc_temp in
+    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+    \-*) ;;
+    *) break;;
+  esac
+done
+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
 
   case $host_os in
   cygwin* | mingw* | pw32*)
@@ -18334,6 +17367,10 @@
       with_gnu_ld=no
     fi
     ;;
+  interix*)
+    # we just hope/assume this is gcc and not c89 (= MSVC++)
+    with_gnu_ld=yes
+    ;;
   openbsd*)
     with_gnu_ld=no
     ;;
@@ -18344,6 +17381,27 @@
     # If archive_cmds runs LD, not CC, wlarc should be empty
     wlarc='${wl}'
 
+    # Set some defaults for GNU ld with shared library support. These
+    # are reset later if shared libraries are not supported. Putting them
+    # here allows them to be overridden if necessary.
+    runpath_var=LD_RUN_PATH
+    hardcode_libdir_flag_spec_F77='${wl}--rpath ${wl}$libdir'
+    export_dynamic_flag_spec_F77='${wl}--export-dynamic'
+    # ancient GNU ld didn't support --whole-archive et. al.
+    if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
+	whole_archive_flag_spec_F77="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+      else
+  	whole_archive_flag_spec_F77=
+    fi
+    supports_anon_versioning=no
+    case `$LD -v 2>/dev/null` in
+      *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
+      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
+      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
+      *\ 2.11.*) ;; # other 2.11 versions
+      *) supports_anon_versioning=yes ;;
+    esac
+
     # See if GNU ld supports shared libraries.
     case $host_os in
     aix3* | aix4* | aix5*)
@@ -18381,7 +17439,7 @@
 	allow_undefined_flag_F77=unsupported
 	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
 	# support --undefined.  This deserves some investigation.  FIXME
-	archive_cmds_F77='$CC -nostart $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
+	archive_cmds_F77='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
       else
 	ld_shlibs_F77=no
       fi
@@ -18391,13 +17449,13 @@
       # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, F77) is actually meaningless,
       # as there is no search path for DLLs.
       hardcode_libdir_flag_spec_F77='-L$libdir'
-      allow_undefined_flag_F77=no
+      allow_undefined_flag_F77=unsupported
       always_export_symbols_F77=no
       enable_shared_with_static_runtimes_F77=yes
-      export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
+      export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
 
       if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
-        archive_cmds_F77='$CC -shared $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
+        archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
 	# If the export-symbols file already is a .def file (1st line
 	# is EXPORTS), use it as is; otherwise, prepend...
 	archive_expsym_cmds_F77='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
@@ -18406,23 +17464,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
+	ld_shlibs_F77=no
+      fi
+      ;;
+
+    interix3*)
+      hardcode_direct_F77=no
+      hardcode_shlibpath_var_F77=no
+      hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
+      export_dynamic_flag_spec_F77='${wl}-E'
+      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+      # Instead, shared libraries are loaded at an image base (0x10000000 by
+      # default) and relocated if they conflict, which is a slow very memory
+      # consuming and fragmenting process.  To avoid this, we pick a random,
+      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
+      archive_cmds_F77='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      archive_expsym_cmds_F77='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      ;;
+
+    linux* | k*bsd*-gnu)
+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+	tmp_addflag=
+	case $cc_basename,$host_cpu in
+	pgcc*)				# Portland Group C compiler
+	  whole_archive_flag_spec_F77='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+	  tmp_addflag=' $pic_flag'
+	  ;;
+	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
+	  whole_archive_flag_spec_F77='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+	  tmp_addflag=' $pic_flag -Mnomain' ;;
+	ecc*,ia64* | icc*,ia64*)		# Intel C compiler on ia64
+	  tmp_addflag=' -i_dynamic' ;;
+	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
+	  tmp_addflag=' -i_dynamic -nofor_main' ;;
+	ifc* | ifort*)			# Intel Fortran compiler
+	  tmp_addflag=' -nofor_main' ;;
+	esac
+	archive_cmds_F77='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+
+	if test $supports_anon_versioning = yes; then
+	  archive_expsym_cmds_F77='$echo "{ global:" > $output_objdir/$libname.ver~
+  cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+  $echo "local: *; };" >> $output_objdir/$libname.ver~
+	  $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_F77=no
+      else
+	ld_shlibs_F77=no
       fi
       ;;
 
-    netbsd*)
+    netbsd* | netbsdelf*-gnu)
       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
 	archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
 	wlarc=
       else
-	archive_cmds_F77='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds_F77='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
       fi
       ;;
 
-    solaris* | sysv5*)
+    solaris*)
       if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
 	ld_shlibs_F77=no
 	cat <<EOF 1>&2
@@ -18436,13 +17541,40 @@
 
 EOF
       elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	archive_cmds_F77='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds_F77='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
       else
 	ld_shlibs_F77=no
       fi
       ;;
 
+    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
+      case `$LD -v 2>&1` in
+        *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
+	ld_shlibs_F77=no
+	cat <<_LT_EOF 1>&2
+
+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
+*** reliably create shared libraries on SCO systems.  Therefore, libtool
+*** is disabling shared libraries support.  We urge you to upgrade GNU
+*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
+
+_LT_EOF
+	;;
+	*)
+	  if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+	    hardcode_libdir_flag_spec_F77='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
+	    archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib'
+	    archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib'
+	  else
+	    ld_shlibs_F77=no
+	  fi
+	;;
+      esac
+      ;;
+
     sunos4*)
       archive_cmds_F77='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
       wlarc=
@@ -18452,24 +17584,19 @@
 
     *)
       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	archive_cmds_F77='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds_F77='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
       else
 	ld_shlibs_F77=no
       fi
       ;;
     esac
 
-    if test "$ld_shlibs_F77" = yes; then
-      runpath_var=LD_RUN_PATH
-      hardcode_libdir_flag_spec_F77='${wl}--rpath ${wl}$libdir'
-      export_dynamic_flag_spec_F77='${wl}--export-dynamic'
-      # ancient GNU ld didn't support --whole-archive et. al.
-      if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
- 	whole_archive_flag_spec_F77="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-      else
-  	whole_archive_flag_spec_F77=
-      fi
+    if test "$ld_shlibs_F77" = no; then
+      runpath_var=
+      hardcode_libdir_flag_spec_F77=
+      export_dynamic_flag_spec_F77=
+      whole_archive_flag_spec_F77=
     fi
   else
     # PORTME fill in a description of your system's linker (not GNU ld)
@@ -18481,7 +17608,7 @@
       # Note: this linker hardcodes the directories in LIBPATH if there
       # are no directories specified by -L.
       hardcode_minus_L_F77=yes
-      if test "$GCC" = yes && test -z "$link_static_flag"; then
+      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
 	# Neither direct hardcoding nor static linking is supported with a
 	# broken collect2.
 	hardcode_direct_F77=unsupported
@@ -18503,9 +17630,21 @@
 	else
 	  export_symbols_cmds_F77='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
 	fi
+	aix_use_runtimelinking=no
+
+	# Test if we are trying to use run time linking or normal
+	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
+	# need to do runtime linking.
+	case $host_os in aix4.[23]|aix4.[23].*|aix5*)
+	  for ld_flag in $LDFLAGS; do
+  	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+  	    aix_use_runtimelinking=yes
+  	    break
+  	  fi
+	  done
+	  ;;
+	esac
 
-	# KDE requires run time linking.  Make it the default.
-	aix_use_runtimelinking=yes
 	exp_sym_flag='-bexport'
 	no_entry_flag='-bnoentry'
       fi
@@ -18522,7 +17661,7 @@
       link_all_deplibs_F77=yes
 
       if test "$GCC" = yes; then
-	case $host_os in aix4.012|aix4.012.*)
+	case $host_os in aix4.[012]|aix4.[012].*)
 	# We only want to do this on AIX 4.2 and lower, the check
 	# below for broken collect2 doesn't work under 4.3+
 	  collect2name=`${CC} -print-prog-name=collect2`
@@ -18541,8 +17680,12 @@
   	  hardcode_libdir_flag_spec_F77='-L$libdir'
   	  hardcode_libdir_separator_F77=
 	  fi
+	  ;;
 	esac
 	shared_flag='-shared'
+	if test "$aix_use_runtimelinking" = yes; then
+	  shared_flag="$shared_flag "'${wl}-G'
+	fi
       else
 	# not using gcc
 	if test "$host_cpu" = ia64; then
@@ -18550,22 +17693,23 @@
   	# chokes on -Wl,-G. The following line is correct:
 	  shared_flag='-G'
 	else
-  	if test "$aix_use_runtimelinking" = yes; then
-	    shared_flag='-qmkshrobj ${wl}-G'
+	  if test "$aix_use_runtimelinking" = yes; then
+	    shared_flag='${wl}-G'
 	  else
-	    shared_flag='-qmkshrobj'
-  	fi
+	    shared_flag='${wl}-bM:SRE'
+	  fi
 	fi
       fi
 
-      # Let the compiler handle the export list.
-      always_export_symbols_F77=no
+      # It seems that -bexpall does not export symbols beginning with
+      # underscore (_), so it is better to generate a list of symbols to export.
+      always_export_symbols_F77=yes
       if test "$aix_use_runtimelinking" = yes; then
 	# Warning - without using the other runtime loading flags (-brtl),
 	# -berok will link without error, but may produce a broken library.
 	allow_undefined_flag_F77='-berok'
        # Determine the default libpath from the value encoded in an empty executable.
-	cat >conftest.$ac_ext <<_ACEOF
+       cat >conftest.$ac_ext <<_ACEOF
       program main
 
       end
@@ -18583,27 +17727,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_f77_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
 
 aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
 }'`
@@ -18617,18 +17745,17 @@
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 
-	hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath"
-	archive_cmds_F77="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '" $shared_flag"
-	archive_expsym_cmds_F77="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+       hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath"
+	archive_expsym_cmds_F77="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
        else
 	if test "$host_cpu" = ia64; then
 	  hardcode_libdir_flag_spec_F77='${wl}-R $libdir:/usr/lib:/lib'
 	  allow_undefined_flag_F77="-z nodefs"
-	  archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
+	  archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
 	else
 	 # Determine the default libpath from the value encoded in an empty executable.
 	 cat >conftest.$ac_ext <<_ACEOF
@@ -18649,27 +17776,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_f77_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
 
 aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
 }'`
@@ -18683,7 +17794,7 @@
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 
@@ -18692,13 +17803,11 @@
 	  # -berok will link without error, but may produce a broken library.
 	  no_undefined_flag_F77=' ${wl}-bernotok'
 	  allow_undefined_flag_F77=' ${wl}-berok'
-	  # -bexpall does not export symbols beginning with underscore (_)
-	  always_export_symbols_F77=yes
 	  # Exported symbols can be pulled into shared objects from archives
-	  whole_archive_flag_spec_F77=' '
+	  whole_archive_flag_spec_F77='$convenience'
 	  archive_cmds_need_lc_F77=yes
-	  # This is similar to how AIX traditionally builds it's shared libraries.
-	  archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+	  # This is similar to how AIX traditionally builds its shared libraries.
+	  archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
 	fi
       fi
       ;;
@@ -18711,7 +17820,7 @@
       ld_shlibs_F77=no
       ;;
 
-    bsdi4*)
+    bsdi[45]*)
       export_dynamic_flag_spec_F77=-rdynamic
       ;;
 
@@ -18721,68 +17830,68 @@
       # hardcode_libdir_flag_spec is actually meaningless, as there is
       # no search path for DLLs.
       hardcode_libdir_flag_spec_F77=' '
-      allow_undefined_flag_F77=no
+      allow_undefined_flag_F77=unsupported
       # Tell ltmain to make .lib files, not .a files.
       libext=lib
       # Tell ltmain to make .dll files, not .so files.
-      shrext=".dll"
+      shrext_cmds=".dll"
       # FIXME: Setting linknames here is a bad hack.
-      archive_cmds_F77='$CC -o $lib $compiler_flags $libobjs `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
+      archive_cmds_F77='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
       # The linker will automatically build a .lib file if we build a DLL.
       old_archive_From_new_cmds_F77='true'
       # FIXME: Should let the user specify the lib program.
       old_archive_cmds_F77='lib /OUT:$oldlib$oldobjs$old_deplibs'
-      fix_srcfile_path='`cygpath -w "$srcfile"`'
+      fix_srcfile_path_F77='`cygpath -w "$srcfile"`'
       enable_shared_with_static_runtimes_F77=yes
       ;;
 
     darwin* | rhapsody*)
-    if test "$GXX" = yes ; then
-      archive_cmds_need_lc_F77=no
-      case "$host_os" in
-      rhapsody* | darwin1.[012])
-	allow_undefined_flag_F77='-Wl,-undefined -Wl,suppress'
-	;;
-      *) # Darwin 1.3 on
-	if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-	  allow_undefined_flag_F77='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
-	else
-	  case ${MACOSX_DEPLOYMENT_TARGET} in
-	    10.012)
-	      allow_undefined_flag_F77='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
-	      ;;
-	    10.*)
-	      allow_undefined_flag_F77='-Wl,-undefined -Wl,dynamic_lookup'
-	      ;;
-	  esac
-	fi
-	;;
+      case $host_os in
+        rhapsody* | darwin1.[012])
+         allow_undefined_flag_F77='${wl}-undefined ${wl}suppress'
+         ;;
+       *) # Darwin 1.3 on
+         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+           allow_undefined_flag_F77='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
+         else
+           case ${MACOSX_DEPLOYMENT_TARGET} in
+             10.[012])
+               allow_undefined_flag_F77='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
+               ;;
+             10.*)
+               allow_undefined_flag_F77='${wl}-undefined ${wl}dynamic_lookup'
+               ;;
+           esac
+         fi
+         ;;
       esac
-    	lt_int_apple_cc_single_mod=no
-    	output_verbose_link_cmd='echo'
-    	if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
-    	  lt_int_apple_cc_single_mod=yes
-    	fi
-    	if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-    	  archive_cmds_F77='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring'
-    	else
-        archive_cmds_F77='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring'
-      fi
-      module_cmds_F77='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs'
-      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
-        if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-          archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-        else
-          archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-        fi
-          module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+      archive_cmds_need_lc_F77=no
       hardcode_direct_F77=no
       hardcode_automatic_F77=yes
       hardcode_shlibpath_var_F77=unsupported
-      whole_archive_flag_spec_F77='-all_load $convenience'
+      whole_archive_flag_spec_F77=''
       link_all_deplibs_F77=yes
+    if test "$GCC" = yes ; then
+    	output_verbose_link_cmd='echo'
+        archive_cmds_F77='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+      module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+      archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+      module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
     else
-      ld_shlibs_F77=no
+      case $cc_basename in
+        xlc*)
+         output_verbose_link_cmd='echo'
+         archive_cmds_F77='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
+         module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+         archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+          module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+          ;;
+       *)
+         ld_shlibs_F77=no
+          ;;
+      esac
     fi
       ;;
 
@@ -18816,8 +17925,8 @@
       ;;
 
     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd* | kfreebsd*-gnu)
-      archive_cmds_F77='$CC -shared -o $lib $compiler_flags $libobjs $deplibs'
+    freebsd* | dragonfly*)
+      archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
       hardcode_libdir_flag_spec_F77='-R$libdir'
       hardcode_direct_F77=yes
       hardcode_shlibpath_var_F77=no
@@ -18825,7 +17934,7 @@
 
     hpux9*)
       if test "$GCC" = yes; then
-	archive_cmds_F77='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $compiler_flags $libobjs $deplibs~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+	archive_cmds_F77='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
       else
 	archive_cmds_F77='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
       fi
@@ -18839,47 +17948,62 @@
       export_dynamic_flag_spec_F77='${wl}-E'
       ;;
 
-    hpux10* | hpux11*)
+    hpux10*)
       if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-	case "$host_cpu" in
-	hppa*64*|ia64*)
-	  archive_cmds_F77='$CC -shared ${wl}+h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
+	archive_cmds_F77='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	archive_cmds_F77='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+      fi
+      if test "$with_gnu_ld" = no; then
+	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_minus_L: Not really in the search PATH,
+	# but as the default location of the library.
+	hardcode_minus_L_F77=yes
+      fi
+      ;;
+
+    hpux11*)
+      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+	case $host_cpu in
+	hppa*64*)
+	  archive_cmds_F77='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	ia64*)
+	  archive_cmds_F77='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	*)
-	  archive_cmds_F77='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $compiler_flags $libobjs $deplibs'
+	  archive_cmds_F77='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	esac
       else
-	case "$host_cpu" in
-	hppa*64*|ia64*)
-	  archive_cmds_F77='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
+	case $host_cpu in
+	hppa*64*)
+	  archive_cmds_F77='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	ia64*)
+	  archive_cmds_F77='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	*)
-	  archive_cmds_F77='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+	  archive_cmds_F77='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	esac
       fi
       if test "$with_gnu_ld" = no; then
-	case "$host_cpu" in
-	hppa*64*)
-	  hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
+	hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
+	hardcode_libdir_separator_F77=:
+
+	case $host_cpu in
+	hppa*64*|ia64*)
 	  hardcode_libdir_flag_spec_ld_F77='+b $libdir'
-	  hardcode_libdir_separator_F77=:
-	  hardcode_direct_F77=no
-	  hardcode_shlibpath_var_F77=no
-	  ;;
-	ia64*)
-	  hardcode_libdir_flag_spec_F77='-L$libdir'
 	  hardcode_direct_F77=no
 	  hardcode_shlibpath_var_F77=no
-
-	  # hardcode_minus_L: Not really in the search PATH,
-	  # but as the default location of the library.
-	  hardcode_minus_L_F77=yes
 	  ;;
 	*)
-	  hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
-	  hardcode_libdir_separator_F77=:
 	  hardcode_direct_F77=yes
 	  export_dynamic_flag_spec_F77='${wl}-E'
 
@@ -18893,7 +18017,7 @@
 
     irix5* | irix6* | nonstopux*)
       if test "$GCC" = yes; then
-	archive_cmds_F77='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
       else
 	archive_cmds_F77='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
 	hardcode_libdir_flag_spec_ld_F77='-rpath $libdir'
@@ -18903,7 +18027,7 @@
       link_all_deplibs_F77=yes
       ;;
 
-    netbsd*)
+    netbsd* | netbsdelf*-gnu)
       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
 	archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
       else
@@ -18926,7 +18050,8 @@
       hardcode_direct_F77=yes
       hardcode_shlibpath_var_F77=no
       if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-	archive_cmds_F77='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs'
+	archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
 	hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
 	export_dynamic_flag_spec_F77='${wl}-E'
       else
@@ -18936,7 +18061,7 @@
 	   hardcode_libdir_flag_spec_F77='-R$libdir'
 	   ;;
 	 *)
-	   archive_cmds_F77='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs'
+	   archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
 	   hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
 	   ;;
        esac
@@ -18947,14 +18072,14 @@
       hardcode_libdir_flag_spec_F77='-L$libdir'
       hardcode_minus_L_F77=yes
       allow_undefined_flag_F77=unsupported
-      archive_cmds_F77='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $compiler_flags $libobjs $deplibs$output_objdir/$libname.def'
+      archive_cmds_F77='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
       old_archive_From_new_cmds_F77='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
       ;;
 
     osf3*)
       if test "$GCC" = yes; then
 	allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
-	archive_cmds_F77='$CC -shared${allow_undefined_flag} $compiler_flags $libobjs $deplibs ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	archive_cmds_F77='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
       else
 	allow_undefined_flag_F77=' -expect_unresolved \*'
 	archive_cmds_F77='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
@@ -18966,13 +18091,13 @@
     osf4* | osf5*)	# as osf3* with the addition of -msym flag
       if test "$GCC" = yes; then
 	allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
-	archive_cmds_F77='$CC -shared${allow_undefined_flag} $compiler_flags $libobjs $deplibs ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	archive_cmds_F77='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 	hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
       else
 	allow_undefined_flag_F77=' -expect_unresolved \*'
 	archive_cmds_F77='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
 	archive_expsym_cmds_F77='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
-	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
+	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
 
 	# Both c and cxx compiler support -rpath directly
 	hardcode_libdir_flag_spec_F77='-rpath $libdir'
@@ -18980,21 +18105,15 @@
       hardcode_libdir_separator_F77=:
       ;;
 
-    sco3.2v5*)
-      archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_shlibpath_var_F77=no
-      export_dynamic_flag_spec_F77='${wl}-Bexport'
-      runpath_var=LD_RUN_PATH
-      hardcode_runpath_var=yes
-      ;;
-
     solaris*)
       no_undefined_flag_F77=' -z text'
       if test "$GCC" = yes; then
-	archive_cmds_F77='$CC -shared ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
+	wlarc='${wl}'
+	archive_cmds_F77='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
 	archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs~$rm $lib.exp'
+	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
       else
+	wlarc=''
 	archive_cmds_F77='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
 	archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
   	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
@@ -19003,8 +18122,18 @@
       hardcode_shlibpath_var_F77=no
       case $host_os in
       solaris2.[0-5] | solaris2.[0-5].*) ;;
-      *) # Supported since Solaris 2.6 (maybe 2.5.1?)
-	whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract' ;;
+      *)
+ 	# The compiler driver will combine linker options so we
+ 	# cannot just pass the convience library names through
+ 	# without $wl, iff we do not link with $LD.
+ 	# Luckily, gcc supports the same syntax we need for Sun Studio.
+ 	# Supported since Solaris 2.6 (maybe 2.5.1?)
+ 	case $wlarc in
+ 	'')
+ 	  whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract' ;;
+ 	*)
+ 	  whole_archive_flag_spec_F77='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
+ 	esac ;;
       esac
       link_all_deplibs_F77=yes
       ;;
@@ -19013,7 +18142,7 @@
       if test "x$host_vendor" = xsequent; then
 	# Use $CC to link under sequent, because it throws in some extra .o
 	# files that make .init and .fini sections work.
-	archive_cmds_F77='$CC -G ${wl}-h $soname -o $lib $compiler_flags $libobjs $deplibs'
+	archive_cmds_F77='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
       else
 	archive_cmds_F77='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
       fi
@@ -19061,36 +18190,45 @@
       fi
       ;;
 
-    sysv4.2uw2*)
-      archive_cmds_F77='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_direct_F77=yes
-      hardcode_minus_L_F77=no
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)
+      no_undefined_flag_F77='${wl}-z,text'
+      archive_cmds_need_lc_F77=no
       hardcode_shlibpath_var_F77=no
-      hardcode_runpath_var=yes
-      runpath_var=LD_RUN_PATH
-      ;;
+      runpath_var='LD_RUN_PATH'
 
-   sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[78]* | unixware7*)
-      no_undefined_flag_F77='${wl}-z ${wl}text'
       if test "$GCC" = yes; then
-	archive_cmds_F77='$CC -shared ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
+	archive_cmds_F77='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds_F77='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
       else
-	archive_cmds_F77='$CC -G ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
+	archive_cmds_F77='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds_F77='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
       fi
-      runpath_var='LD_RUN_PATH'
-      hardcode_shlibpath_var_F77=no
       ;;
 
-    sysv5*)
-      no_undefined_flag_F77=' -z text'
-      # $CC -shared without GNU ld will not create a library from C++
-      # object files and a static libstdc++, better avoid it by now
-      archive_cmds_F77='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-  		$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-      hardcode_libdir_flag_spec_F77=
+    sysv5* | sco3.2v5* | sco5v6*)
+      # Note: We can NOT use -z defs as we might desire, because we do not
+      # link with -lc, and that would cause any symbols used from libc to
+      # always be unresolved, which means just about no library would
+      # ever link correctly.  If we're not using GNU ld we use -z text
+      # though, which does catch some bad symbols but isn't as heavy-handed
+      # as -z defs.
+      no_undefined_flag_F77='${wl}-z,text'
+      allow_undefined_flag_F77='${wl}-z,nodefs'
+      archive_cmds_need_lc_F77=no
       hardcode_shlibpath_var_F77=no
+      hardcode_libdir_flag_spec_F77='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
+      hardcode_libdir_separator_F77=':'
+      link_all_deplibs_F77=yes
+      export_dynamic_flag_spec_F77='${wl}-Bexport'
       runpath_var='LD_RUN_PATH'
+
+      if test "$GCC" = yes; then
+	archive_cmds_F77='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds_F77='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	archive_cmds_F77='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds_F77='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+      fi
       ;;
 
     uts4*)
@@ -19109,11 +18247,6 @@
 echo "${ECHO_T}$ld_shlibs_F77" >&6; }
 test "$ld_shlibs_F77" = no && can_build_shared=no
 
-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test "$GCC" = yes; then
-  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-fi
-
 #
 # Do we need to explicitly link libc?
 #
@@ -19146,6 +18279,7 @@
         libobjs=conftest.$ac_objext
         deplibs=
         wl=$lt_prog_compiler_wl_F77
+	pic_flag=$lt_prog_compiler_pic_F77
         compiler_flags=-v
         linker_flags=-v
         verstring=
@@ -19181,7 +18315,7 @@
 library_names_spec=
 libname_spec='lib$name'
 soname_spec=
-shrext=".so"
+shrext_cmds=".so"
 postinstall_cmds=
 postuninstall_cmds=
 finish_cmds=
@@ -19191,7 +18325,20 @@
 version_type=none
 dynamic_linker="$host_os ld.so"
 sys_lib_dlsearch_path_spec="/lib /usr/lib"
-sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+if test "$GCC" = yes; then
+  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
+    # if the path contains ";" then we assume it to be the separator
+    # otherwise default to the standard path separator (i.e. ":") - it is
+    # assumed that no part of a normal pathname contains ";" but that should
+    # okay in the real world where ";" in dirpaths is itself problematic.
+    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+  else
+    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
+  fi
+else
+  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+fi
 need_lib_prefix=unknown
 hardcode_into_libs=no
 
@@ -19256,7 +18403,7 @@
 amigaos*)
   library_names_spec='$libname.ixlibrary $libname.a'
   # Create ${libname}_ixlibrary.a entries in /sys/libs.
-  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done'
+  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
   ;;
 
 beos*)
@@ -19265,7 +18412,7 @@
   shlibpath_var=LIBRARY_PATH
   ;;
 
-bsdi4*)
+bsdi[45]*)
   version_type=linux
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -19281,7 +18428,7 @@
 
 cygwin* | mingw* | pw32*)
   version_type=windows
-  shrext=".dll"
+  shrext_cmds=".dll"
   need_version=no
   need_lib_prefix=no
 
@@ -19293,7 +18440,8 @@
       dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
       dldir=$destdir/`dirname \$dlpath`~
       test -d \$dldir || mkdir -p \$dldir~
-      $install_prog $dir/$dlname \$dldir/$dlname'
+      $install_prog $dir/$dlname \$dldir/$dlname~
+      chmod a+x \$dldir/$dlname'
     postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
       dlpath=$dir/\$dldll~
        $rm \$dlpath'
@@ -19323,7 +18471,7 @@
       ;;
     pw32*)
       # pw32 DLLs use 'pw' prefix rather than 'lib'
-      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}'
+      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
       ;;
     esac
     ;;
@@ -19346,7 +18494,7 @@
   soname_spec='${libname}${release}${major}$shared_ext'
   shlibpath_overrides_runpath=yes
   shlibpath_var=DYLD_LIBRARY_PATH
-  shrext='$(test .$module = .yes && echo .so || echo .dylib)'
+  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
   # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
   if test "$GCC" = yes; then
     sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
@@ -19369,20 +18517,17 @@
   dynamic_linker=no
   ;;
 
-kfreebsd*-gnu*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='GNU ld.so'
-  ;;
-
-freebsd*)
-  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
+freebsd* | dragonfly*)
+  # DragonFly does not have aout.  When/if they implement a new
+  # versioning mechanism, adjust this.
+  if test -x /usr/bin/objformat; then
+    objformat=`/usr/bin/objformat`
+  else
+    case $host_os in
+    freebsd[123]*) objformat=aout ;;
+    *) objformat=elf ;;
+    esac
+  fi
   version_type=freebsd-$objformat
   case $version_type in
     freebsd-elf*)
@@ -19400,14 +18545,19 @@
   freebsd2*)
     shlibpath_overrides_runpath=yes
     ;;
-  freebsd3.01* | freebsdelf3.01*)
+  freebsd3.[01]* | freebsdelf3.[01]*)
     shlibpath_overrides_runpath=yes
     hardcode_into_libs=yes
     ;;
-  *) # from 3.2 on
+  freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
+  freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
     shlibpath_overrides_runpath=no
     hardcode_into_libs=yes
     ;;
+  freebsd*) # from 4.6 on
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
   esac
   ;;
 
@@ -19427,9 +18577,9 @@
   version_type=sunos
   need_lib_prefix=no
   need_version=no
-  case "$host_cpu" in
+  case $host_cpu in
   ia64*)
-    shrext='.so'
+    shrext_cmds='.so'
     hardcode_into_libs=yes
     dynamic_linker="$host_os dld.so"
     shlibpath_var=LD_LIBRARY_PATH
@@ -19444,7 +18594,7 @@
     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
     ;;
    hppa*64*)
-     shrext='.sl'
+     shrext_cmds='.sl'
      hardcode_into_libs=yes
      dynamic_linker="$host_os dld.sl"
      shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
@@ -19455,7 +18605,7 @@
      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
      ;;
    *)
-    shrext='.sl'
+    shrext_cmds='.sl'
     dynamic_linker="$host_os dld.sl"
     shlibpath_var=SHLIB_PATH
     shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
@@ -19467,6 +18617,18 @@
   postinstall_cmds='chmod 555 $lib'
   ;;
 
+interix3*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
 irix5* | irix6* | nonstopux*)
   case $host_os in
     nonstopux*) version_type=nonstopux ;;
@@ -19510,29 +18672,26 @@
   ;;
 
 # This must be Linux ELF.
-linux*)
+linux* | k*bsd*-gnu)
   version_type=linux
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
   finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-  libsuff=
-  if test "x$LINUX_64_MODE" = x64; then
-    # Some platforms are per default 64-bit, so there's no /lib64
-    if test -d /lib64 -a ! -h /lib64; then
-      libsuff=64
-    fi
-  fi
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=no
-  sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}"
-  sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
   # This implies no fast_install, which is unacceptable.
   # Some rework will be needed to allow for fast_install
   # before this can be enabled.
   hardcode_into_libs=yes
 
+  # Append ld.so.conf contents to the search path
+  if test -f /etc/ld.so.conf; then
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+  fi
+
   # We used to test for /lib/ld.so.1 and disable shared libraries on
   # powerpc, because MkLinux only supported shared libraries with the
   # GNU dynamic linker.  Since this was broken with cross compilers,
@@ -19542,6 +18701,18 @@
   dynamic_linker='GNU/Linux ld.so'
   ;;
 
+netbsdelf*-gnu)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='NetBSD ld.elf_so'
+  ;;
+
 netbsd*)
   version_type=sunos
   need_lib_prefix=no
@@ -19551,7 +18722,7 @@
     finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
     dynamic_linker='NetBSD (a.out) ld.so'
   else
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} ${libname}${shared_ext}'
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
     soname_spec='${libname}${release}${shared_ext}$major'
     dynamic_linker='NetBSD ld.elf_so'
   fi
@@ -19579,8 +18750,13 @@
 
 openbsd*)
   version_type=sunos
+  sys_lib_dlsearch_path_spec="/usr/lib"
   need_lib_prefix=no
-  need_version=no
+  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
+  case $host_os in
+    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
+    *)                         need_version=no  ;;
+  esac
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
   finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
   shlibpath_var=LD_LIBRARY_PATH
@@ -19600,7 +18776,7 @@
 
 os2*)
   libname_spec='$name'
-  shrext=".dll"
+  shrext_cmds=".dll"
   need_lib_prefix=no
   library_names_spec='$libname${shared_ext} $libname.a'
   dynamic_linker='OS/2 ld.exe'
@@ -19618,13 +18794,6 @@
   sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
   ;;
 
-sco3.2v5*)
-  version_type=osf
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
 solaris*)
   version_type=linux
   need_lib_prefix=no
@@ -19650,7 +18819,7 @@
   need_version=yes
   ;;
 
-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+sysv4 | sysv4.3*)
   version_type=linux
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
@@ -19683,6 +18852,29 @@
   fi
   ;;
 
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+  version_type=freebsd-elf
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  hardcode_into_libs=yes
+  if test "$with_gnu_ld" = yes; then
+    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
+    shlibpath_overrides_runpath=no
+  else
+    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
+    shlibpath_overrides_runpath=yes
+    case $host_os in
+      sco3.2v5*)
+        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
+	;;
+    esac
+  fi
+  sys_lib_dlsearch_path_spec='/usr/lib'
+  ;;
+
 uts4*)
   version_type=linux
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -19698,12 +18890,17 @@
 echo "${ECHO_T}$dynamic_linker" >&6; }
 test "$dynamic_linker" = no && can_build_shared=no
 
+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+if test "$GCC" = yes; then
+  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+fi
+
 { 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" || \
-   test "X$hardcode_automatic_F77"="Xyes" ; then
+   test -n "$runpath_var_F77" || \
+   test "X$hardcode_automatic_F77" = "Xyes" ; then
 
   # We can hardcode non-existant directories.
   if test "$hardcode_direct_F77" != no &&
@@ -19735,36 +18932,6 @@
   enable_fast_install=needless
 fi
 
-striplib=
-old_striplib=
-{ echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
-echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6; }
-if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
-  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
-  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-else
-# FIXME - insert some real tests, host_os isn't really good enough
-  case $host_os in
-   darwin*)
-       if test -n "$STRIP" ; then
-         striplib="$STRIP -x"
-         { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-       else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-       ;;
-   *)
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-    ;;
-  esac
-fi
-
-
 
 # The else clause should only fire when bootstrapping the
 # libtool distribution, otherwise you forgot to ship ltmain.sh
@@ -19779,7 +18946,8 @@
   # Now quote all the things that may contain metacharacters while being
   # careful not to overquote the AC_SUBSTed values.  We take copies of the
   # variables and quote the copies for generation of the libtool script.
-  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL \
+  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
+    SED SHELL STRIP \
     libname_spec library_names_spec soname_spec extract_expsyms_cmds \
     old_striplib striplib file_magic_cmd finish_cmds finish_eval \
     deplibs_check_method reload_flag reload_cmds need_locks \
@@ -19879,6 +19047,12 @@
 # The host system.
 host_alias=$host_alias
 host=$host
+host_os=$host_os
+
+# The build system.
+build_alias=$build_alias
+build=$build
+build_os=$build_os
 
 # An echo program that does not interpret backslashes.
 echo=$lt_echo
@@ -19890,6 +19064,9 @@
 # A C compiler.
 LTCC=$lt_LTCC
 
+# LTCC compiler flags.
+LTCFLAGS=$lt_LTCFLAGS
+
 # A language-specific compiler.
 CC=$lt_compiler_F77
 
@@ -19909,7 +19086,7 @@
 NM=$lt_NM
 
 # A symbol stripping program
-STRIP=$STRIP
+STRIP=$lt_STRIP
 
 # Used to examine libraries when file_magic_cmd begins "file"
 MAGIC_CMD=$MAGIC_CMD
@@ -19940,7 +19117,7 @@
 libext="$libext"
 
 # Shared library suffix (normally ".so").
-shrext='$shrext'
+shrext_cmds='$shrext_cmds'
 
 # Executable file suffix (normally "").
 exeext="$exeext"
@@ -19955,7 +19132,7 @@
 # Does compiler simultaneously support -c and -o options?
 compiler_c_o=$lt_lt_cv_prog_compiler_c_o_F77
 
-# Must we lock files when doing compilation ?
+# Must we lock files when doing compilation?
 need_locks=$lt_need_locks
 
 # Do we need the lib prefix for modules?
@@ -20157,7 +19334,10 @@
   # If there is no Makefile yet, we rely on a make rule to execute
   # `config.status --recheck' to rerun these tests and create the
   # libtool script then.
-  test -f Makefile && make "$ltmain"
+  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
+  if test -f "$ltmain_in"; then
+    test -f Makefile && make "$ltmain"
+  fi
 fi
 
 
@@ -20189,26 +19369,55 @@
 lt_simple_compile_test_code="class foo {}\n"
 
 # Code to be used in simple link tests
-lt_simple_link_test_code='public class conftest { public static void main(String argv) {}; }\n'
+lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }\n'
 
 # ltmain only uses $CC for tagged configurations so make sure $CC is set.
 
 # If no C compiler was specified, use CC.
 LTCC=${LTCC-"$CC"}
 
+# If no C compiler flags were specified, use CFLAGS.
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+
 # Allow CC to be a program name with arguments.
 compiler=$CC
 
 
+# save warnings/boilerplate of simple test code
+ac_outfile=conftest.$ac_objext
+printf "$lt_simple_compile_test_code" >conftest.$ac_ext
+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_compiler_boilerplate=`cat conftest.err`
+$rm conftest*
+
+ac_outfile=conftest.$ac_objext
+printf "$lt_simple_link_test_code" >conftest.$ac_ext
+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_linker_boilerplate=`cat conftest.err`
+$rm conftest*
+
+
 # Allow CC to be a program name with arguments.
 lt_save_CC="$CC"
 CC=${GCJ-"gcj"}
 compiler=$CC
 compiler_GCJ=$CC
+for cc_temp in $compiler""; do
+  case $cc_temp in
+    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+    \-*) ;;
+    *) break;;
+  esac
+done
+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+
 
 # GCJ did not exist at the time GCC didn't implicitly link libc in.
 archive_cmds_need_lc_GCJ=no
 
+old_archive_cmds_GCJ=$old_archive_cmds
+
 ## CAVEAT EMPTOR:
 ## There is no encapsulation within the following macros, do not change
 ## the running order or otherwise move them around unless you know exactly
@@ -20235,18 +19444,20 @@
    # with a dollar sign (not a hyphen), so the echo should work correctly.
    # The option is referenced via a variable to avoid confusing sed.
    lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:20241: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:19450: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:20245: \$? = $ac_status" >&5
+   echo "$as_me:19454: \$? = $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
-     if test ! -s conftest.err; then
+     # So say no if there are warnings other than the usual output.
+     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
        lt_cv_prog_compiler_rtti_exceptions=yes
      fi
    fi
@@ -20307,6 +19518,11 @@
       lt_prog_compiler_pic_GCJ='-fno-common'
       ;;
 
+    interix3*)
+      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+      # Instead, we relocate shared libraries at runtime.
+      ;;
+
     msdosdjgpp*)
       # Just because we use GCC doesn't mean we suddenly get shared libraries
       # on systems that don't support them.
@@ -20323,7 +19539,7 @@
     hpux*)
       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
       # not for PA HP-UX.
-      case "$host_cpu" in
+      case $host_cpu in
       hppa*64*|ia64*)
 	# +Z the default
 	;;
@@ -20349,6 +19565,16 @@
 	lt_prog_compiler_static_GCJ='-bnso -bI:/lib/syscalls.exp'
       fi
       ;;
+      darwin*)
+        # PIC is the default on this platform
+        # Common symbols not allowed in MH_DYLIB files
+       case $cc_basename in
+         xlc*)
+         lt_prog_compiler_pic_GCJ='-qnocommon'
+         lt_prog_compiler_wl_GCJ='-Wl,'
+         ;;
+       esac
+       ;;
 
     mingw* | pw32* | os2*)
       # This hack is so that the source file can tell whether it is being
@@ -20360,7 +19586,7 @@
       lt_prog_compiler_wl_GCJ='-Wl,'
       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
       # not for PA HP-UX.
-      case "$host_cpu" in
+      case $host_cpu in
       hppa*64*|ia64*)
 	# +Z the default
 	;;
@@ -20383,13 +19609,20 @@
       lt_prog_compiler_static_GCJ='-Bstatic'
       ;;
 
-    linux*)
-      case $CC in
+    linux* | k*bsd*-gnu)
+      case $cc_basename in
       icc* | ecc*)
 	lt_prog_compiler_wl_GCJ='-Wl,'
 	lt_prog_compiler_pic_GCJ='-KPIC'
 	lt_prog_compiler_static_GCJ='-static'
         ;;
+      pgcc* | pgf77* | pgf90* | pgf95*)
+        # Portland Group compilers (*not* the Pentium gcc compiler,
+	# which looks to be a dead project)
+	lt_prog_compiler_wl_GCJ='-Wl,'
+	lt_prog_compiler_pic_GCJ='-fpic'
+	lt_prog_compiler_static_GCJ='-Bstatic'
+        ;;
       ccc*)
         lt_prog_compiler_wl_GCJ='-Wl,'
         # All Alpha code is PIC.
@@ -20404,15 +19637,15 @@
       lt_prog_compiler_static_GCJ='-non_shared'
       ;;
 
-    sco3.2v5*)
-      lt_prog_compiler_pic_GCJ='-Kpic'
-      lt_prog_compiler_static_GCJ='-dn'
-      ;;
-
     solaris*)
-      lt_prog_compiler_wl_GCJ='-Wl,'
       lt_prog_compiler_pic_GCJ='-KPIC'
       lt_prog_compiler_static_GCJ='-Bstatic'
+      case $cc_basename in
+      f77* | f90* | f95*)
+	lt_prog_compiler_wl_GCJ='-Qoption ld ';;
+      *)
+	lt_prog_compiler_wl_GCJ='-Wl,';;
+      esac
       ;;
 
     sunos4*)
@@ -20421,7 +19654,7 @@
       lt_prog_compiler_static_GCJ='-Bstatic'
       ;;
 
-    sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+    sysv4 | sysv4.2uw2* | sysv4.3*)
       lt_prog_compiler_wl_GCJ='-Wl,'
       lt_prog_compiler_pic_GCJ='-KPIC'
       lt_prog_compiler_static_GCJ='-Bstatic'
@@ -20434,6 +19667,17 @@
       fi
       ;;
 
+    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+      lt_prog_compiler_wl_GCJ='-Wl,'
+      lt_prog_compiler_pic_GCJ='-KPIC'
+      lt_prog_compiler_static_GCJ='-Bstatic'
+      ;;
+
+    unicos*)
+      lt_prog_compiler_wl_GCJ='-Wl,'
+      lt_prog_compiler_can_build_shared_GCJ=no
+      ;;
+
     uts4*)
       lt_prog_compiler_pic_GCJ='-pic'
       lt_prog_compiler_static_GCJ='-Bstatic'
@@ -20468,18 +19712,20 @@
    # with a dollar sign (not a hyphen), so the echo should work correctly.
    # The option is referenced via a variable to avoid confusing sed.
    lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:20474: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:19718: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:20478: \$? = $ac_status" >&5
+   echo "$as_me:19722: \$? = $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
-     if test ! -s conftest.err; then
+     # So say no if there are warnings other than the usual output.
+     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
        lt_prog_compiler_pic_works_GCJ=yes
      fi
    fi
@@ -20500,7 +19746,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=
@@ -20510,6 +19756,48 @@
     ;;
 esac
 
+#
+# 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; }
+if test "${lt_prog_compiler_static_works_GCJ+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  lt_prog_compiler_static_works_GCJ=no
+   save_LDFLAGS="$LDFLAGS"
+   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
+   printf "$lt_simple_link_test_code" > conftest.$ac_ext
+   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+     # The linker can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     if test -s conftest.err; then
+       # Append any errors to the config.log.
+       cat conftest.err 1>&5
+       $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
+       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+       if diff conftest.exp conftest.er2 >/dev/null; then
+         lt_prog_compiler_static_works_GCJ=yes
+       fi
+     else
+       lt_prog_compiler_static_works_GCJ=yes
+     fi
+   fi
+   $rm conftest*
+   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; }
+
+if test x"$lt_prog_compiler_static_works_GCJ" = xyes; then
+    :
+else
+    lt_prog_compiler_static_GCJ=
+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_GCJ+set}" = set; then
@@ -20522,38 +19810,36 @@
    mkdir out
    printf "$lt_simple_compile_test_code" > conftest.$ac_ext
 
-   # According to Tom Tromey, Ian Lance Taylor reported there are C compilers
-   # that will create temporary files in the current directory regardless of
-   # the output directory.  Thus, making CWD read-only will cause this test
-   # to fail, enabling locking or at least warning the user not to do parallel
-   # builds.
-   chmod -w .
-
    lt_compiler_flag="-o out/conftest2.$ac_objext"
    # Insert the option either (1) after the last *FLAGS variable, or
    # (2) before a word containing "conftest.", or (3) at the end.
    # Note that $ac_compile itself does not contain backslashes and begins
    # with a dollar sign (not a hyphen), so the echo should work correctly.
    lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:20541: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:19822: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:20545: \$? = $ac_status" >&5
+   echo "$as_me:19826: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
-     if test ! -s out/conftest.err; then
+     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
+     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
        lt_cv_prog_compiler_c_o_GCJ=yes
      fi
    fi
-   chmod u+w .
-   $rm conftest* out/*
-   rmdir out
+   chmod u+w . 2>&5
+   $rm conftest*
+   # SGI C++ compiler will create directory out/ii_files/ for
+   # template instantiation
+   test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
+   $rm out/* && rmdir out
    cd ..
    rmdir conftest
    $rm conftest*
@@ -20624,6 +19910,16 @@
   # rely on this symbol name, it's probably fine to never include it in
   # preloaded symbol tables.
   extract_expsyms_cmds=
+  # Just being paranoid about ensuring that cc_basename is set.
+  for cc_temp in $compiler""; do
+  case $cc_temp in
+    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+    \-*) ;;
+    *) break;;
+  esac
+done
+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
 
   case $host_os in
   cygwin* | mingw* | pw32*)
@@ -20634,6 +19930,10 @@
       with_gnu_ld=no
     fi
     ;;
+  interix*)
+    # we just hope/assume this is gcc and not c89 (= MSVC++)
+    with_gnu_ld=yes
+    ;;
   openbsd*)
     with_gnu_ld=no
     ;;
@@ -20644,6 +19944,27 @@
     # If archive_cmds runs LD, not CC, wlarc should be empty
     wlarc='${wl}'
 
+    # Set some defaults for GNU ld with shared library support. These
+    # are reset later if shared libraries are not supported. Putting them
+    # here allows them to be overridden if necessary.
+    runpath_var=LD_RUN_PATH
+    hardcode_libdir_flag_spec_GCJ='${wl}--rpath ${wl}$libdir'
+    export_dynamic_flag_spec_GCJ='${wl}--export-dynamic'
+    # ancient GNU ld didn't support --whole-archive et. al.
+    if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
+	whole_archive_flag_spec_GCJ="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+      else
+  	whole_archive_flag_spec_GCJ=
+    fi
+    supports_anon_versioning=no
+    case `$LD -v 2>/dev/null` in
+      *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
+      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
+      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
+      *\ 2.11.*) ;; # other 2.11 versions
+      *) supports_anon_versioning=yes ;;
+    esac
+
     # See if GNU ld supports shared libraries.
     case $host_os in
     aix3* | aix4* | aix5*)
@@ -20681,7 +20002,7 @@
 	allow_undefined_flag_GCJ=unsupported
 	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
 	# support --undefined.  This deserves some investigation.  FIXME
-	archive_cmds_GCJ='$CC -nostart $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
+	archive_cmds_GCJ='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
       else
 	ld_shlibs_GCJ=no
       fi
@@ -20691,13 +20012,13 @@
       # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, GCJ) is actually meaningless,
       # as there is no search path for DLLs.
       hardcode_libdir_flag_spec_GCJ='-L$libdir'
-      allow_undefined_flag_GCJ=no
+      allow_undefined_flag_GCJ=unsupported
       always_export_symbols_GCJ=no
       enable_shared_with_static_runtimes_GCJ=yes
-      export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
+      export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
 
       if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
-        archive_cmds_GCJ='$CC -shared $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
+        archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
 	# If the export-symbols file already is a .def file (1st line
 	# is EXPORTS), use it as is; otherwise, prepend...
 	archive_expsym_cmds_GCJ='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
@@ -20706,23 +20027,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
+	ld_shlibs_GCJ=no
+      fi
+      ;;
+
+    interix3*)
+      hardcode_direct_GCJ=no
+      hardcode_shlibpath_var_GCJ=no
+      hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
+      export_dynamic_flag_spec_GCJ='${wl}-E'
+      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+      # Instead, shared libraries are loaded at an image base (0x10000000 by
+      # default) and relocated if they conflict, which is a slow very memory
+      # consuming and fragmenting process.  To avoid this, we pick a random,
+      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
+      archive_cmds_GCJ='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      archive_expsym_cmds_GCJ='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      ;;
+
+    linux* | k*bsd*-gnu)
+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+	tmp_addflag=
+	case $cc_basename,$host_cpu in
+	pgcc*)				# Portland Group C compiler
+	  whole_archive_flag_spec_GCJ='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+	  tmp_addflag=' $pic_flag'
+	  ;;
+	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
+	  whole_archive_flag_spec_GCJ='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+	  tmp_addflag=' $pic_flag -Mnomain' ;;
+	ecc*,ia64* | icc*,ia64*)		# Intel C compiler on ia64
+	  tmp_addflag=' -i_dynamic' ;;
+	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
+	  tmp_addflag=' -i_dynamic -nofor_main' ;;
+	ifc* | ifort*)			# Intel Fortran compiler
+	  tmp_addflag=' -nofor_main' ;;
+	esac
+	archive_cmds_GCJ='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+
+	if test $supports_anon_versioning = yes; then
+	  archive_expsym_cmds_GCJ='$echo "{ global:" > $output_objdir/$libname.ver~
+  cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+  $echo "local: *; };" >> $output_objdir/$libname.ver~
+	  $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_GCJ=no
+      else
+	ld_shlibs_GCJ=no
       fi
       ;;
 
-    netbsd*)
+    netbsd* | netbsdelf*-gnu)
       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
 	archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
 	wlarc=
       else
-	archive_cmds_GCJ='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds_GCJ='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
       fi
       ;;
 
-    solaris* | sysv5*)
+    solaris*)
       if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
 	ld_shlibs_GCJ=no
 	cat <<EOF 1>&2
@@ -20736,13 +20104,40 @@
 
 EOF
       elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	archive_cmds_GCJ='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds_GCJ='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
       else
 	ld_shlibs_GCJ=no
       fi
       ;;
 
+    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
+      case `$LD -v 2>&1` in
+        *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
+	ld_shlibs_GCJ=no
+	cat <<_LT_EOF 1>&2
+
+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
+*** reliably create shared libraries on SCO systems.  Therefore, libtool
+*** is disabling shared libraries support.  We urge you to upgrade GNU
+*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
+
+_LT_EOF
+	;;
+	*)
+	  if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+	    hardcode_libdir_flag_spec_GCJ='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
+	    archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib'
+	    archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib'
+	  else
+	    ld_shlibs_GCJ=no
+	  fi
+	;;
+      esac
+      ;;
+
     sunos4*)
       archive_cmds_GCJ='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
       wlarc=
@@ -20752,24 +20147,19 @@
 
     *)
       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	archive_cmds_GCJ='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds_GCJ='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
       else
 	ld_shlibs_GCJ=no
       fi
       ;;
     esac
 
-    if test "$ld_shlibs_GCJ" = yes; then
-      runpath_var=LD_RUN_PATH
-      hardcode_libdir_flag_spec_GCJ='${wl}--rpath ${wl}$libdir'
-      export_dynamic_flag_spec_GCJ='${wl}--export-dynamic'
-      # ancient GNU ld didn't support --whole-archive et. al.
-      if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
- 	whole_archive_flag_spec_GCJ="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-      else
-  	whole_archive_flag_spec_GCJ=
-      fi
+    if test "$ld_shlibs_GCJ" = no; then
+      runpath_var=
+      hardcode_libdir_flag_spec_GCJ=
+      export_dynamic_flag_spec_GCJ=
+      whole_archive_flag_spec_GCJ=
     fi
   else
     # PORTME fill in a description of your system's linker (not GNU ld)
@@ -20781,7 +20171,7 @@
       # Note: this linker hardcodes the directories in LIBPATH if there
       # are no directories specified by -L.
       hardcode_minus_L_GCJ=yes
-      if test "$GCC" = yes && test -z "$link_static_flag"; then
+      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
 	# Neither direct hardcoding nor static linking is supported with a
 	# broken collect2.
 	hardcode_direct_GCJ=unsupported
@@ -20803,9 +20193,21 @@
 	else
 	  export_symbols_cmds_GCJ='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
 	fi
+	aix_use_runtimelinking=no
+
+	# Test if we are trying to use run time linking or normal
+	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
+	# need to do runtime linking.
+	case $host_os in aix4.[23]|aix4.[23].*|aix5*)
+	  for ld_flag in $LDFLAGS; do
+  	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+  	    aix_use_runtimelinking=yes
+  	    break
+  	  fi
+	  done
+	  ;;
+	esac
 
-	# KDE requires run time linking.  Make it the default.
-	aix_use_runtimelinking=yes
 	exp_sym_flag='-bexport'
 	no_entry_flag='-bnoentry'
       fi
@@ -20822,7 +20224,7 @@
       link_all_deplibs_GCJ=yes
 
       if test "$GCC" = yes; then
-	case $host_os in aix4.012|aix4.012.*)
+	case $host_os in aix4.[012]|aix4.[012].*)
 	# We only want to do this on AIX 4.2 and lower, the check
 	# below for broken collect2 doesn't work under 4.3+
 	  collect2name=`${CC} -print-prog-name=collect2`
@@ -20841,8 +20243,12 @@
   	  hardcode_libdir_flag_spec_GCJ='-L$libdir'
   	  hardcode_libdir_separator_GCJ=
 	  fi
+	  ;;
 	esac
 	shared_flag='-shared'
+	if test "$aix_use_runtimelinking" = yes; then
+	  shared_flag="$shared_flag "'${wl}-G'
+	fi
       else
 	# not using gcc
 	if test "$host_cpu" = ia64; then
@@ -20850,22 +20256,23 @@
   	# chokes on -Wl,-G. The following line is correct:
 	  shared_flag='-G'
 	else
-  	if test "$aix_use_runtimelinking" = yes; then
-	    shared_flag='-qmkshrobj ${wl}-G'
+	  if test "$aix_use_runtimelinking" = yes; then
+	    shared_flag='${wl}-G'
 	  else
-	    shared_flag='-qmkshrobj'
-  	fi
+	    shared_flag='${wl}-bM:SRE'
+	  fi
 	fi
       fi
 
-      # Let the compiler handle the export list.
-      always_export_symbols_GCJ=no
+      # It seems that -bexpall does not export symbols beginning with
+      # underscore (_), so it is better to generate a list of symbols to export.
+      always_export_symbols_GCJ=yes
       if test "$aix_use_runtimelinking" = yes; then
 	# Warning - without using the other runtime loading flags (-brtl),
 	# -berok will link without error, but may produce a broken library.
 	allow_undefined_flag_GCJ='-berok'
        # Determine the default libpath from the value encoded in an empty executable.
-	cat >conftest.$ac_ext <<_ACEOF
+       cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -20893,27 +20300,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
 
 aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
 }'`
@@ -20927,18 +20318,17 @@
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 
-	hardcode_libdir_flag_spec_GCJ='${wl}-blibpath:$libdir:'"$aix_libpath"
-	archive_cmds_GCJ="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '" $shared_flag"
-	archive_expsym_cmds_GCJ="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+       hardcode_libdir_flag_spec_GCJ='${wl}-blibpath:$libdir:'"$aix_libpath"
+	archive_expsym_cmds_GCJ="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
        else
 	if test "$host_cpu" = ia64; then
 	  hardcode_libdir_flag_spec_GCJ='${wl}-R $libdir:/usr/lib:/lib'
 	  allow_undefined_flag_GCJ="-z nodefs"
-	  archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
+	  archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
 	else
 	 # Determine the default libpath from the value encoded in an empty executable.
 	 cat >conftest.$ac_ext <<_ACEOF
@@ -20969,27 +20359,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
 
 aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
 }'`
@@ -21003,7 +20377,7 @@
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 
@@ -21012,13 +20386,11 @@
 	  # -berok will link without error, but may produce a broken library.
 	  no_undefined_flag_GCJ=' ${wl}-bernotok'
 	  allow_undefined_flag_GCJ=' ${wl}-berok'
-	  # -bexpall does not export symbols beginning with underscore (_)
-	  always_export_symbols_GCJ=yes
 	  # Exported symbols can be pulled into shared objects from archives
-	  whole_archive_flag_spec_GCJ=' '
+	  whole_archive_flag_spec_GCJ='$convenience'
 	  archive_cmds_need_lc_GCJ=yes
-	  # This is similar to how AIX traditionally builds it's shared libraries.
-	  archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+	  # This is similar to how AIX traditionally builds its shared libraries.
+	  archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
 	fi
       fi
       ;;
@@ -21031,7 +20403,7 @@
       ld_shlibs_GCJ=no
       ;;
 
-    bsdi4*)
+    bsdi[45]*)
       export_dynamic_flag_spec_GCJ=-rdynamic
       ;;
 
@@ -21041,68 +20413,68 @@
       # hardcode_libdir_flag_spec is actually meaningless, as there is
       # no search path for DLLs.
       hardcode_libdir_flag_spec_GCJ=' '
-      allow_undefined_flag_GCJ=no
+      allow_undefined_flag_GCJ=unsupported
       # Tell ltmain to make .lib files, not .a files.
       libext=lib
       # Tell ltmain to make .dll files, not .so files.
-      shrext=".dll"
+      shrext_cmds=".dll"
       # FIXME: Setting linknames here is a bad hack.
-      archive_cmds_GCJ='$CC -o $lib $compiler_flags $libobjs `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
+      archive_cmds_GCJ='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
       # The linker will automatically build a .lib file if we build a DLL.
       old_archive_From_new_cmds_GCJ='true'
       # FIXME: Should let the user specify the lib program.
       old_archive_cmds_GCJ='lib /OUT:$oldlib$oldobjs$old_deplibs'
-      fix_srcfile_path='`cygpath -w "$srcfile"`'
+      fix_srcfile_path_GCJ='`cygpath -w "$srcfile"`'
       enable_shared_with_static_runtimes_GCJ=yes
       ;;
 
     darwin* | rhapsody*)
-    if test "$GXX" = yes ; then
-      archive_cmds_need_lc_GCJ=no
-      case "$host_os" in
-      rhapsody* | darwin1.[012])
-	allow_undefined_flag_GCJ='-Wl,-undefined -Wl,suppress'
-	;;
-      *) # Darwin 1.3 on
-	if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-	  allow_undefined_flag_GCJ='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
-	else
-	  case ${MACOSX_DEPLOYMENT_TARGET} in
-	    10.012)
-	      allow_undefined_flag_GCJ='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
-	      ;;
-	    10.*)
-	      allow_undefined_flag_GCJ='-Wl,-undefined -Wl,dynamic_lookup'
-	      ;;
-	  esac
-	fi
-	;;
+      case $host_os in
+        rhapsody* | darwin1.[012])
+         allow_undefined_flag_GCJ='${wl}-undefined ${wl}suppress'
+         ;;
+       *) # Darwin 1.3 on
+         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+           allow_undefined_flag_GCJ='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
+         else
+           case ${MACOSX_DEPLOYMENT_TARGET} in
+             10.[012])
+               allow_undefined_flag_GCJ='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
+               ;;
+             10.*)
+               allow_undefined_flag_GCJ='${wl}-undefined ${wl}dynamic_lookup'
+               ;;
+           esac
+         fi
+         ;;
       esac
-    	lt_int_apple_cc_single_mod=no
-    	output_verbose_link_cmd='echo'
-    	if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
-    	  lt_int_apple_cc_single_mod=yes
-    	fi
-    	if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-    	  archive_cmds_GCJ='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring'
-    	else
-        archive_cmds_GCJ='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring'
-      fi
-      module_cmds_GCJ='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs'
-      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
-        if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-          archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-        else
-          archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-        fi
-          module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+      archive_cmds_need_lc_GCJ=no
       hardcode_direct_GCJ=no
       hardcode_automatic_GCJ=yes
       hardcode_shlibpath_var_GCJ=unsupported
-      whole_archive_flag_spec_GCJ='-all_load $convenience'
+      whole_archive_flag_spec_GCJ=''
       link_all_deplibs_GCJ=yes
+    if test "$GCC" = yes ; then
+    	output_verbose_link_cmd='echo'
+        archive_cmds_GCJ='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+      module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+      archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+      module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
     else
-      ld_shlibs_GCJ=no
+      case $cc_basename in
+        xlc*)
+         output_verbose_link_cmd='echo'
+         archive_cmds_GCJ='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
+         module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+         archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+          module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+          ;;
+       *)
+         ld_shlibs_GCJ=no
+          ;;
+      esac
     fi
       ;;
 
@@ -21136,8 +20508,8 @@
       ;;
 
     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd* | kfreebsd*-gnu)
-      archive_cmds_GCJ='$CC -shared -o $lib $compiler_flags $libobjs $deplibs'
+    freebsd* | dragonfly*)
+      archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
       hardcode_libdir_flag_spec_GCJ='-R$libdir'
       hardcode_direct_GCJ=yes
       hardcode_shlibpath_var_GCJ=no
@@ -21145,7 +20517,7 @@
 
     hpux9*)
       if test "$GCC" = yes; then
-	archive_cmds_GCJ='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $compiler_flags $libobjs $deplibs~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+	archive_cmds_GCJ='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
       else
 	archive_cmds_GCJ='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
       fi
@@ -21159,47 +20531,62 @@
       export_dynamic_flag_spec_GCJ='${wl}-E'
       ;;
 
-    hpux10* | hpux11*)
+    hpux10*)
       if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-	case "$host_cpu" in
-	hppa*64*|ia64*)
-	  archive_cmds_GCJ='$CC -shared ${wl}+h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
+	archive_cmds_GCJ='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	archive_cmds_GCJ='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+      fi
+      if test "$with_gnu_ld" = no; then
+	hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
+	hardcode_libdir_separator_GCJ=:
+
+	hardcode_direct_GCJ=yes
+	export_dynamic_flag_spec_GCJ='${wl}-E'
+
+	# hardcode_minus_L: Not really in the search PATH,
+	# but as the default location of the library.
+	hardcode_minus_L_GCJ=yes
+      fi
+      ;;
+
+    hpux11*)
+      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+	case $host_cpu in
+	hppa*64*)
+	  archive_cmds_GCJ='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	ia64*)
+	  archive_cmds_GCJ='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	*)
-	  archive_cmds_GCJ='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $compiler_flags $libobjs $deplibs'
+	  archive_cmds_GCJ='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	esac
       else
-	case "$host_cpu" in
-	hppa*64*|ia64*)
-	  archive_cmds_GCJ='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
+	case $host_cpu in
+	hppa*64*)
+	  archive_cmds_GCJ='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	ia64*)
+	  archive_cmds_GCJ='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	*)
-	  archive_cmds_GCJ='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+	  archive_cmds_GCJ='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	esac
       fi
       if test "$with_gnu_ld" = no; then
-	case "$host_cpu" in
-	hppa*64*)
-	  hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
+	hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
+	hardcode_libdir_separator_GCJ=:
+
+	case $host_cpu in
+	hppa*64*|ia64*)
 	  hardcode_libdir_flag_spec_ld_GCJ='+b $libdir'
-	  hardcode_libdir_separator_GCJ=:
-	  hardcode_direct_GCJ=no
-	  hardcode_shlibpath_var_GCJ=no
-	  ;;
-	ia64*)
-	  hardcode_libdir_flag_spec_GCJ='-L$libdir'
 	  hardcode_direct_GCJ=no
 	  hardcode_shlibpath_var_GCJ=no
-
-	  # hardcode_minus_L: Not really in the search PATH,
-	  # but as the default location of the library.
-	  hardcode_minus_L_GCJ=yes
 	  ;;
 	*)
-	  hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
-	  hardcode_libdir_separator_GCJ=:
 	  hardcode_direct_GCJ=yes
 	  export_dynamic_flag_spec_GCJ='${wl}-E'
 
@@ -21213,7 +20600,7 @@
 
     irix5* | irix6* | nonstopux*)
       if test "$GCC" = yes; then
-	archive_cmds_GCJ='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
       else
 	archive_cmds_GCJ='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
 	hardcode_libdir_flag_spec_ld_GCJ='-rpath $libdir'
@@ -21223,7 +20610,7 @@
       link_all_deplibs_GCJ=yes
       ;;
 
-    netbsd*)
+    netbsd* | netbsdelf*-gnu)
       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
 	archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
       else
@@ -21246,7 +20633,8 @@
       hardcode_direct_GCJ=yes
       hardcode_shlibpath_var_GCJ=no
       if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-	archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs'
+	archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
 	hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
 	export_dynamic_flag_spec_GCJ='${wl}-E'
       else
@@ -21256,7 +20644,7 @@
 	   hardcode_libdir_flag_spec_GCJ='-R$libdir'
 	   ;;
 	 *)
-	   archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs'
+	   archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
 	   hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
 	   ;;
        esac
@@ -21267,14 +20655,14 @@
       hardcode_libdir_flag_spec_GCJ='-L$libdir'
       hardcode_minus_L_GCJ=yes
       allow_undefined_flag_GCJ=unsupported
-      archive_cmds_GCJ='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $compiler_flags $libobjs $deplibs$output_objdir/$libname.def'
+      archive_cmds_GCJ='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
       old_archive_From_new_cmds_GCJ='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
       ;;
 
     osf3*)
       if test "$GCC" = yes; then
 	allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*'
-	archive_cmds_GCJ='$CC -shared${allow_undefined_flag} $compiler_flags $libobjs $deplibs ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	archive_cmds_GCJ='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
       else
 	allow_undefined_flag_GCJ=' -expect_unresolved \*'
 	archive_cmds_GCJ='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
@@ -21286,13 +20674,13 @@
     osf4* | osf5*)	# as osf3* with the addition of -msym flag
       if test "$GCC" = yes; then
 	allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*'
-	archive_cmds_GCJ='$CC -shared${allow_undefined_flag} $compiler_flags $libobjs $deplibs ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	archive_cmds_GCJ='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 	hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir'
       else
 	allow_undefined_flag_GCJ=' -expect_unresolved \*'
 	archive_cmds_GCJ='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
 	archive_expsym_cmds_GCJ='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
-	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
+	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
 
 	# Both c and cxx compiler support -rpath directly
 	hardcode_libdir_flag_spec_GCJ='-rpath $libdir'
@@ -21300,21 +20688,15 @@
       hardcode_libdir_separator_GCJ=:
       ;;
 
-    sco3.2v5*)
-      archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_shlibpath_var_GCJ=no
-      export_dynamic_flag_spec_GCJ='${wl}-Bexport'
-      runpath_var=LD_RUN_PATH
-      hardcode_runpath_var=yes
-      ;;
-
     solaris*)
       no_undefined_flag_GCJ=' -z text'
       if test "$GCC" = yes; then
-	archive_cmds_GCJ='$CC -shared ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
+	wlarc='${wl}'
+	archive_cmds_GCJ='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
 	archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs~$rm $lib.exp'
+	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
       else
+	wlarc=''
 	archive_cmds_GCJ='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
 	archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
   	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
@@ -21323,8 +20705,18 @@
       hardcode_shlibpath_var_GCJ=no
       case $host_os in
       solaris2.[0-5] | solaris2.[0-5].*) ;;
-      *) # Supported since Solaris 2.6 (maybe 2.5.1?)
-	whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract' ;;
+      *)
+ 	# The compiler driver will combine linker options so we
+ 	# cannot just pass the convience library names through
+ 	# without $wl, iff we do not link with $LD.
+ 	# Luckily, gcc supports the same syntax we need for Sun Studio.
+ 	# Supported since Solaris 2.6 (maybe 2.5.1?)
+ 	case $wlarc in
+ 	'')
+ 	  whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract' ;;
+ 	*)
+ 	  whole_archive_flag_spec_GCJ='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
+ 	esac ;;
       esac
       link_all_deplibs_GCJ=yes
       ;;
@@ -21333,7 +20725,7 @@
       if test "x$host_vendor" = xsequent; then
 	# Use $CC to link under sequent, because it throws in some extra .o
 	# files that make .init and .fini sections work.
-	archive_cmds_GCJ='$CC -G ${wl}-h $soname -o $lib $compiler_flags $libobjs $deplibs'
+	archive_cmds_GCJ='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
       else
 	archive_cmds_GCJ='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
       fi
@@ -21381,36 +20773,45 @@
       fi
       ;;
 
-    sysv4.2uw2*)
-      archive_cmds_GCJ='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_direct_GCJ=yes
-      hardcode_minus_L_GCJ=no
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)
+      no_undefined_flag_GCJ='${wl}-z,text'
+      archive_cmds_need_lc_GCJ=no
       hardcode_shlibpath_var_GCJ=no
-      hardcode_runpath_var=yes
-      runpath_var=LD_RUN_PATH
-      ;;
+      runpath_var='LD_RUN_PATH'
 
-   sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[78]* | unixware7*)
-      no_undefined_flag_GCJ='${wl}-z ${wl}text'
       if test "$GCC" = yes; then
-	archive_cmds_GCJ='$CC -shared ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
+	archive_cmds_GCJ='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds_GCJ='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
       else
-	archive_cmds_GCJ='$CC -G ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
+	archive_cmds_GCJ='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds_GCJ='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
       fi
-      runpath_var='LD_RUN_PATH'
-      hardcode_shlibpath_var_GCJ=no
       ;;
 
-    sysv5*)
-      no_undefined_flag_GCJ=' -z text'
-      # $CC -shared without GNU ld will not create a library from C++
-      # object files and a static libstdc++, better avoid it by now
-      archive_cmds_GCJ='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-  		$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-      hardcode_libdir_flag_spec_GCJ=
+    sysv5* | sco3.2v5* | sco5v6*)
+      # Note: We can NOT use -z defs as we might desire, because we do not
+      # link with -lc, and that would cause any symbols used from libc to
+      # always be unresolved, which means just about no library would
+      # ever link correctly.  If we're not using GNU ld we use -z text
+      # though, which does catch some bad symbols but isn't as heavy-handed
+      # as -z defs.
+      no_undefined_flag_GCJ='${wl}-z,text'
+      allow_undefined_flag_GCJ='${wl}-z,nodefs'
+      archive_cmds_need_lc_GCJ=no
       hardcode_shlibpath_var_GCJ=no
+      hardcode_libdir_flag_spec_GCJ='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
+      hardcode_libdir_separator_GCJ=':'
+      link_all_deplibs_GCJ=yes
+      export_dynamic_flag_spec_GCJ='${wl}-Bexport'
       runpath_var='LD_RUN_PATH'
+
+      if test "$GCC" = yes; then
+	archive_cmds_GCJ='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds_GCJ='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	archive_cmds_GCJ='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds_GCJ='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+      fi
       ;;
 
     uts4*)
@@ -21429,11 +20830,6 @@
 echo "${ECHO_T}$ld_shlibs_GCJ" >&6; }
 test "$ld_shlibs_GCJ" = no && can_build_shared=no
 
-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test "$GCC" = yes; then
-  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-fi
-
 #
 # Do we need to explicitly link libc?
 #
@@ -21466,6 +20862,7 @@
         libobjs=conftest.$ac_objext
         deplibs=
         wl=$lt_prog_compiler_wl_GCJ
+	pic_flag=$lt_prog_compiler_pic_GCJ
         compiler_flags=-v
         linker_flags=-v
         verstring=
@@ -21501,7 +20898,7 @@
 library_names_spec=
 libname_spec='lib$name'
 soname_spec=
-shrext=".so"
+shrext_cmds=".so"
 postinstall_cmds=
 postuninstall_cmds=
 finish_cmds=
@@ -21511,7 +20908,20 @@
 version_type=none
 dynamic_linker="$host_os ld.so"
 sys_lib_dlsearch_path_spec="/lib /usr/lib"
-sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+if test "$GCC" = yes; then
+  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
+    # if the path contains ";" then we assume it to be the separator
+    # otherwise default to the standard path separator (i.e. ":") - it is
+    # assumed that no part of a normal pathname contains ";" but that should
+    # okay in the real world where ";" in dirpaths is itself problematic.
+    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+  else
+    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
+  fi
+else
+  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+fi
 need_lib_prefix=unknown
 hardcode_into_libs=no
 
@@ -21576,7 +20986,7 @@
 amigaos*)
   library_names_spec='$libname.ixlibrary $libname.a'
   # Create ${libname}_ixlibrary.a entries in /sys/libs.
-  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done'
+  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
   ;;
 
 beos*)
@@ -21585,7 +20995,7 @@
   shlibpath_var=LIBRARY_PATH
   ;;
 
-bsdi4*)
+bsdi[45]*)
   version_type=linux
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -21601,7 +21011,7 @@
 
 cygwin* | mingw* | pw32*)
   version_type=windows
-  shrext=".dll"
+  shrext_cmds=".dll"
   need_version=no
   need_lib_prefix=no
 
@@ -21613,7 +21023,8 @@
       dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
       dldir=$destdir/`dirname \$dlpath`~
       test -d \$dldir || mkdir -p \$dldir~
-      $install_prog $dir/$dlname \$dldir/$dlname'
+      $install_prog $dir/$dlname \$dldir/$dlname~
+      chmod a+x \$dldir/$dlname'
     postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
       dlpath=$dir/\$dldll~
        $rm \$dlpath'
@@ -21643,7 +21054,7 @@
       ;;
     pw32*)
       # pw32 DLLs use 'pw' prefix rather than 'lib'
-      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}'
+      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
       ;;
     esac
     ;;
@@ -21666,7 +21077,7 @@
   soname_spec='${libname}${release}${major}$shared_ext'
   shlibpath_overrides_runpath=yes
   shlibpath_var=DYLD_LIBRARY_PATH
-  shrext='$(test .$module = .yes && echo .so || echo .dylib)'
+  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
   # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
   if test "$GCC" = yes; then
     sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
@@ -21689,20 +21100,17 @@
   dynamic_linker=no
   ;;
 
-kfreebsd*-gnu*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='GNU ld.so'
-  ;;
-
-freebsd*)
-  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
+freebsd* | dragonfly*)
+  # DragonFly does not have aout.  When/if they implement a new
+  # versioning mechanism, adjust this.
+  if test -x /usr/bin/objformat; then
+    objformat=`/usr/bin/objformat`
+  else
+    case $host_os in
+    freebsd[123]*) objformat=aout ;;
+    *) objformat=elf ;;
+    esac
+  fi
   version_type=freebsd-$objformat
   case $version_type in
     freebsd-elf*)
@@ -21720,14 +21128,19 @@
   freebsd2*)
     shlibpath_overrides_runpath=yes
     ;;
-  freebsd3.01* | freebsdelf3.01*)
+  freebsd3.[01]* | freebsdelf3.[01]*)
     shlibpath_overrides_runpath=yes
     hardcode_into_libs=yes
     ;;
-  *) # from 3.2 on
+  freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
+  freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
     shlibpath_overrides_runpath=no
     hardcode_into_libs=yes
     ;;
+  freebsd*) # from 4.6 on
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
   esac
   ;;
 
@@ -21747,9 +21160,9 @@
   version_type=sunos
   need_lib_prefix=no
   need_version=no
-  case "$host_cpu" in
+  case $host_cpu in
   ia64*)
-    shrext='.so'
+    shrext_cmds='.so'
     hardcode_into_libs=yes
     dynamic_linker="$host_os dld.so"
     shlibpath_var=LD_LIBRARY_PATH
@@ -21764,7 +21177,7 @@
     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
     ;;
    hppa*64*)
-     shrext='.sl'
+     shrext_cmds='.sl'
      hardcode_into_libs=yes
      dynamic_linker="$host_os dld.sl"
      shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
@@ -21775,7 +21188,7 @@
      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
      ;;
    *)
-    shrext='.sl'
+    shrext_cmds='.sl'
     dynamic_linker="$host_os dld.sl"
     shlibpath_var=SHLIB_PATH
     shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
@@ -21787,6 +21200,18 @@
   postinstall_cmds='chmod 555 $lib'
   ;;
 
+interix3*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
 irix5* | irix6* | nonstopux*)
   case $host_os in
     nonstopux*) version_type=nonstopux ;;
@@ -21830,29 +21255,26 @@
   ;;
 
 # This must be Linux ELF.
-linux*)
+linux* | k*bsd*-gnu)
   version_type=linux
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
   finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-  libsuff=
-  if test "x$LINUX_64_MODE" = x64; then
-    # Some platforms are per default 64-bit, so there's no /lib64
-    if test -d /lib64 -a ! -h /lib64; then
-      libsuff=64
-    fi
-  fi
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=no
-  sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}"
-  sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
   # This implies no fast_install, which is unacceptable.
   # Some rework will be needed to allow for fast_install
   # before this can be enabled.
   hardcode_into_libs=yes
 
+  # Append ld.so.conf contents to the search path
+  if test -f /etc/ld.so.conf; then
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+  fi
+
   # We used to test for /lib/ld.so.1 and disable shared libraries on
   # powerpc, because MkLinux only supported shared libraries with the
   # GNU dynamic linker.  Since this was broken with cross compilers,
@@ -21862,6 +21284,18 @@
   dynamic_linker='GNU/Linux ld.so'
   ;;
 
+netbsdelf*-gnu)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='NetBSD ld.elf_so'
+  ;;
+
 netbsd*)
   version_type=sunos
   need_lib_prefix=no
@@ -21871,7 +21305,7 @@
     finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
     dynamic_linker='NetBSD (a.out) ld.so'
   else
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} ${libname}${shared_ext}'
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
     soname_spec='${libname}${release}${shared_ext}$major'
     dynamic_linker='NetBSD ld.elf_so'
   fi
@@ -21899,8 +21333,13 @@
 
 openbsd*)
   version_type=sunos
+  sys_lib_dlsearch_path_spec="/usr/lib"
   need_lib_prefix=no
-  need_version=no
+  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
+  case $host_os in
+    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
+    *)                         need_version=no  ;;
+  esac
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
   finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
   shlibpath_var=LD_LIBRARY_PATH
@@ -21920,1053 +21359,160 @@
 
 os2*)
   libname_spec='$name'
-  shrext=".dll"
-  need_lib_prefix=no
-  library_names_spec='$libname${shared_ext} $libname.a'
-  dynamic_linker='OS/2 ld.exe'
-  shlibpath_var=LIBPATH
-  ;;
-
-osf3* | osf4* | osf5*)
-  version_type=osf
+  shrext_cmds=".dll"
   need_lib_prefix=no
-  need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
-  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
-  ;;
-
-sco3.2v5*)
-  version_type=osf
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-solaris*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  # ldd complains unless libraries are executable
-  postinstall_cmds='chmod +x $lib'
-  ;;
-
-sunos4*)
-  version_type=sunos
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  if test "$with_gnu_ld" = yes; then
-    need_lib_prefix=no
-  fi
-  need_version=yes
-  ;;
-
-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_vendor in
-    sni)
-      shlibpath_overrides_runpath=no
-      need_lib_prefix=no
-      export_dynamic_flag_spec='${wl}-Blargedynsym'
-      runpath_var=LD_RUN_PATH
-      ;;
-    siemens)
-      need_lib_prefix=no
-      ;;
-    motorola)
-      need_lib_prefix=no
-      need_version=no
-      shlibpath_overrides_runpath=no
-      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
-      ;;
-  esac
-  ;;
-
-sysv4*MP*)
-  if test -d /usr/nec ;then
-    version_type=linux
-    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
-    soname_spec='$libname${shared_ext}.$major'
-    shlibpath_var=LD_LIBRARY_PATH
-  fi
-  ;;
-
-uts4*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-*)
-  dynamic_linker=no
-  ;;
-esac
-{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
-echo "${ECHO_T}$dynamic_linker" >&6; }
-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; }
-hardcode_action_GCJ=
-if test -n "$hardcode_libdir_flag_spec_GCJ" || \
-   test -n "$runpath_var GCJ" || \
-   test "X$hardcode_automatic_GCJ"="Xyes" ; then
-
-  # We can hardcode non-existant directories.
-  if test "$hardcode_direct_GCJ" != no &&
-     # If the only mechanism to avoid hardcoding is shlibpath_var, we
-     # have to relink, otherwise we might link with an installed library
-     # when we should be linking with a yet-to-be-installed one
-     ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, GCJ)" != no &&
-     test "$hardcode_minus_L_GCJ" != no; then
-    # Linking always hardcodes the temporary library directory.
-    hardcode_action_GCJ=relink
-  else
-    # We can link without hardcoding, and we can hardcode nonexisting dirs.
-    hardcode_action_GCJ=immediate
-  fi
-else
-  # We cannot hardcode anything, or else we can only hardcode existing
-  # directories.
-  hardcode_action_GCJ=unsupported
-fi
-{ echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5
-echo "${ECHO_T}$hardcode_action_GCJ" >&6; }
-
-if test "$hardcode_action_GCJ" = relink; then
-  # Fast installation is not supported
-  enable_fast_install=no
-elif test "$shlibpath_overrides_runpath" = yes ||
-     test "$enable_shared" = no; then
-  # Fast installation is not necessary
-  enable_fast_install=needless
-fi
-
-striplib=
-old_striplib=
-{ echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
-echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6; }
-if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
-  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
-  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-else
-# FIXME - insert some real tests, host_os isn't really good enough
-  case $host_os in
-   darwin*)
-       if test -n "$STRIP" ; then
-         striplib="$STRIP -x"
-         { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-       else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-       ;;
-   *)
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-    ;;
-  esac
-fi
-
-if test "x$enable_dlopen" != xyes; then
-  enable_dlopen=unknown
-  enable_dlopen_self=unknown
-  enable_dlopen_self_static=unknown
-else
-  lt_cv_dlopen=no
-  lt_cv_dlopen_libs=
-
-  case $host_os in
-  beos*)
-    lt_cv_dlopen="load_add_on"
-    lt_cv_dlopen_libs=
-    lt_cv_dlopen_self=yes
-    ;;
-
-  mingw* | pw32*)
-    lt_cv_dlopen="LoadLibrary"
-    lt_cv_dlopen_libs=
-   ;;
-
-  cygwin*)
-    lt_cv_dlopen="dlopen"
-    lt_cv_dlopen_libs=
-   ;;
-
-  darwin*)
-  # if libdl is installed we need to link against it
-    { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldl  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dlopen ();
-int
-main ()
-{
-return dlopen ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_dl_dlopen=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_dl_dlopen=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
-if test $ac_cv_lib_dl_dlopen = yes; then
-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
-else
-
-    lt_cv_dlopen="dyld"
-    lt_cv_dlopen_libs=
-    lt_cv_dlopen_self=yes
-
-fi
-
-   ;;
-
-  *)
-    { echo "$as_me:$LINENO: checking for shl_load" >&5
-echo $ECHO_N "checking for shl_load... $ECHO_C" >&6; }
-if test "${ac_cv_func_shl_load+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define shl_load innocuous_shl_load
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char shl_load (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef shl_load
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char shl_load ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_shl_load || defined __stub___shl_load
-choke me
-#endif
-
-int
-main ()
-{
-return shl_load ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_func_shl_load=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_func_shl_load=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
-echo "${ECHO_T}$ac_cv_func_shl_load" >&6; }
-if test $ac_cv_func_shl_load = yes; then
-  lt_cv_dlopen="shl_load"
-else
-  { echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
-echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6; }
-if test "${ac_cv_lib_dld_shl_load+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldld  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char shl_load ();
-int
-main ()
-{
-return shl_load ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_dld_shl_load=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_dld_shl_load=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
-echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; }
-if test $ac_cv_lib_dld_shl_load = yes; then
-  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"
-else
-  { echo "$as_me:$LINENO: checking for dlopen" >&5
-echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; }
-if test "${ac_cv_func_dlopen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define dlopen innocuous_dlopen
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char dlopen (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef dlopen
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dlopen ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_dlopen || defined __stub___dlopen
-choke me
-#endif
-
-int
-main ()
-{
-return dlopen ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_func_dlopen=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_func_dlopen=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
-echo "${ECHO_T}$ac_cv_func_dlopen" >&6; }
-if test $ac_cv_func_dlopen = yes; then
-  lt_cv_dlopen="dlopen"
-else
-  { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldl  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dlopen ();
-int
-main ()
-{
-return dlopen ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_dl_dlopen=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_dl_dlopen=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
-if test $ac_cv_lib_dl_dlopen = yes; then
-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
-else
-  { echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
-echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6; }
-if test "${ac_cv_lib_svld_dlopen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lsvld  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dlopen ();
-int
-main ()
-{
-return dlopen ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_svld_dlopen=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_svld_dlopen=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6; }
-if test $ac_cv_lib_svld_dlopen = yes; then
-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
-else
-  { echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
-echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6; }
-if test "${ac_cv_lib_dld_dld_link+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldld  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dld_link ();
-int
-main ()
-{
-return dld_link ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_dld_dld_link=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_dld_dld_link=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
-echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; }
-if test $ac_cv_lib_dld_dld_link = yes; then
-  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
-fi
-
-
-fi
-
-
-fi
-
-
-fi
-
-
-fi
-
-
-fi
-
-    ;;
-  esac
-
-  if test "x$lt_cv_dlopen" != xno; then
-    enable_dlopen=yes
-  else
-    enable_dlopen=no
-  fi
-
-  case $lt_cv_dlopen in
-  dlopen)
-    save_CPPFLAGS="$CPPFLAGS"
-    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
-
-    save_LDFLAGS="$LDFLAGS"
-    eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
-
-    save_LIBS="$LIBS"
-    LIBS="$lt_cv_dlopen_libs $LIBS"
-
-    { echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
-echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6; }
-if test "${lt_cv_dlopen_self+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  	  if test "$cross_compiling" = yes; then :
-  lt_cv_dlopen_self=cross
-else
-  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-  lt_status=$lt_dlunknown
-  cat > conftest.$ac_ext <<EOF
-#line 22771 "configure"
-#include "confdefs.h"
-
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
-
-#include <stdio.h>
-
-#ifdef RTLD_GLOBAL
-#  define LT_DLGLOBAL		RTLD_GLOBAL
-#else
-#  ifdef DL_GLOBAL
-#    define LT_DLGLOBAL		DL_GLOBAL
-#  else
-#    define LT_DLGLOBAL		0
-#  endif
-#endif
-
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
-   find out it does not work in some platform. */
-#ifndef LT_DLLAZY_OR_NOW
-#  ifdef RTLD_LAZY
-#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
-#  else
-#    ifdef DL_LAZY
-#      define LT_DLLAZY_OR_NOW		DL_LAZY
-#    else
-#      ifdef RTLD_NOW
-#        define LT_DLLAZY_OR_NOW	RTLD_NOW
-#      else
-#        ifdef DL_NOW
-#          define LT_DLLAZY_OR_NOW	DL_NOW
-#        else
-#          define LT_DLLAZY_OR_NOW	0
-#        endif
-#      endif
-#    endif
-#  endif
-#endif
-
-#ifdef __cplusplus
-extern "C" void exit (int);
-#endif
-
-void fnord() { int i=42;}
-int main ()
-{
-  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-  int status = $lt_dlunknown;
-
-  if (self)
-    {
-      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
-      /* dlclose (self); */
-    }
-
-    exit (status);
-}
-EOF
-  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
-    (./conftest; exit; ) 2>/dev/null
-    lt_status=$?
-    case x$lt_status in
-      x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
-      x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
-      x$lt_unknown|x*) lt_cv_dlopen_self=no ;;
-    esac
-  else :
-    # compilation failed
-    lt_cv_dlopen_self=no
-  fi
-fi
-rm -fr conftest*
-
-
-fi
-{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
-echo "${ECHO_T}$lt_cv_dlopen_self" >&6; }
-
-    if test "x$lt_cv_dlopen_self" = xyes; then
-      LDFLAGS="$LDFLAGS $link_static_flag"
-      { echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
-echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6; }
-if test "${lt_cv_dlopen_self_static+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  	  if test "$cross_compiling" = yes; then :
-  lt_cv_dlopen_self_static=cross
-else
-  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-  lt_status=$lt_dlunknown
-  cat > conftest.$ac_ext <<EOF
-#line 22869 "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
+  library_names_spec='$libname${shared_ext} $libname.a'
+  dynamic_linker='OS/2 ld.exe'
+  shlibpath_var=LIBPATH
+  ;;
 
-/* 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
+osf3* | osf4* | osf5*)
+  version_type=osf
+  need_lib_prefix=no
+  need_version=no
+  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
+  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+  ;;
 
-#ifdef __cplusplus
-extern "C" void exit (int);
-#endif
+solaris*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  # ldd complains unless libraries are executable
+  postinstall_cmds='chmod +x $lib'
+  ;;
 
-void fnord() { int i=42;}
-int main ()
-{
-  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-  int status = $lt_dlunknown;
+sunos4*)
+  version_type=sunos
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  if test "$with_gnu_ld" = yes; then
+    need_lib_prefix=no
+  fi
+  need_version=yes
+  ;;
 
-  if (self)
-    {
-      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
-      /* dlclose (self); */
-    }
+sysv4 | sysv4.3*)
+  version_type=linux
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  case $host_vendor in
+    sni)
+      shlibpath_overrides_runpath=no
+      need_lib_prefix=no
+      export_dynamic_flag_spec='${wl}-Blargedynsym'
+      runpath_var=LD_RUN_PATH
+      ;;
+    siemens)
+      need_lib_prefix=no
+      ;;
+    motorola)
+      need_lib_prefix=no
+      need_version=no
+      shlibpath_overrides_runpath=no
+      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
+      ;;
+  esac
+  ;;
 
-    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*MP*)
+  if test -d /usr/nec ;then
+    version_type=linux
+    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
+    soname_spec='$libname${shared_ext}.$major'
+    shlibpath_var=LD_LIBRARY_PATH
+  fi
+  ;;
+
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+  version_type=freebsd-elf
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  hardcode_into_libs=yes
+  if test "$with_gnu_ld" = yes; then
+    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
+    shlibpath_overrides_runpath=no
+  else
+    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
+    shlibpath_overrides_runpath=yes
+    case $host_os in
+      sco3.2v5*)
+        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
+	;;
     esac
-  else :
-    # compilation failed
-    lt_cv_dlopen_self_static=no
   fi
-fi
-rm -fr conftest*
+  sys_lib_dlsearch_path_spec='/usr/lib'
+  ;;
+
+uts4*)
+  version_type=linux
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
 
+*)
+  dynamic_linker=no
+  ;;
+esac
+{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
+echo "${ECHO_T}$dynamic_linker" >&6; }
+test "$dynamic_linker" = no && can_build_shared=no
 
+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+if test "$GCC" = yes; then
+  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
 fi
-{ 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
+{ 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
+     # have to relink, otherwise we might link with an installed library
+     # when we should be linking with a yet-to-be-installed one
+     ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, GCJ)" != no &&
+     test "$hardcode_minus_L_GCJ" != no; then
+    # Linking always hardcodes the temporary library directory.
+    hardcode_action_GCJ=relink
+  else
+    # We can link without hardcoding, and we can hardcode nonexisting dirs.
+    hardcode_action_GCJ=immediate
+  fi
+else
+  # We cannot hardcode anything, or else we can only hardcode existing
+  # directories.
+  hardcode_action_GCJ=unsupported
+fi
+{ echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5
+echo "${ECHO_T}$hardcode_action_GCJ" >&6; }
 
-  case $lt_cv_dlopen_self_static in
-  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
-  *) enable_dlopen_self_static=unknown ;;
-  esac
+if test "$hardcode_action_GCJ" = relink; then
+  # Fast installation is not supported
+  enable_fast_install=no
+elif test "$shlibpath_overrides_runpath" = yes ||
+     test "$enable_shared" = no; then
+  # Fast installation is not necessary
+  enable_fast_install=needless
 fi
 
 
@@ -22983,7 +21529,8 @@
   # Now quote all the things that may contain metacharacters while being
   # careful not to overquote the AC_SUBSTed values.  We take copies of the
   # variables and quote the copies for generation of the libtool script.
-  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL \
+  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
+    SED SHELL STRIP \
     libname_spec library_names_spec soname_spec extract_expsyms_cmds \
     old_striplib striplib file_magic_cmd finish_cmds finish_eval \
     deplibs_check_method reload_flag reload_cmds need_locks \
@@ -23083,6 +21630,12 @@
 # The host system.
 host_alias=$host_alias
 host=$host
+host_os=$host_os
+
+# The build system.
+build_alias=$build_alias
+build=$build
+build_os=$build_os
 
 # An echo program that does not interpret backslashes.
 echo=$lt_echo
@@ -23094,6 +21647,9 @@
 # A C compiler.
 LTCC=$lt_LTCC
 
+# LTCC compiler flags.
+LTCFLAGS=$lt_LTCFLAGS
+
 # A language-specific compiler.
 CC=$lt_compiler_GCJ
 
@@ -23113,7 +21669,7 @@
 NM=$lt_NM
 
 # A symbol stripping program
-STRIP=$STRIP
+STRIP=$lt_STRIP
 
 # Used to examine libraries when file_magic_cmd begins "file"
 MAGIC_CMD=$MAGIC_CMD
@@ -23144,7 +21700,7 @@
 libext="$libext"
 
 # Shared library suffix (normally ".so").
-shrext='$shrext'
+shrext_cmds='$shrext_cmds'
 
 # Executable file suffix (normally "").
 exeext="$exeext"
@@ -23159,7 +21715,7 @@
 # Does compiler simultaneously support -c and -o options?
 compiler_c_o=$lt_lt_cv_prog_compiler_c_o_GCJ
 
-# Must we lock files when doing compilation ?
+# Must we lock files when doing compilation?
 need_locks=$lt_need_locks
 
 # Do we need the lib prefix for modules?
@@ -23361,7 +21917,10 @@
   # If there is no Makefile yet, we rely on a make rule to execute
   # `config.status --recheck' to rerun these tests and create the
   # libtool script then.
-  test -f Makefile && make "$ltmain"
+  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
+  if test -f "$ltmain_in"; then
+    test -f Makefile && make "$ltmain"
+  fi
 fi
 
 
@@ -23399,15 +21958,42 @@
 # If no C compiler was specified, use CC.
 LTCC=${LTCC-"$CC"}
 
+# If no C compiler flags were specified, use CFLAGS.
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+
 # Allow CC to be a program name with arguments.
 compiler=$CC
 
 
+# save warnings/boilerplate of simple test code
+ac_outfile=conftest.$ac_objext
+printf "$lt_simple_compile_test_code" >conftest.$ac_ext
+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_compiler_boilerplate=`cat conftest.err`
+$rm conftest*
+
+ac_outfile=conftest.$ac_objext
+printf "$lt_simple_link_test_code" >conftest.$ac_ext
+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_linker_boilerplate=`cat conftest.err`
+$rm conftest*
+
+
 # Allow CC to be a program name with arguments.
 lt_save_CC="$CC"
 CC=${RC-"windres"}
 compiler=$CC
 compiler_RC=$CC
+for cc_temp in $compiler""; do
+  case $cc_temp in
+    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+    \-*) ;;
+    *) break;;
+  esac
+done
+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+
 lt_cv_prog_compiler_c_o_RC=yes
 
 # The else clause should only fire when bootstrapping the
@@ -23423,7 +22009,8 @@
   # Now quote all the things that may contain metacharacters while being
   # careful not to overquote the AC_SUBSTed values.  We take copies of the
   # variables and quote the copies for generation of the libtool script.
-  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL \
+  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
+    SED SHELL STRIP \
     libname_spec library_names_spec soname_spec extract_expsyms_cmds \
     old_striplib striplib file_magic_cmd finish_cmds finish_eval \
     deplibs_check_method reload_flag reload_cmds need_locks \
@@ -23523,6 +22110,12 @@
 # The host system.
 host_alias=$host_alias
 host=$host
+host_os=$host_os
+
+# The build system.
+build_alias=$build_alias
+build=$build
+build_os=$build_os
 
 # An echo program that does not interpret backslashes.
 echo=$lt_echo
@@ -23534,6 +22127,9 @@
 # A C compiler.
 LTCC=$lt_LTCC
 
+# LTCC compiler flags.
+LTCFLAGS=$lt_LTCFLAGS
+
 # A language-specific compiler.
 CC=$lt_compiler_RC
 
@@ -23553,7 +22149,7 @@
 NM=$lt_NM
 
 # A symbol stripping program
-STRIP=$STRIP
+STRIP=$lt_STRIP
 
 # Used to examine libraries when file_magic_cmd begins "file"
 MAGIC_CMD=$MAGIC_CMD
@@ -23584,7 +22180,7 @@
 libext="$libext"
 
 # Shared library suffix (normally ".so").
-shrext='$shrext'
+shrext_cmds='$shrext_cmds'
 
 # Executable file suffix (normally "").
 exeext="$exeext"
@@ -23599,7 +22195,7 @@
 # Does compiler simultaneously support -c and -o options?
 compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC
 
-# Must we lock files when doing compilation ?
+# Must we lock files when doing compilation?
 need_locks=$lt_need_locks
 
 # Do we need the lib prefix for modules?
@@ -23801,7 +22397,10 @@
   # If there is no Makefile yet, we rely on a make rule to execute
   # `config.status --recheck' to rerun these tests and create the
   # libtool script then.
-  test -f Makefile && make "$ltmain"
+  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
+  if test -f "$ltmain_in"; then
+    test -f Makefile && make "$ltmain"
+  fi
 fi
 
 
@@ -23848,7 +22447,7 @@
 LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
 
 # Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool --silent'
+LIBTOOL='$(SHELL) $(top_builddir)/libtool'
 
 # Prevent multiple expansion
 
@@ -23912,9 +22511,7 @@
 fi
 
 
-
-
-if test x"${enable_ltdl_install-no}" != xno; then
+ if test x"${enable_ltdl_install-no}" != xno; then
   INSTALL_LTDL_TRUE=
   INSTALL_LTDL_FALSE='#'
 else
@@ -23922,9 +22519,7 @@
   INSTALL_LTDL_FALSE=
 fi
 
-
-
-if test x"${enable_ltdl_convenience-no}" != xno; then
+ if test x"${enable_ltdl_convenience-no}" != xno; then
   CONVENIENCE_LTDL_TRUE=
   CONVENIENCE_LTDL_FALSE='#'
 else
@@ -24292,27 +22887,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_dl_dlopen=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -24321,7 +22900,7 @@
 	ac_cv_lib_dl_dlopen=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
@@ -24397,27 +22976,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_func_dlopen=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -24426,7 +22989,7 @@
 	ac_cv_func_dlopen=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
 { echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
@@ -24480,27 +23043,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_svld_dlopen=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -24509,7 +23056,7 @@
 	ac_cv_lib_svld_dlopen=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
@@ -24591,27 +23138,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_func_shl_load=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -24620,7 +23151,7 @@
 	ac_cv_func_shl_load=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
 { echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
@@ -24674,27 +23205,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_dld_shl_load=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -24703,7 +23218,7 @@
 	ac_cv_lib_dld_shl_load=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
@@ -24763,27 +23278,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_dld_dld_link=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -24792,7 +23291,7 @@
 	ac_cv_lib_dld_dld_link=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
@@ -24878,27 +23377,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
@@ -24907,7 +23390,7 @@
 	eval "$as_ac_var=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
 ac_res=`eval echo '${'$as_ac_var'}'`
@@ -25176,27 +23659,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -25232,17 +23698,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -25341,27 +23800,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -25397,17 +23839,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -25534,27 +23969,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
@@ -25563,7 +23982,7 @@
 	eval "$as_ac_var=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
 ac_res=`eval echo '${'$as_ac_var'}'`
@@ -25645,27 +24064,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
@@ -25674,7 +24077,7 @@
 	eval "$as_ac_var=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
 ac_res=`eval echo '${'$as_ac_var'}'`
@@ -25756,27 +24159,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
@@ -25785,7 +24172,7 @@
 	eval "$as_ac_var=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
 ac_res=`eval echo '${'$as_ac_var'}'`
@@ -25866,27 +24253,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
@@ -25895,7 +24266,7 @@
 	eval "$as_ac_var=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
 ac_res=`eval echo '${'$as_ac_var'}'`
@@ -25975,7 +24346,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -26074,7 +24445,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -26114,7 +24485,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_RANLIB="ranlib"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -26190,27 +24561,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_type_off_t=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -26270,27 +24624,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_type_size_t=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -26349,27 +24686,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_working_alloca_h=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -26378,7 +24699,7 @@
 	ac_cv_working_alloca_h=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
 { echo "$as_me:$LINENO: result: $ac_cv_working_alloca_h" >&5
@@ -26409,7 +24730,7 @@
 #  include <malloc.h>
 #  define alloca _alloca
 # else
-#  if HAVE_ALLOCA_H
+#  ifdef HAVE_ALLOCA_H
 #   include <alloca.h>
 #  else
 #   ifdef _AIX
@@ -26439,33 +24760,17 @@
   *) ac_try_echo=$ac_try;;
 esac
 eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_func_alloca_works=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -26474,7 +24779,7 @@
 	ac_cv_func_alloca_works=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
 { echo "$as_me:$LINENO: result: $ac_cv_func_alloca_works" >&5
@@ -26594,27 +24899,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
@@ -26623,7 +24912,7 @@
 	eval "$as_ac_var=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
 ac_res=`eval echo '${'$as_ac_var'}'`
@@ -26760,27 +25049,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -26816,17 +25088,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -26952,27 +25217,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
@@ -26981,7 +25230,7 @@
 	eval "$as_ac_var=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
 ac_res=`eval echo '${'$as_ac_var'}'`
@@ -27038,21 +25287,21 @@
 #include <fcntl.h>
 #include <sys/mman.h>
 
-#if !STDC_HEADERS && !HAVE_STDLIB_H
+#if !defined STDC_HEADERS && !defined HAVE_STDLIB_H
 char *malloc ();
 #endif
 
 /* This mess was copied from the GNU getpagesize.h.  */
-#if !HAVE_GETPAGESIZE
+#ifndef HAVE_GETPAGESIZE
 /* Assume that all systems that can run configure have sys/param.h.  */
-# if !HAVE_SYS_PARAM_H
+# ifndef HAVE_SYS_PARAM_H
 #  define HAVE_SYS_PARAM_H 1
 # endif
 
 # ifdef _SC_PAGESIZE
 #  define getpagesize() sysconf(_SC_PAGESIZE)
 # else /* no _SC_PAGESIZE */
-#  if HAVE_SYS_PARAM_H
+#  ifdef HAVE_SYS_PARAM_H
 #   include <sys/param.h>
 #   ifdef EXEC_PAGESIZE
 #    define getpagesize() EXEC_PAGESIZE
@@ -27225,27 +25474,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -27281,17 +25513,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -27426,27 +25651,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
@@ -27455,7 +25664,7 @@
 	eval "$as_ac_var=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
 ac_res=`eval echo '${'$as_ac_var'}'`
@@ -27521,27 +25730,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   kde_cv_func_stpcpy=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -27605,27 +25797,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   am_cv_val_LC_MESSAGES=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -27634,7 +25810,7 @@
 	am_cv_val_LC_MESSAGES=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
 { echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5
@@ -27727,27 +25903,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   kde_cv_stl_works=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -27833,27 +25992,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   eval "$as_ac_Header=yes"
 else
   echo "$as_me: failed program was:" >&5
@@ -27926,27 +26068,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_search_opendir=$ac_res
 else
   echo "$as_me: failed program was:" >&5
@@ -27955,7 +26081,7 @@
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext
   if test "${ac_cv_search_opendir+set}" = set; then
   break
@@ -28026,27 +26152,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_search_opendir=$ac_res
 else
   echo "$as_me: failed program was:" >&5
@@ -28055,7 +26165,7 @@
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext
   if test "${ac_cv_search_opendir+set}" = set; then
   break
@@ -28116,27 +26226,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_header_stdc=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -28283,7 +26376,8 @@
 
 
 
-for ac_header in sys/param.h sys/mman.h sys/time.h sysent.h strings.h sys/stat.h sys/select.h paths.h malloc.h limits.h sys/soundcard.h dlfcn.h termios.h
+
+for ac_header in sys/param.h sys/mman.h sys/time.h sysent.h strings.h sys/stat.h sys/select.h paths.h malloc.h limits.h sys/soundcard.h dlfcn.h termios.h sys/prctl.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
@@ -28321,27 +26415,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -28377,17 +26454,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -28508,27 +26578,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -28564,17 +26617,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_cxx_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -28686,27 +26732,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -28742,17 +26771,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_cxx_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -28875,27 +26897,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_c_acl_init=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -28904,7 +26910,7 @@
 	ac_cv_lib_c_acl_init=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
@@ -28968,27 +26974,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -29024,17 +27013,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_cxx_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -29149,27 +27131,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_acl_acl_init=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -29178,7 +27144,7 @@
 	ac_cv_lib_acl_acl_init=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
@@ -29240,27 +27206,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -29296,17 +27245,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_cxx_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -29426,9 +27368,6 @@
 save_CXXFLAGS="$CXXFLAGS"
 kde_safe_LIBS="$LIBS"
 LIBS="$LIBS $X_EXTRA_LIBS"
-if test "$GXX" = "yes"; then
-CXXFLAGS="$CXXFLAGS -pedantic-errors"
-fi
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -29466,27 +27405,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   kde_cv_func_strlcat=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -29583,27 +27505,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
    kde_cv_func_strlcat=yes
   kde_cv_proto_strlcat=yes
 else
@@ -29614,7 +27520,7 @@
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$kde_safe_libs
 ac_ext=c
@@ -29671,9 +27577,6 @@
 save_CXXFLAGS="$CXXFLAGS"
 kde_safe_LIBS="$LIBS"
 LIBS="$LIBS $X_EXTRA_LIBS"
-if test "$GXX" = "yes"; then
-CXXFLAGS="$CXXFLAGS -pedantic-errors"
-fi
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -29710,27 +27613,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   kde_cv_func_strlcpy=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -29826,27 +27712,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
    kde_cv_func_strlcpy=yes
   kde_cv_proto_strlcpy=yes
 else
@@ -29857,7 +27727,7 @@
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$kde_safe_libs
 ac_ext=c
@@ -29930,27 +27800,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_util_main=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -29959,7 +27813,7 @@
 	ac_cv_lib_util_main=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
@@ -30005,27 +27859,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_compat_main=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -30034,7 +27872,7 @@
 	ac_cv_lib_compat_main=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
@@ -30087,27 +27925,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_crypt_crypt=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -30116,7 +27938,7 @@
 	ac_cv_lib_crypt_crypt=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
@@ -30167,27 +27989,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_c_crypt=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -30196,7 +28002,7 @@
 	ac_cv_lib_c_crypt=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
@@ -30274,27 +28080,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
 
          kde_cv_socklen_t=yes
          kde_cv_socklen_t_equiv=socklen_t
@@ -30367,27 +28156,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
 
                kde_cv_socklen_t_equiv="$t"
                break
@@ -30466,27 +28238,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_dnet_dnet_ntoa=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -30495,7 +28251,7 @@
 	ac_cv_lib_dnet_dnet_ntoa=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
@@ -30548,27 +28304,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_dnet_stub_dnet_ntoa=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -30577,7 +28317,7 @@
 	ac_cv_lib_dnet_stub_dnet_ntoa=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
@@ -30651,27 +28391,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_func_inet_ntoa=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -30680,7 +28404,7 @@
 	ac_cv_func_inet_ntoa=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
 { echo "$as_me:$LINENO: result: $ac_cv_func_inet_ntoa" >&5
@@ -30729,27 +28453,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_nsl_inet_ntoa=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -30758,7 +28466,7 @@
 	ac_cv_lib_nsl_inet_ntoa=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
@@ -30832,27 +28540,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_func_connect=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -30861,7 +28553,7 @@
 	ac_cv_func_connect=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
 { echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
@@ -30910,27 +28602,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_socket_connect=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -30939,7 +28615,7 @@
 	ac_cv_lib_socket_connect=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
@@ -31014,27 +28690,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_func_remove=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -31043,7 +28703,7 @@
 	ac_cv_func_remove=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
 { echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5
@@ -31092,27 +28752,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_posix_remove=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -31121,7 +28765,7 @@
 	ac_cv_lib_posix_remove=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
@@ -31197,27 +28841,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_func_shmat=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -31226,7 +28854,7 @@
 	ac_cv_func_shmat=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
 { echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5
@@ -31276,27 +28904,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_ipc_shmat=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -31305,7 +28917,7 @@
 	ac_cv_lib_ipc_shmat=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
@@ -31359,27 +28971,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -31415,17 +29010,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -31525,27 +29113,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -31581,17 +29152,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -31694,27 +29258,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_poll_poll=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -31723,7 +29271,7 @@
 	ac_cv_lib_poll_poll=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
@@ -31774,27 +29322,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -31830,17 +29361,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -31935,27 +29459,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -31991,17 +29498,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -32103,27 +29603,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
 
       LIBRESOLV="-lresolv"
       { echo "$as_me:$LINENO: result: yes" >&5
@@ -32143,7 +29627,7 @@
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
   LIBS=$kde_libs_safe
 
@@ -32168,9 +29652,6 @@
 save_CXXFLAGS="$CXXFLAGS"
 kde_safe_LIBS="$LIBS"
 LIBS="$LIBS $X_EXTRA_LIBS"
-if test "$GXX" = "yes"; then
-CXXFLAGS="$CXXFLAGS -pedantic-errors"
-fi
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -32208,27 +29689,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   kde_cv_func_res_init=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -32325,27 +29789,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
    kde_cv_func_res_init=yes
   kde_cv_proto_res_init=yes
 else
@@ -32356,7 +29804,7 @@
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$kde_safe_libs
 ac_ext=c
@@ -32439,27 +29887,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_ucb_killpg=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -32468,7 +29900,7 @@
 	ac_cv_lib_ucb_killpg=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
@@ -32527,27 +29959,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_bsd_gethostbyname=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -32556,7 +29972,7 @@
 	ac_cv_lib_bsd_gethostbyname=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
@@ -32605,27 +30021,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_type_int=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -32639,16 +30038,15 @@
 { echo "$as_me:$LINENO: result: $ac_cv_type_int" >&5
 echo "${ECHO_T}$ac_cv_type_int" >&6; }
 
+# The cast to long int works around a bug in the HP C Compiler
+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+# This bug is HP SR number 8606223364.
 { echo "$as_me:$LINENO: checking size of int" >&5
 echo $ECHO_N "checking size of int... $ECHO_C" >&6; }
 if test "${ac_cv_sizeof_int+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  if test "$ac_cv_type_int" = yes; then
-  # The cast to long int works around a bug in the HP C Compiler
-  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-  # This bug is HP SR number 8606223364.
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >conftest.$ac_ext <<_ACEOF
@@ -32658,7 +30056,7 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-		   typedef int ac__type_sizeof_;
+   typedef int ac__type_sizeof_;
 int
 main ()
 {
@@ -32682,27 +30080,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
@@ -32712,7 +30093,7 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-		   typedef int ac__type_sizeof_;
+   typedef int ac__type_sizeof_;
 int
 main ()
 {
@@ -32736,27 +30117,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_hi=$ac_mid; break
 else
   echo "$as_me: failed program was:" >&5
@@ -32783,7 +30147,7 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-		   typedef int ac__type_sizeof_;
+   typedef int ac__type_sizeof_;
 int
 main ()
 {
@@ -32807,27 +30171,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_hi=-1 ac_mid=-1
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
@@ -32837,7 +30184,7 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-		   typedef int ac__type_sizeof_;
+   typedef int ac__type_sizeof_;
 int
 main ()
 {
@@ -32861,27 +30208,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_lo=$ac_mid; break
 else
   echo "$as_me: failed program was:" >&5
@@ -32918,7 +30248,7 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-		   typedef int ac__type_sizeof_;
+   typedef int ac__type_sizeof_;
 int
 main ()
 {
@@ -32942,27 +30272,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_hi=$ac_mid
 else
   echo "$as_me: failed program was:" >&5
@@ -32975,11 +30288,15 @@
 done
 case $ac_lo in
 ?*) ac_cv_sizeof_int=$ac_lo;;
-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (int)
+'') if test "$ac_cv_type_int" = yes; then
+     { { echo "$as_me:$LINENO: error: cannot compute sizeof (int)
 See \`config.log' for more details." >&5
 echo "$as_me: error: cannot compute sizeof (int)
 See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; } ;;
+   { (exit 77); exit 77; }; }
+   else
+     ac_cv_sizeof_int=0
+   fi ;;
 esac
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -32989,7 +30306,7 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-		   typedef int ac__type_sizeof_;
+   typedef int ac__type_sizeof_;
 static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
 static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
 #include <stdio.h>
@@ -33048,21 +30365,25 @@
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (int)
+if test "$ac_cv_type_int" = yes; then
+     { { echo "$as_me:$LINENO: error: cannot compute sizeof (int)
 See \`config.log' for more details." >&5
 echo "$as_me: error: cannot compute sizeof (int)
 See \`config.log' for more details." >&2;}
    { (exit 77); exit 77; }; }
+   else
+     ac_cv_sizeof_int=0
+   fi
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f conftest.val
-else
-  ac_cv_sizeof_int=0
-fi
 fi
 { 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
@@ -33086,45 +30407,28 @@
 if ((ac__type_new_ *) 0)
   return 0;
 if (sizeof (ac__type_new_))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
+  return 0;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_type_short=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -33138,16 +30442,15 @@
 { echo "$as_me:$LINENO: result: $ac_cv_type_short" >&5
 echo "${ECHO_T}$ac_cv_type_short" >&6; }
 
+# The cast to long int works around a bug in the HP C Compiler
+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+# This bug is HP SR number 8606223364.
 { echo "$as_me:$LINENO: checking size of short" >&5
 echo $ECHO_N "checking size of short... $ECHO_C" >&6; }
 if test "${ac_cv_sizeof_short+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  if test "$ac_cv_type_short" = yes; then
-  # The cast to long int works around a bug in the HP C Compiler
-  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-  # This bug is HP SR number 8606223364.
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >conftest.$ac_ext <<_ACEOF
@@ -33157,7 +30460,7 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-		   typedef short ac__type_sizeof_;
+   typedef short ac__type_sizeof_;
 int
 main ()
 {
@@ -33181,27 +30484,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
@@ -33211,7 +30497,7 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-		   typedef short ac__type_sizeof_;
+   typedef short ac__type_sizeof_;
 int
 main ()
 {
@@ -33235,27 +30521,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_hi=$ac_mid; break
 else
   echo "$as_me: failed program was:" >&5
@@ -33282,7 +30551,7 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-		   typedef short ac__type_sizeof_;
+   typedef short ac__type_sizeof_;
 int
 main ()
 {
@@ -33306,27 +30575,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_hi=-1 ac_mid=-1
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
@@ -33336,7 +30588,7 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-		   typedef short ac__type_sizeof_;
+   typedef short ac__type_sizeof_;
 int
 main ()
 {
@@ -33360,27 +30612,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_lo=$ac_mid; break
 else
   echo "$as_me: failed program was:" >&5
@@ -33417,7 +30652,7 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-		   typedef short ac__type_sizeof_;
+   typedef short ac__type_sizeof_;
 int
 main ()
 {
@@ -33441,27 +30676,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_hi=$ac_mid
 else
   echo "$as_me: failed program was:" >&5
@@ -33474,11 +30692,15 @@
 done
 case $ac_lo in
 ?*) ac_cv_sizeof_short=$ac_lo;;
-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (short)
+'') if test "$ac_cv_type_short" = yes; then
+     { { echo "$as_me:$LINENO: error: cannot compute sizeof (short)
 See \`config.log' for more details." >&5
 echo "$as_me: error: cannot compute sizeof (short)
 See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; } ;;
+   { (exit 77); exit 77; }; }
+   else
+     ac_cv_sizeof_short=0
+   fi ;;
 esac
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -33488,7 +30710,7 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-		   typedef short ac__type_sizeof_;
+   typedef short ac__type_sizeof_;
 static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
 static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
 #include <stdio.h>
@@ -33547,21 +30769,25 @@
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (short)
+if test "$ac_cv_type_short" = yes; then
+     { { echo "$as_me:$LINENO: error: cannot compute sizeof (short)
 See \`config.log' for more details." >&5
 echo "$as_me: error: cannot compute sizeof (short)
 See \`config.log' for more details." >&2;}
    { (exit 77); exit 77; }; }
+   else
+     ac_cv_sizeof_short=0
+   fi
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f conftest.val
-else
-  ac_cv_sizeof_short=0
-fi
 fi
 { 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
@@ -33603,27 +30829,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_type_long=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -33637,16 +30846,15 @@
 { echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5
 echo "${ECHO_T}$ac_cv_type_long" >&6; }
 
+# The cast to long int works around a bug in the HP C Compiler
+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+# This bug is HP SR number 8606223364.
 { echo "$as_me:$LINENO: checking size of long" >&5
 echo $ECHO_N "checking size of long... $ECHO_C" >&6; }
 if test "${ac_cv_sizeof_long+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  if test "$ac_cv_type_long" = yes; then
-  # The cast to long int works around a bug in the HP C Compiler
-  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-  # This bug is HP SR number 8606223364.
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >conftest.$ac_ext <<_ACEOF
@@ -33656,7 +30864,7 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-		   typedef long ac__type_sizeof_;
+   typedef long ac__type_sizeof_;
 int
 main ()
 {
@@ -33680,27 +30888,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
@@ -33710,7 +30901,7 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-		   typedef long ac__type_sizeof_;
+   typedef long ac__type_sizeof_;
 int
 main ()
 {
@@ -33734,27 +30925,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_hi=$ac_mid; break
 else
   echo "$as_me: failed program was:" >&5
@@ -33781,7 +30955,7 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-		   typedef long ac__type_sizeof_;
+   typedef long ac__type_sizeof_;
 int
 main ()
 {
@@ -33805,27 +30979,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_hi=-1 ac_mid=-1
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
@@ -33835,7 +30992,7 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-		   typedef long ac__type_sizeof_;
+   typedef long ac__type_sizeof_;
 int
 main ()
 {
@@ -33859,27 +31016,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_lo=$ac_mid; break
 else
   echo "$as_me: failed program was:" >&5
@@ -33916,7 +31056,7 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-		   typedef long ac__type_sizeof_;
+   typedef long ac__type_sizeof_;
 int
 main ()
 {
@@ -33940,27 +31080,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_hi=$ac_mid
 else
   echo "$as_me: failed program was:" >&5
@@ -33973,11 +31096,15 @@
 done
 case $ac_lo in
 ?*) ac_cv_sizeof_long=$ac_lo;;
-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
+'') if test "$ac_cv_type_long" = yes; then
+     { { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
 See \`config.log' for more details." >&5
 echo "$as_me: error: cannot compute sizeof (long)
 See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; } ;;
+   { (exit 77); exit 77; }; }
+   else
+     ac_cv_sizeof_long=0
+   fi ;;
 esac
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -33987,7 +31114,7 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-		   typedef long ac__type_sizeof_;
+   typedef long ac__type_sizeof_;
 static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
 static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
 #include <stdio.h>
@@ -34046,21 +31173,25 @@
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
+if test "$ac_cv_type_long" = yes; then
+     { { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
 See \`config.log' for more details." >&5
 echo "$as_me: error: cannot compute sizeof (long)
 See \`config.log' for more details." >&2;}
    { (exit 77); exit 77; }; }
+   else
+     ac_cv_sizeof_long=0
+   fi
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f conftest.val
-else
-  ac_cv_sizeof_long=0
-fi
 fi
 { 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
@@ -34102,27 +31233,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_type_char_p=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -34136,16 +31250,15 @@
 { echo "$as_me:$LINENO: result: $ac_cv_type_char_p" >&5
 echo "${ECHO_T}$ac_cv_type_char_p" >&6; }
 
+# The cast to long int works around a bug in the HP C Compiler
+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+# This bug is HP SR number 8606223364.
 { echo "$as_me:$LINENO: checking size of char *" >&5
 echo $ECHO_N "checking size of char *... $ECHO_C" >&6; }
 if test "${ac_cv_sizeof_char_p+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  if test "$ac_cv_type_char_p" = yes; then
-  # The cast to long int works around a bug in the HP C Compiler
-  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-  # This bug is HP SR number 8606223364.
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >conftest.$ac_ext <<_ACEOF
@@ -34155,7 +31268,7 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-		   typedef char * ac__type_sizeof_;
+   typedef char * ac__type_sizeof_;
 int
 main ()
 {
@@ -34179,27 +31292,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
@@ -34209,7 +31305,7 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-		   typedef char * ac__type_sizeof_;
+   typedef char * ac__type_sizeof_;
 int
 main ()
 {
@@ -34233,27 +31329,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_hi=$ac_mid; break
 else
   echo "$as_me: failed program was:" >&5
@@ -34280,7 +31359,7 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-		   typedef char * ac__type_sizeof_;
+   typedef char * ac__type_sizeof_;
 int
 main ()
 {
@@ -34304,27 +31383,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_hi=-1 ac_mid=-1
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
@@ -34334,7 +31396,7 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-		   typedef char * ac__type_sizeof_;
+   typedef char * ac__type_sizeof_;
 int
 main ()
 {
@@ -34358,27 +31420,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_lo=$ac_mid; break
 else
   echo "$as_me: failed program was:" >&5
@@ -34415,7 +31460,7 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-		   typedef char * ac__type_sizeof_;
+   typedef char * ac__type_sizeof_;
 int
 main ()
 {
@@ -34439,27 +31484,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_hi=$ac_mid
 else
   echo "$as_me: failed program was:" >&5
@@ -34472,11 +31500,15 @@
 done
 case $ac_lo in
 ?*) ac_cv_sizeof_char_p=$ac_lo;;
-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (char *)
+'') if test "$ac_cv_type_char_p" = yes; then
+     { { echo "$as_me:$LINENO: error: cannot compute sizeof (char *)
 See \`config.log' for more details." >&5
 echo "$as_me: error: cannot compute sizeof (char *)
 See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; } ;;
+   { (exit 77); exit 77; }; }
+   else
+     ac_cv_sizeof_char_p=0
+   fi ;;
 esac
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -34486,7 +31518,7 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-		   typedef char * ac__type_sizeof_;
+   typedef char * ac__type_sizeof_;
 static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
 static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
 #include <stdio.h>
@@ -34545,21 +31577,25 @@
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (char *)
+if test "$ac_cv_type_char_p" = yes; then
+     { { echo "$as_me:$LINENO: error: cannot compute sizeof (char *)
 See \`config.log' for more details." >&5
 echo "$as_me: error: cannot compute sizeof (char *)
 See \`config.log' for more details." >&2;}
    { (exit 77); exit 77; }; }
+   else
+     ac_cv_sizeof_char_p=0
+   fi
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f conftest.val
-else
-  ac_cv_sizeof_char_p=0
-fi
 fi
 { 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
@@ -34608,27 +31644,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_dl_dlopen=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -34637,7 +31657,7 @@
 	ac_cv_lib_dl_dlopen=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
@@ -34693,27 +31713,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_dld_shl_unload=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -34722,7 +31726,7 @@
 	ac_cv_lib_dld_shl_unload=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
@@ -34778,27 +31782,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_type_size_t=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -34812,16 +31799,15 @@
 { echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
 echo "${ECHO_T}$ac_cv_type_size_t" >&6; }
 
+# The cast to long int works around a bug in the HP C Compiler
+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+# This bug is HP SR number 8606223364.
 { echo "$as_me:$LINENO: checking size of size_t" >&5
 echo $ECHO_N "checking size of size_t... $ECHO_C" >&6; }
 if test "${ac_cv_sizeof_size_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  if test "$ac_cv_type_size_t" = yes; then
-  # The cast to long int works around a bug in the HP C Compiler
-  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-  # This bug is HP SR number 8606223364.
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >conftest.$ac_ext <<_ACEOF
@@ -34831,7 +31817,7 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-		   typedef size_t ac__type_sizeof_;
+   typedef size_t ac__type_sizeof_;
 int
 main ()
 {
@@ -34855,27 +31841,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
@@ -34885,7 +31854,7 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-		   typedef size_t ac__type_sizeof_;
+   typedef size_t ac__type_sizeof_;
 int
 main ()
 {
@@ -34909,27 +31878,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_hi=$ac_mid; break
 else
   echo "$as_me: failed program was:" >&5
@@ -34956,7 +31908,7 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-		   typedef size_t ac__type_sizeof_;
+   typedef size_t ac__type_sizeof_;
 int
 main ()
 {
@@ -34980,27 +31932,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_hi=-1 ac_mid=-1
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
@@ -35010,7 +31945,7 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-		   typedef size_t ac__type_sizeof_;
+   typedef size_t ac__type_sizeof_;
 int
 main ()
 {
@@ -35034,27 +31969,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_lo=$ac_mid; break
 else
   echo "$as_me: failed program was:" >&5
@@ -35091,7 +32009,7 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-		   typedef size_t ac__type_sizeof_;
+   typedef size_t ac__type_sizeof_;
 int
 main ()
 {
@@ -35115,27 +32033,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_hi=$ac_mid
 else
   echo "$as_me: failed program was:" >&5
@@ -35148,11 +32049,15 @@
 done
 case $ac_lo in
 ?*) ac_cv_sizeof_size_t=$ac_lo;;
-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (size_t)
+'') if test "$ac_cv_type_size_t" = yes; then
+     { { echo "$as_me:$LINENO: error: cannot compute sizeof (size_t)
 See \`config.log' for more details." >&5
 echo "$as_me: error: cannot compute sizeof (size_t)
 See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; } ;;
+   { (exit 77); exit 77; }; }
+   else
+     ac_cv_sizeof_size_t=0
+   fi ;;
 esac
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -35162,7 +32067,7 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-		   typedef size_t ac__type_sizeof_;
+   typedef size_t ac__type_sizeof_;
 static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
 static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
 #include <stdio.h>
@@ -35221,21 +32126,25 @@
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (size_t)
+if test "$ac_cv_type_size_t" = yes; then
+     { { echo "$as_me:$LINENO: error: cannot compute sizeof (size_t)
 See \`config.log' for more details." >&5
 echo "$as_me: error: cannot compute sizeof (size_t)
 See \`config.log' for more details." >&2;}
    { (exit 77); exit 77; }; }
+   else
+     ac_cv_sizeof_size_t=0
+   fi
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f conftest.val
-else
-  ac_cv_sizeof_size_t=0
-fi
 fi
 { 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
@@ -35278,27 +32187,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_type_unsigned_long=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -35312,16 +32204,15 @@
 { echo "$as_me:$LINENO: result: $ac_cv_type_unsigned_long" >&5
 echo "${ECHO_T}$ac_cv_type_unsigned_long" >&6; }
 
+# The cast to long int works around a bug in the HP C Compiler
+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+# This bug is HP SR number 8606223364.
 { echo "$as_me:$LINENO: checking size of unsigned long" >&5
 echo $ECHO_N "checking size of unsigned long... $ECHO_C" >&6; }
 if test "${ac_cv_sizeof_unsigned_long+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  if test "$ac_cv_type_unsigned_long" = yes; then
-  # The cast to long int works around a bug in the HP C Compiler
-  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-  # This bug is HP SR number 8606223364.
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >conftest.$ac_ext <<_ACEOF
@@ -35331,7 +32222,7 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-		   typedef unsigned long ac__type_sizeof_;
+   typedef unsigned long ac__type_sizeof_;
 int
 main ()
 {
@@ -35349,33 +32240,16 @@
   *) ac_try_echo=$ac_try;;
 esac
 eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
@@ -35385,7 +32259,7 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-		   typedef unsigned long ac__type_sizeof_;
+   typedef unsigned long ac__type_sizeof_;
 int
 main ()
 {
@@ -35409,27 +32283,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_hi=$ac_mid; break
 else
   echo "$as_me: failed program was:" >&5
@@ -35456,7 +32313,7 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-		   typedef unsigned long ac__type_sizeof_;
+   typedef unsigned long ac__type_sizeof_;
 int
 main ()
 {
@@ -35480,27 +32337,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_hi=-1 ac_mid=-1
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
@@ -35510,7 +32350,7 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-		   typedef unsigned long ac__type_sizeof_;
+   typedef unsigned long ac__type_sizeof_;
 int
 main ()
 {
@@ -35534,27 +32374,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_lo=$ac_mid; break
 else
   echo "$as_me: failed program was:" >&5
@@ -35591,7 +32414,7 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-		   typedef unsigned long ac__type_sizeof_;
+   typedef unsigned long ac__type_sizeof_;
 int
 main ()
 {
@@ -35615,27 +32438,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_hi=$ac_mid
 else
   echo "$as_me: failed program was:" >&5
@@ -35648,11 +32454,15 @@
 done
 case $ac_lo in
 ?*) ac_cv_sizeof_unsigned_long=$ac_lo;;
-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long)
+'') if test "$ac_cv_type_unsigned_long" = yes; then
+     { { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long)
 See \`config.log' for more details." >&5
 echo "$as_me: error: cannot compute sizeof (unsigned long)
 See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; } ;;
+   { (exit 77); exit 77; }; }
+   else
+     ac_cv_sizeof_unsigned_long=0
+   fi ;;
 esac
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -35662,7 +32472,7 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-		   typedef unsigned long ac__type_sizeof_;
+   typedef unsigned long ac__type_sizeof_;
 static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
 static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
 #include <stdio.h>
@@ -35721,21 +32531,25 @@
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long)
+if test "$ac_cv_type_unsigned_long" = yes; then
+     { { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long)
 See \`config.log' for more details." >&5
 echo "$as_me: error: cannot compute sizeof (unsigned long)
 See \`config.log' for more details." >&2;}
    { (exit 77); exit 77; }; }
+   else
+     ac_cv_sizeof_unsigned_long=0
+   fi
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f conftest.val
-else
-  ac_cv_sizeof_unsigned_long=0
-fi
 fi
 { 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
@@ -35776,27 +32590,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   { echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6; }
 else
@@ -35870,27 +32667,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   kde_cv_val_pie_support=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -35899,7 +32680,7 @@
 	kde_cv_val_pie_support=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 
     CXXFLAGS=$safe_CXXFLAGS
@@ -35985,27 +32766,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -36041,17 +32805,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -36173,27 +32930,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_func__NSGetEnviron=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -36202,7 +32943,7 @@
 	ac_cv_func__NSGetEnviron=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
 { echo "$as_me:$LINENO: result: $ac_cv_func__NSGetEnviron" >&5
@@ -36290,27 +33031,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
@@ -36319,7 +33044,7 @@
 	eval "$as_ac_var=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
 ac_res=`eval echo '${'$as_ac_var'}'`
@@ -36369,9 +33094,7 @@
 
 
 # used to disable x11-specific stuff on special platforms
-
-
-if test "$kde_use_qt_emb" = "no" && test "$kde_use_qt_mac" = "no"; then
+ if test "$kde_use_qt_emb" = "no" && test "$kde_use_qt_mac" = "no"; then
   include_x11_TRUE=
   include_x11_FALSE='#'
 else
@@ -36432,17 +33155,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   # We can compile using X headers with no special include directory.
 ac_x_includes=
 else
@@ -36535,27 +33251,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   LIBS="$ac_save_LIBS"
 # We can link X programs with no special library path.
 ac_x_libraries=
@@ -36612,7 +33312,7 @@
 done
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi # $ac_x_libraries = NO
 
@@ -36777,27 +33477,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_ICE_IceConnectionNumber=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -36806,7 +33490,7 @@
 	ac_cv_lib_ICE_IceConnectionNumber=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
@@ -36867,27 +33551,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   kde_cv_have_libXext=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -36897,7 +33565,7 @@
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 
 LDFLAGS=$kde_ldflags_safe
@@ -37107,27 +33775,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   eval "$as_ac_Lib=yes"
 else
   echo "$as_me: failed program was:" >&5
@@ -37136,7 +33788,7 @@
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
@@ -37197,27 +33849,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_pthread_pthread_create=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -37226,7 +33862,7 @@
 	ac_cv_lib_pthread_pthread_create=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
@@ -37271,27 +33907,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
 
         { echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6; }
@@ -37305,7 +33925,7 @@
 echo "${ECHO_T}no" >&6; }
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
     LIBS=$kde_safe_libs
   fi
@@ -37367,27 +33987,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   eval "kde_cv_prog_cxx_$kde_cache=yes"
 else
   echo "$as_me: failed program was:" >&5
@@ -37396,7 +34000,7 @@
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
   CXXFLAGS="$save_CXXFLAGS"
   ac_ext=c
@@ -37474,27 +34078,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   eval "kde_cv_prog_cxx_$kde_cache=yes"
 else
   echo "$as_me: failed program was:" >&5
@@ -37503,7 +34091,7 @@
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
   CXXFLAGS="$save_CXXFLAGS"
   ac_ext=c
@@ -37663,27 +34251,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   eval "ac_cv_lib_z='-lz'"
 else
   echo "$as_me: failed program was:" >&5
@@ -37692,7 +34264,7 @@
 	eval "ac_cv_lib_z=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS="$kde_save_LIBS"
 CFLAGS="$kde_save_CFLAGS"
@@ -37775,27 +34347,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   eval "ac_cv_lib_png='-lpng $LIBZ -lm'"
 else
   echo "$as_me: failed program was:" >&5
@@ -37805,7 +34361,7 @@
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS="$kde_save_LIBS"
 CFLAGS="$kde_save_CFLAGS"
@@ -37876,27 +34432,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   eval "ac_cv_lib_jpeg_6b=-ljpeg6b"
 else
   echo "$as_me: failed program was:" >&5
@@ -37905,7 +34445,7 @@
 	eval "ac_cv_lib_jpeg_6b=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS="$ac_save_LIBS"
 CFLAGS="$ac_save_CFLAGS"
@@ -37967,27 +34507,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   eval "ac_cv_lib_jpeg_normal=-ljpeg"
 else
   echo "$as_me: failed program was:" >&5
@@ -37996,7 +34520,7 @@
 	eval "ac_cv_lib_jpeg_normal=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS="$ac_save_LIBS"
 CFLAGS="$ac_save_CFLAGS"
@@ -38030,7 +34554,7 @@
 do
   for j in jpeglib.h;
   do
-    echo "configure: 38033: $i/$j" >&5
+    echo "configure: 34557: $i/$j" >&5
     if test -r "$i/$j"; then
       echo "taking that" >&5
       jpeg_incdir=$i
@@ -38328,7 +34852,7 @@
 do
   for j in $kde_qt_header;
   do
-    echo "configure: 38331: $i/$j" >&5
+    echo "configure: 34855: $i/$j" >&5
     if test -r "$i/$j"; then
       echo "taking that" >&5
       qt_incdir=$i
@@ -39006,27 +35530,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   eval "kde_cv_qt_jpeg=no"
 else
   echo "$as_me: failed program was:" >&5
@@ -39035,7 +35543,7 @@
 	eval "kde_cv_qt_jpeg=yes"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS="$ac_save_LIBS"
 CXXFLAGS="$ac_save_CXXFLAGS"
@@ -39174,7 +35682,7 @@
 do
   for j in $kde_check_header;
   do
-    echo "configure: 39177: $i/$j" >&5
+    echo "configure: 35685: $i/$j" >&5
     if test -r "$i/$j"; then
       echo "taking that" >&5
       kde_incdir=$i
@@ -39204,7 +35712,7 @@
 do
   for j in $kde_check_lib;
   do
-    echo "configure: 39207: $i/$j" >&5
+    echo "configure: 35715: $i/$j" >&5
     if test -r "$i/$j"; then
       echo "taking that" >&5
       kde_libdir=$i
@@ -39222,7 +35730,7 @@
 do
   for j in "kde3/plugins/designer/kdewidgets.la";
   do
-    echo "configure: 39225: $i/$j" >&5
+    echo "configure: 35733: $i/$j" >&5
     if test -r "$i/$j"; then
       echo "taking that" >&5
       kde_widgetdir=$i
@@ -39512,27 +36020,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   eval "kde_cv_prog_cxx_$kde_cache=yes"
 else
   echo "$as_me: failed program was:" >&5
@@ -39541,7 +36033,7 @@
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
   CXXFLAGS="$save_CXXFLAGS"
   ac_ext=c
@@ -39621,27 +36113,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   kde_cv_val_qt_gcc_visibility_patched=no
 else
   echo "$as_me: failed program was:" >&5
@@ -39727,27 +36202,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   kde_cv_val_gcc_visibility_bug=no
 else
   echo "$as_me: failed program was:" >&5
@@ -39756,7 +36215,7 @@
 	kde_cv_val_gcc_visibility_bug=yes
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 
         CXXFLAGS=$safe_CXXFLAGS
@@ -40430,9 +36889,7 @@
 
 fi
 
-
-
-if test "$build_arts" '!=' "no"; then
+     if test "$build_arts" '!=' "no"; then
   include_ARTS_TRUE=
   include_ARTS_FALSE='#'
 else
@@ -41109,7 +37566,7 @@
 do
   for j in apps/ksgmltools2/customization/kde-chunk.xsl;
   do
-    echo "configure: 41112: $i/$j" >&5
+    echo "configure: 37569: $i/$j" >&5
     if test -r "$i/$j"; then
       echo "taking that" >&5
       KDE_XSL_STYLESHEET=$i
@@ -41349,27 +37806,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   eval "$as_ac_Header=yes"
 else
   echo "$as_me: failed program was:" >&5
@@ -41447,27 +37887,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   eval "$as_ac_Header=yes"
 else
   echo "$as_me: failed program was:" >&5
@@ -41537,44 +37960,27 @@
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
+/* end confdefs.h.  */
+$ac_includes_default
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -41610,17 +38016,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_cxx_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -41734,27 +38133,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -41790,17 +38172,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_cxx_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -41902,27 +38277,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_header_time=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -41969,7 +38327,8 @@
 int
 main ()
 {
-#if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN
+#if  ! (defined BYTE_ORDER && defined BIG_ENDIAN && defined LITTLE_ENDIAN \
+	&& BYTE_ORDER && BIG_ENDIAN && LITTLE_ENDIAN)
  bogus endian macros
 #endif
 
@@ -41990,27 +38349,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   # It does; now see whether it defined to BIG_ENDIAN or not.
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -42045,27 +38387,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_c_bigendian=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -42116,27 +38441,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   if grep BIGenDianSyS conftest.$ac_objext >/dev/null ; then
   ac_cv_c_bigendian=yes
 fi
@@ -42273,9 +38581,6 @@
 save_CXXFLAGS="$CXXFLAGS"
 kde_safe_LIBS="$LIBS"
 LIBS="$LIBS $X_EXTRA_LIBS"
-if test "$GXX" = "yes"; then
-CXXFLAGS="$CXXFLAGS -pedantic-errors"
-fi
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -42310,27 +38615,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   kde_cv_func_setenv=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -42424,27 +38712,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
    kde_cv_func_setenv=yes
   kde_cv_proto_setenv=yes
 else
@@ -42455,7 +38727,7 @@
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$kde_safe_libs
 ac_ext=c
@@ -42512,9 +38784,6 @@
 save_CXXFLAGS="$CXXFLAGS"
 kde_safe_LIBS="$LIBS"
 LIBS="$LIBS $X_EXTRA_LIBS"
-if test "$GXX" = "yes"; then
-CXXFLAGS="$CXXFLAGS -pedantic-errors"
-fi
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -42549,27 +38818,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   kde_cv_func_unsetenv=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -42663,27 +38915,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
    kde_cv_func_unsetenv=yes
   kde_cv_proto_unsetenv=yes
 else
@@ -42694,7 +38930,7 @@
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$kde_safe_libs
 ac_ext=c
@@ -42751,9 +38987,6 @@
 save_CXXFLAGS="$CXXFLAGS"
 kde_safe_LIBS="$LIBS"
 LIBS="$LIBS $X_EXTRA_LIBS"
-if test "$GXX" = "yes"; then
-CXXFLAGS="$CXXFLAGS -pedantic-errors"
-fi
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -42790,27 +39023,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   kde_cv_func_random=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -42906,27 +39122,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
    kde_cv_func_random=yes
   kde_cv_proto_random=yes
 else
@@ -42937,7 +39137,7 @@
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$kde_safe_libs
 ac_ext=c
@@ -42993,9 +39193,6 @@
 save_CXXFLAGS="$CXXFLAGS"
 kde_safe_LIBS="$LIBS"
 LIBS="$LIBS $X_EXTRA_LIBS"
-if test "$GXX" = "yes"; then
-CXXFLAGS="$CXXFLAGS -pedantic-errors"
-fi
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -43032,27 +39229,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   kde_cv_func_srandom=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -43148,27 +39328,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
    kde_cv_func_srandom=yes
   kde_cv_proto_srandom=yes
 else
@@ -43179,7 +39343,7 @@
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$kde_safe_libs
 ac_ext=c
@@ -43237,9 +39401,6 @@
 save_CXXFLAGS="$CXXFLAGS"
 kde_safe_LIBS="$LIBS"
 LIBS="$LIBS $X_EXTRA_LIBS"
-if test "$GXX" = "yes"; then
-CXXFLAGS="$CXXFLAGS -pedantic-errors"
-fi
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -43277,27 +39438,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   kde_cv_func_mkstemps=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -43394,27 +39538,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
    kde_cv_func_mkstemps=yes
   kde_cv_proto_mkstemps=yes
 else
@@ -43425,7 +39553,7 @@
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$kde_safe_libs
 ac_ext=c
@@ -43482,9 +39610,6 @@
 save_CXXFLAGS="$CXXFLAGS"
 kde_safe_LIBS="$LIBS"
 LIBS="$LIBS $X_EXTRA_LIBS"
-if test "$GXX" = "yes"; then
-CXXFLAGS="$CXXFLAGS -pedantic-errors"
-fi
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -43522,27 +39647,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   kde_cv_func_mkstemp=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -43639,27 +39747,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
    kde_cv_func_mkstemp=yes
   kde_cv_proto_mkstemp=yes
 else
@@ -43670,7 +39762,7 @@
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$kde_safe_libs
 ac_ext=c
@@ -43727,9 +39819,6 @@
 save_CXXFLAGS="$CXXFLAGS"
 kde_safe_LIBS="$LIBS"
 LIBS="$LIBS $X_EXTRA_LIBS"
-if test "$GXX" = "yes"; then
-CXXFLAGS="$CXXFLAGS -pedantic-errors"
-fi
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -43767,27 +39856,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   kde_cv_func_mkdtemp=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -43884,27 +39956,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
    kde_cv_func_mkdtemp=yes
   kde_cv_proto_mkdtemp=yes
 else
@@ -43915,7 +39971,7 @@
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$kde_safe_libs
 ac_ext=c
@@ -43960,7 +40016,9 @@
 
 
 
-for ac_func in strtoll socket seteuid setegid strfmon stpcpy gettimeofday readdir_r setpriority
+
+
+for ac_func in strtoll socket seteuid setegid strfmon stpcpy gettimeofday readdir_r setpriority tcgetattr tcsetattr
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 { echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -44026,27 +40084,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
@@ -44055,7 +40097,7 @@
 	eval "$as_ac_var=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
 ac_res=`eval echo '${'$as_ac_var'}'`
@@ -44094,9 +40136,6 @@
 save_CXXFLAGS="$CXXFLAGS"
 kde_safe_LIBS="$LIBS"
 LIBS="$LIBS $X_EXTRA_LIBS"
-if test "$GXX" = "yes"; then
-CXXFLAGS="$CXXFLAGS -pedantic-errors"
-fi
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -44133,27 +40172,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   kde_cv_func_usleep=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -44249,27 +40271,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
    kde_cv_func_usleep=yes
   kde_cv_proto_usleep=yes
 else
@@ -44280,7 +40286,7 @@
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$kde_safe_libs
 ac_ext=c
@@ -44337,9 +40343,6 @@
 save_CXXFLAGS="$CXXFLAGS"
 kde_safe_LIBS="$LIBS"
 LIBS="$LIBS $X_EXTRA_LIBS"
-if test "$GXX" = "yes"; then
-CXXFLAGS="$CXXFLAGS -pedantic-errors"
-fi
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -44378,27 +40381,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   kde_cv_func_gethostname=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -44496,27 +40482,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
    kde_cv_func_gethostname=yes
   kde_cv_proto_gethostname=yes
 else
@@ -44527,7 +40497,7 @@
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$kde_safe_libs
 ac_ext=c
@@ -44584,9 +40554,6 @@
 save_CXXFLAGS="$CXXFLAGS"
 kde_safe_LIBS="$LIBS"
 LIBS="$LIBS $X_EXTRA_LIBS"
-if test "$GXX" = "yes"; then
-CXXFLAGS="$CXXFLAGS -pedantic-errors"
-fi
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -44623,27 +40590,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   kde_cv_func_random=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -44739,27 +40689,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
    kde_cv_func_random=yes
   kde_cv_proto_random=yes
 else
@@ -44770,7 +40704,7 @@
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$kde_safe_libs
 ac_ext=c
@@ -44826,9 +40760,6 @@
 save_CXXFLAGS="$CXXFLAGS"
 kde_safe_LIBS="$LIBS"
 LIBS="$LIBS $X_EXTRA_LIBS"
-if test "$GXX" = "yes"; then
-CXXFLAGS="$CXXFLAGS -pedantic-errors"
-fi
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -44865,27 +40796,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   kde_cv_func_srandom=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -44977,31 +40891,15 @@
 eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
    kde_cv_func_srandom=yes
   kde_cv_proto_srandom=yes
 else
@@ -45012,7 +40910,7 @@
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$kde_safe_libs
 ac_ext=c
@@ -45089,27 +40987,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_have_s_issock=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -45118,7 +41000,7 @@
 	ac_cv_have_s_issock=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 
 fi
@@ -45158,9 +41040,6 @@
 save_CXXFLAGS="$CXXFLAGS"
 kde_safe_LIBS="$LIBS"
 LIBS="$LIBS $X_EXTRA_LIBS"
-if test "$GXX" = "yes"; then
-CXXFLAGS="$CXXFLAGS -pedantic-errors"
-fi
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -45200,27 +41079,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   kde_cv_func_initgroups=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -45319,27 +41181,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
    kde_cv_func_initgroups=yes
   kde_cv_proto_initgroups=yes
 else
@@ -45350,7 +41196,7 @@
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$kde_safe_libs
 ac_ext=c
@@ -45467,27 +41313,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   { echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6; }
 
@@ -45503,7 +41333,7 @@
 echo "${ECHO_T}no" >&6; }
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -45672,27 +41502,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_func_posix_fadvise=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -45701,7 +41515,7 @@
 	ac_cv_func_posix_fadvise=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
 { echo "$as_me:$LINENO: result: $ac_cv_func_posix_fadvise" >&5
@@ -45800,27 +41614,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
@@ -45829,7 +41627,7 @@
 	eval "$as_ac_var=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
 ac_res=`eval echo '${'$as_ac_var'}'`
@@ -46004,27 +41802,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_utempter_addToUtmp=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -46033,7 +41815,7 @@
 	ac_cv_lib_utempter_addToUtmp=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
@@ -46074,7 +41856,7 @@
 do
   for j in qsql.html;
   do
-    echo "configure: 46077: $i/$j" >&5
+    echo "configure: 41859: $i/$j" >&5
     if test -r "$i/$j"; then
       echo "taking that" >&5
       QTDOCDIR=$i
@@ -46273,27 +42055,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   kde_supports_versionmaps=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -46302,13 +42068,11 @@
 	kde_supports_versionmaps=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
   LDFLAGS="$kde_save_LDFLAGS"
   rm -f conftest.map
-
-
-if test "$kde_supports_versionmaps" = "yes" && test "$kde_use_debug_code" = "no"; then
+   if test "$kde_supports_versionmaps" = "yes" && test "$kde_use_debug_code" = "no"; then
   include_VERSION_SCRIPT_TRUE=
   include_VERSION_SCRIPT_FALSE='#'
 else
@@ -46438,7 +42202,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_MD5SUM="$as_dir/$ac_word$ac_exec_ext"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -46467,123 +42231,289 @@
 
 #MIN_CONFIG
 
-# Check whether --enable-dnssd was given.
-if test "${enable_dnssd+set}" = set; then
-  enableval=$enable_dnssd; with_dnssd=$enableval
-else
-  with_dnssd=yes
-fi
+# Check for pkg-config manually first, as if its not installed the
+# PKG_PROG_PKG_CONFIG macro won't be defined.
 
-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; }
-save_dnssdtest_LIBS="$LIBS"
-save_dnssdtest_LDFLAGS="$LDFLAGS"
-save_dnssdtest_CPPFLAGS="$CPPFLAGS"
-LDFLAGS="$all_libraries $LDFLAGS"
-CPPFLAGS="$CPPFLAGS $all_includes"
-case $host_os in
-  darwin*) LIBS="" ;;
-  *) LIBS="-ldns_sd" ;;
-esac
-have_libdns_sd="no"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+# 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; }
+if test "${ac_cv_prog_have_pkg_config+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$have_pkg_config"; then
+  ac_cv_prog_have_pkg_config="$have_pkg_config" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_have_pkg_config="yes"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
 
-			#include <dns_sd.h>
+  test -z "$ac_cv_prog_have_pkg_config" && ac_cv_prog_have_pkg_config="no"
+fi
+fi
+have_pkg_config=$ac_cv_prog_have_pkg_config
+if test -n "$have_pkg_config"; then
+  { echo "$as_me:$LINENO: result: $have_pkg_config" >&5
+echo "${ECHO_T}$have_pkg_config" >&6; }
+else
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
 
-int
-main ()
-{
 
-			DNSServiceRefDeallocate( (DNSServiceRef) 0);
-			TXTRecordDeallocate( (TXTRecordRef*) 0);
 
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if test x"$have_pkg_config" == xno; then
+    { { echo "$as_me:$LINENO: error: pkg-config is required to install this program" >&5
+echo "$as_me: error: pkg-config is required to install this program" >&2;}
+   { (exit 1); exit 1; }; }
+fi
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_DNSSD 1
-_ACEOF
 
-			case $host_os in
-				darwin*) LIB_DNSSD="" ;;
-				*) LIB_DNSSD="-ldns_sd" ;;
-			esac
-			have_libdns_sd="yes"
-			{ echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+	if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
+set dummy ${ac_tool_prefix}pkg-config; 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_path_PKG_CONFIG+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  case $PKG_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
 
+  ;;
+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; }
 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; }
+fi
+
 
+fi
+if test -z "$ac_cv_path_PKG_CONFIG"; then
+  ac_pt_PKG_CONFIG=$PKG_CONFIG
+  # 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; }
+if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  case $ac_pt_PKG_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_ac_pt_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
 
-			{ echo "$as_me:$LINENO: result: no" >&5
+  ;;
+esac
+fi
+ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
+if test -n "$ac_pt_PKG_CONFIG"; then
+  { echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
+echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6; }
+else
+  { echo "$as_me:$LINENO: result: no" >&5
 echo "${ECHO_T}no" >&6; }
-                        LIB_DNSSD=""
+fi
+
+  if test "x$ac_pt_PKG_CONFIG" = x; then
+    PKG_CONFIG=""
+  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@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@gnu.org." >&2;}
+ac_tool_warned=yes ;;
+esac
+    PKG_CONFIG=$ac_pt_PKG_CONFIG
+  fi
+else
+  PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
+fi
 
 fi
+if test -n "$PKG_CONFIG"; then
+	_pkg_min_version=0.9.0
+	{ echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
+echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6; }
+	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+		{ 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; }
+		PKG_CONFIG=""
+	fi
 
-rm -f core conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-CPPFLAGS=$save_dnssdtest_CPPFLAGS
-LDFLAGS=$save_dnssdtest_LDFLAGS
-LIBS=$save_dnssdtest_LIBS
 fi
 
 
+  succeeded=no
+
+  if test -z "$PKG_CONFIG"; then
+    # Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  case $PKG_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
 
-if test "$have_libdns_sd" = "yes"; then
-  HAVE_DNSSD_TRUE=
-  HAVE_DNSSD_FALSE='#'
+  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; }
 else
-  HAVE_DNSSD_TRUE='#'
-  HAVE_DNSSD_FALSE=
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
 
+  fi
+
+  if test "$PKG_CONFIG" = "no" ; then
+     echo "*** The pkg-config script could not be found. Make sure it is"
+     echo "*** in your path, or set the PKG_CONFIG environment variable"
+     echo "*** to the full path to pkg-config."
+     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
+  else
+     PKG_CONFIG_MIN_VERSION=0.9.0
+     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
+        { echo "$as_me:$LINENO: checking for  avahi-qt3 >= 0.4 " >&5
+echo $ECHO_N "checking for  avahi-qt3 >= 0.4 ... $ECHO_C" >&6; }
+
+        if $PKG_CONFIG --exists " avahi-qt3 >= 0.4 , avahi-client >= 0.4 " ; then
+            { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+            succeeded=yes
+
+            { echo "$as_me:$LINENO: checking AVAHI_CFLAGS" >&5
+echo $ECHO_N "checking AVAHI_CFLAGS... $ECHO_C" >&6; }
+            AVAHI_CFLAGS=`$PKG_CONFIG --cflags " avahi-qt3 >= 0.4 , avahi-client >= 0.4 "`
+            { echo "$as_me:$LINENO: result: $AVAHI_CFLAGS" >&5
+echo "${ECHO_T}$AVAHI_CFLAGS" >&6; }
+
+            { echo "$as_me:$LINENO: checking AVAHI_LIBS" >&5
+echo $ECHO_N "checking AVAHI_LIBS... $ECHO_C" >&6; }
+            AVAHI_LIBS=`$PKG_CONFIG --libs " avahi-qt3 >= 0.4 , avahi-client >= 0.4 "`
+            { echo "$as_me:$LINENO: result: $AVAHI_LIBS" >&5
+echo "${ECHO_T}$AVAHI_LIBS" >&6; }
+        else
+            AVAHI_CFLAGS=""
+            AVAHI_LIBS=""
+            ## If we have a custom action on failure, don't print errors, but
+            ## do set a variable so people can do so.
+            AVAHI_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors " avahi-qt3 >= 0.4 , avahi-client >= 0.4 "`
+            echo $AVAHI_PKG_ERRORS
+        fi
+
+
+
+     else
+        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
+        echo "*** See http://www.freedesktop.org/software/pkgconfig"
+     fi
+  fi
+
+  if test $succeeded = yes; then
+     :
+  else
+     { { echo "$as_me:$LINENO: error: Library requirements ( avahi-qt3 >= 0.4 , avahi-client >= 0.4 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
+echo "$as_me: error: Library requirements ( avahi-qt3 >= 0.4 , avahi-client >= 0.4 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
+   { (exit 1); exit 1; }; }
+  fi
+
+
+
+if test -n "$PKG_CONFIG" && \
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" avahi-client >= 0.6\"") >&5
+  ($PKG_CONFIG --exists --print-errors " avahi-client >= 0.6") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+
+cat >>confdefs.h <<\_ACEOF
+#define AVAHI_API_0_6 1
+_ACEOF
+
+fi
+
 
 
 
@@ -46683,27 +42613,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -46739,17 +42652,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -46842,27 +42748,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -46898,17 +42787,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -47013,27 +42895,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_lua50_lua_version=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -47042,7 +42908,7 @@
 	ac_cv_lib_lua50_lua_version=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
@@ -47093,27 +42959,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_lua_lua_version=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -47122,7 +42972,7 @@
 	ac_cv_lib_lua_lua_version=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
@@ -47320,27 +43170,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -47376,17 +43209,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -47496,27 +43322,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_idn_idna_to_ascii_4i=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -47525,7 +43335,7 @@
 	ac_cv_lib_idn_idna_to_ascii_4i=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
@@ -47623,41 +43433,25 @@
   ;
   return 0;
 }
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
@@ -47666,7 +43460,7 @@
 	eval "$as_ac_var=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
 ac_res=`eval echo '${'$as_ac_var'}'`
@@ -47701,8 +43495,7 @@
 main ()
 {
 #ifndef getservbyname_r
-  char *p = (char *) getservbyname_r;
-  return !p;
+  (void) getservbyname_r;
 #endif
 
   ;
@@ -47722,27 +43515,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_have_decl_getservbyname_r=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -47823,27 +43599,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   eval "$as_ac_Header=yes"
 else
   echo "$as_me: failed program was:" >&5
@@ -47928,27 +43687,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -47984,17 +43726,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_cxx_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -48130,27 +43865,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
@@ -48159,7 +43878,7 @@
 	eval "$as_ac_var=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
 ac_res=`eval echo '${'$as_ac_var'}'`
@@ -48212,27 +43931,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_type_struct_addrinfo=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -48324,27 +44026,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
@@ -48353,7 +44039,7 @@
 	eval "$as_ac_var=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
 ac_res=`eval echo '${'$as_ac_var'}'`
@@ -48434,27 +44120,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
@@ -48463,7 +44133,7 @@
 	eval "$as_ac_var=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
 ac_res=`eval echo '${'$as_ac_var'}'`
@@ -48615,27 +44285,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_member_struct_sockaddr_sa_len=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -48672,27 +44325,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_member_struct_sockaddr_sa_len=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -48756,27 +44392,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_type_struct_sockaddr_in6=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -48831,27 +44450,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_member_struct_sockaddr_in6_sin6_scope_id=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -48888,27 +44490,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_member_struct_sockaddr_in6_sin6_scope_id=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -48971,27 +44556,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
 
 
 cat >>confdefs.h <<\_ACEOF
@@ -49010,7 +44579,7 @@
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 
 
@@ -49052,27 +44621,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -49108,17 +44660,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -49298,9 +44843,7 @@
 
 
 
-
-
-if test -n "$SVGICONS"; then
+ if test -n "$SVGICONS"; then
   include_SVGICONS_TRUE=
   include_SVGICONS_FALSE='#'
 else
@@ -49354,27 +44897,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -49410,17 +44936,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -49513,27 +45032,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
 
 
 cat >>confdefs.h <<\_ACEOF
@@ -49552,7 +45055,7 @@
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 
 
@@ -49661,27 +45164,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   kde_cv_libc_glibc=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -49820,27 +45306,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   eval "kde_cv_prog_cxx_$kde_cache=yes"
 else
   echo "$as_me: failed program was:" >&5
@@ -49849,7 +45319,7 @@
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
   CXXFLAGS="$save_CXXFLAGS"
   ac_ext=c
@@ -49925,27 +45395,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -49981,17 +45434,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_cxx_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -50107,27 +45553,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_Xrender_XRenderComposite=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -50136,7 +45566,7 @@
 	ac_cv_lib_Xrender_XRenderComposite=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
@@ -50192,27 +45622,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
 
     echo $ECHO_N "MMX yes$ECHO_C"
 
@@ -50258,27 +45671,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
 
     echo $ECHO_N ", SSE yes$ECHO_C"
 
@@ -50324,27 +45720,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
 
     echo $ECHO_N ", SSE2 yes$ECHO_C"
 
@@ -50390,27 +45769,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
 
     echo $ECHO_N ", 3DNOW yes$ECHO_C"
 
@@ -50460,27 +45822,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
 
     echo $ECHO_N " yes$ECHO_C"
 
@@ -50540,7 +45885,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_kde_cups_config="$as_dir/$ac_word$ac_exec_ext"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -50619,27 +45964,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_cups_cupsServer=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -50648,7 +45977,7 @@
 	ac_cv_lib_cups_cupsServer=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
@@ -50704,27 +46033,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -50760,17 +46072,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -50937,9 +46242,7 @@
 _ACEOF
 
 fi
-
-
-if test -n "$CUPSSUBDIR"; then
+ if test -n "$CUPSSUBDIR"; then
   include_cups_SUBDIR_TRUE=
   include_cups_SUBDIR_FALSE='#'
 else
@@ -50988,7 +46291,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_path_su="$as_dir/$ac_word$ac_exec_ext"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -51040,7 +46343,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_path_sudo="$as_dir/$ac_word$ac_exec_ext"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -51130,33 +46433,17 @@
   *) ac_try_echo=$ac_try;;
 esac
 eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   have_rtsched="yes"
 else
   echo "$as_me: failed program was:" >&5
@@ -51165,7 +46452,7 @@
 	have_rtsched="no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 if test "$have_rtsched" = "yes"; then
 
@@ -51247,27 +46534,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
@@ -51276,7 +46547,7 @@
 	eval "$as_ac_var=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
 ac_res=`eval echo '${'$as_ac_var'}'`
@@ -51332,27 +46603,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -51388,17 +46642,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -51499,27 +46746,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_util_openpty=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -51528,7 +46759,7 @@
 	ac_cv_lib_util_openpty=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
@@ -51617,27 +46848,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
@@ -51646,7 +46861,7 @@
 	eval "$as_ac_var=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
 ac_res=`eval echo '${'$as_ac_var'}'`
@@ -51731,27 +46946,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
@@ -51760,7 +46959,7 @@
 	eval "$as_ac_var=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
 ac_res=`eval echo '${'$as_ac_var'}'`
@@ -51813,27 +47012,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   kde_cv_have_struct_ucred=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -51923,27 +47105,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
@@ -51952,7 +47118,7 @@
 	eval "$as_ac_var=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
 ac_res=`eval echo '${'$as_ac_var'}'`
@@ -52272,27 +47438,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   eval "ac_cv_lib_bzip2='-lbz2'"
 else
   echo "$as_me: failed program was:" >&5
@@ -52301,7 +47451,7 @@
 	eval "ac_cv_lib_bzip2=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS="$kde_save_LIBS"
 CXXFLAGS="$kde_save_CXXFLAGS"
@@ -52374,27 +47524,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   eval "kde_cv_prog_cxx_$kde_cache=yes"
 else
   echo "$as_me: failed program was:" >&5
@@ -52403,7 +47537,7 @@
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
   CXXFLAGS="$save_CXXFLAGS"
   ac_ext=c
@@ -52477,27 +47611,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   eval "kde_cv_prog_cxx_$kde_cache=yes"
 else
   echo "$as_me: failed program was:" >&5
@@ -52506,7 +47624,7 @@
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
   CXXFLAGS="$save_CXXFLAGS"
   ac_ext=c
@@ -52585,27 +47703,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   eval "ac_cv_lib_bzip2_prefix='-lbz2'"
 else
   echo "$as_me: failed program was:" >&5
@@ -52614,7 +47716,7 @@
 	eval "ac_cv_lib_bzip2_prefix=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
    LIBS="$kde_save_LIBS"
    CXXFLAGS="$kde_save_CXXFLAGS"
@@ -52644,9 +47746,7 @@
       fi
 
 fi
-
-
-if test -n "$BZIP2DIR"; then
+ if test -n "$BZIP2DIR"; then
   include_BZIP2_TRUE=
   include_BZIP2_FALSE='#'
 else
@@ -52698,9 +47798,7 @@
 
 
 
-
-
-if test "x$kde_use_qt_emb" != "xyes"; then
+ if test "x$kde_use_qt_emb" != "xyes"; then
   DOJAVA_TRUE=
   DOJAVA_FALSE='#'
 else
@@ -52771,27 +47869,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   kde_link_libthai=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -52801,7 +47883,7 @@
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 
   LDFLAGS=$kde_ldflags_safe
@@ -52883,27 +47965,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -52939,17 +48004,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_cxx_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -53100,27 +48158,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
 
     kde_cv_libtiff_tiff="-ltiff $LIBJPEG $LIBZ"
 
@@ -53133,7 +48175,7 @@
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 
 LIBS="$kde_save_LIBS"
@@ -53209,27 +48251,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
 
     kde_cv_libtiff_tiff34="-ltiff34 $LIBJPEG $LIBZ"
 
@@ -53242,7 +48268,7 @@
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 
 LIBS="$kde_save_LIBS"
@@ -53341,27 +48367,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   eval "ac_cv_lib_jpeg_6b=-ljpeg6b"
 else
   echo "$as_me: failed program was:" >&5
@@ -53370,7 +48380,7 @@
 	eval "ac_cv_lib_jpeg_6b=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS="$ac_save_LIBS"
 CFLAGS="$ac_save_CFLAGS"
@@ -53432,27 +48442,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   eval "ac_cv_lib_jpeg_normal=-ljpeg"
 else
   echo "$as_me: failed program was:" >&5
@@ -53461,7 +48455,7 @@
 	eval "ac_cv_lib_jpeg_normal=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS="$ac_save_LIBS"
 CFLAGS="$ac_save_CFLAGS"
@@ -53495,7 +48489,7 @@
 do
   for j in jpeglib.h;
   do
-    echo "configure: 53498: $i/$j" >&5
+    echo "configure: 48492: $i/$j" >&5
     if test -r "$i/$j"; then
       echo "taking that" >&5
       jpeg_incdir=$i
@@ -53592,27 +48586,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   eval "ac_cv_lib_png='-lpng $LIBZ -lm'"
 else
   echo "$as_me: failed program was:" >&5
@@ -53622,7 +48600,7 @@
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS="$kde_save_LIBS"
 CFLAGS="$kde_save_CFLAGS"
@@ -53702,27 +48680,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   eval "ac_cv_jasper='-ljasper $LIBJPEG -lm'"
 else
   echo "$as_me: failed program was:" >&5
@@ -53732,7 +48694,7 @@
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS="$kde_save_LIBS"
 CFLAGS="$kde_save_CFLAGS"
@@ -53792,7 +48754,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -53888,27 +48850,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   eval "ac_cv_libexr='`pkg-config --libs OpenEXR`'"
 else
   echo "$as_me: failed program was:" >&5
@@ -53918,7 +48864,7 @@
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
            LIBS="$kde_save_LIBS"
            CXXFLAGS="$kde_save_CXXFLAGS"
@@ -53952,9 +48898,7 @@
 
 fi
 
-
-
-if test -n "$LIBTIFF"; then
+ if test -n "$LIBTIFF"; then
   include_TIFF_MODULES_TRUE=
   include_TIFF_MODULES_FALSE='#'
 else
@@ -53962,9 +48906,7 @@
   include_TIFF_MODULES_FALSE=
 fi
 
-
-
-if test -n "$LIB_JASPER"; then
+ if test -n "$LIB_JASPER"; then
   include_JP2_MODULES_TRUE=
   include_JP2_MODULES_FALSE='#'
 else
@@ -53972,9 +48914,7 @@
   include_JP2_MODULES_FALSE=
 fi
 
-
-
-if test -n "$LIB_EXR"; then
+ if test -n "$LIB_EXR"; then
   include_EXR_MODULES_TRUE=
   include_EXR_MODULES_FALSE='#'
 else
@@ -54036,27 +48976,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_qt_mt_XftInit=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -54065,7 +48989,7 @@
 	ac_cv_lib_qt_mt_XftInit=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
@@ -54341,27 +49265,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -54397,17 +49304,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_cxx_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -54583,27 +49483,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_fam_FAMOpen=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -54612,7 +49496,7 @@
 	ac_cv_lib_fam_FAMOpen=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
@@ -54692,27 +49576,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   eval "ac_cv_lib_z='-lz'"
 else
   echo "$as_me: failed program was:" >&5
@@ -54721,7 +49589,7 @@
 	eval "ac_cv_lib_z=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS="$kde_save_LIBS"
 CFLAGS="$kde_save_CFLAGS"
@@ -54797,27 +49665,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -54853,17 +49704,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -54990,27 +49834,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
@@ -55019,7 +49847,7 @@
 	eval "$as_ac_var=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
 ac_res=`eval echo '${'$as_ac_var'}'`
@@ -55080,27 +49908,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_volmgt_volmgt_running=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -55109,7 +49921,7 @@
 	ac_cv_lib_volmgt_volmgt_running=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
@@ -55226,31 +50038,14 @@
 eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   kde_cv_have_dnotify=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -55386,27 +50181,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   kde_cv_have_inotify=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -55483,7 +50261,7 @@
 do
   for j in openssl/ssl.h;
   do
-    echo "configure: 55486: $i/$j" >&5
+    echo "configure: 50264: $i/$j" >&5
     if test -r "$i/$j"; then
       echo "taking that" >&5
       ssl_incdir=$i
@@ -55542,27 +50320,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_ssl_rsaref="yes"
 
 else
@@ -55573,7 +50335,7 @@
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 
   LDFLAGS="$ac_ldflags_safe"
@@ -55868,27 +50630,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -55924,17 +50669,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -55999,9 +50737,7 @@
 
 
 
-
-
-if test -n "$BZIP2DIR"; then
+ if test -n "$BZIP2DIR"; then
   include_bzip2_TRUE=
   include_bzip2_FALSE='#'
 else
@@ -56095,27 +50831,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
@@ -56124,7 +50844,7 @@
 	eval "$as_ac_var=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
 ac_res=`eval echo '${'$as_ac_var'}'`
@@ -56260,7 +50980,7 @@
 do
   for j in gssapi.h;
   do
-    echo "configure: 56263: $i/$j" >&5
+    echo "configure: 50983: $i/$j" >&5
     if test -r "$i/$j"; then
       echo "taking that" >&5
       gssapi_incdir=$i
@@ -56282,7 +51002,7 @@
 do
   for j in libgssapi.$ext;
   do
-    echo "configure: 56285: $i/$j" >&5
+    echo "configure: 51005: $i/$j" >&5
     if test -r "$i/$j"; then
       echo "taking that" >&5
       gssapi_libdir=$i
@@ -56405,27 +51125,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -56461,17 +51164,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -56572,27 +51268,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_m_finite=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -56601,7 +51281,7 @@
 	ac_cv_lib_m_finite=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
@@ -56659,27 +51339,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_m__finite=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -56688,7 +51352,7 @@
 	ac_cv_lib_m__finite=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
@@ -56741,27 +51405,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   { echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6; }
 
@@ -56778,7 +51426,7 @@
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
     LIBS="$ac_save_libs"
 
@@ -56815,27 +51463,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   { echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6; }
 
@@ -56852,7 +51484,7 @@
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
     LIBS="$ac_save_libs"
 
@@ -56975,27 +51607,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_have_pcreposix="yes"
 else
   echo "$as_me: failed program was:" >&5
@@ -57005,7 +51621,7 @@
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
       LIBS="$ac_save_libs"
       LDFLAGS="$ac_LDFLAGS_save"
@@ -57108,27 +51724,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_aspell_new_aspell_config=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -57137,7 +51737,7 @@
 	ac_cv_lib_aspell_new_aspell_config=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
@@ -57197,27 +51797,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -57253,17 +51836,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_cxx_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -57347,9 +51923,7 @@
 #define ASPELL_DATADIR "$aspell_datadir"
 _ACEOF
 
-
-
-if test -n "$ac_cv_header_aspell_h" -a -n "$LIBASPELL"; then
+    if test -n "$ac_cv_header_aspell_h" -a -n "$LIBASPELL"; then
   include_aspell_plugin_TRUE=
   include_aspell_plugin_FALSE='#'
 else
@@ -57426,27 +52000,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_hspell_hspell_check_word=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -57455,7 +52013,7 @@
 	ac_cv_lib_hspell_hspell_check_word=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
@@ -57515,27 +52073,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -57571,17 +52112,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_cxx_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -57651,9 +52185,7 @@
 
    fi
 
-
-
-if test "$ac_cv_header_hspell_h" = "yes" -a -n "$LIBHSPELL"; then
+    if test "$ac_cv_header_hspell_h" = "yes" -a -n "$LIBHSPELL"; then
   include_hspell_plugin_TRUE=
   include_hspell_plugin_FALSE='#'
 else
@@ -57745,27 +52277,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -57801,17 +52316,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -57927,27 +52435,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -57983,17 +52474,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -58105,27 +52589,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   kde_has_alsa_0_9=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -58180,27 +52647,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   kde_has_alsa_0_5=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -58261,27 +52711,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_asound_snd_seq_create_simple_port=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -58290,7 +52724,7 @@
 	ac_cv_lib_asound_snd_seq_create_simple_port=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
@@ -58355,27 +52789,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_asound_snd_pcm_resume=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -58384,7 +52802,7 @@
 	ac_cv_lib_asound_snd_pcm_resume=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
@@ -58415,9 +52833,7 @@
 	*cygwin*) undefined_symbols_in_shared_libs_allowed=no;;
 	*) undefined_symbols_in_shared_libs_allowed=yes;;
 esac
-
-
-if test "$undefined_symbols_in_shared_libs_allowed" = yes; then
+ if test "$undefined_symbols_in_shared_libs_allowed" = yes; then
   undefined_symbols_allowed_TRUE=
   undefined_symbols_allowed_FALSE='#'
 else
@@ -58471,9 +52887,7 @@
 
 
 
-
-
-if test "x$dcop_SUBDIR_included" = xyes; then
+ if test "x$dcop_SUBDIR_included" = xyes; then
   dcop_SUBDIR_included_TRUE=
   dcop_SUBDIR_included_FALSE='#'
 else
@@ -58481,9 +52895,7 @@
   dcop_SUBDIR_included_FALSE=
 fi
 
-
-
-if test "x$libltdl_SUBDIR_included" = xyes; then
+ if test "x$libltdl_SUBDIR_included" = xyes; then
   libltdl_SUBDIR_included_TRUE=
   libltdl_SUBDIR_included_FALSE='#'
 else
@@ -58491,9 +52903,7 @@
   libltdl_SUBDIR_included_FALSE=
 fi
 
-
-
-if test "x$kdefx_SUBDIR_included" = xyes; then
+ if test "x$kdefx_SUBDIR_included" = xyes; then
   kdefx_SUBDIR_included_TRUE=
   kdefx_SUBDIR_included_FALSE='#'
 else
@@ -58501,9 +52911,7 @@
   kdefx_SUBDIR_included_FALSE=
 fi
 
-
-
-if test "x$kdecore_SUBDIR_included" = xyes; then
+ if test "x$kdecore_SUBDIR_included" = xyes; then
   kdecore_SUBDIR_included_TRUE=
   kdecore_SUBDIR_included_FALSE='#'
 else
@@ -58511,9 +52919,7 @@
   kdecore_SUBDIR_included_FALSE=
 fi
 
-
-
-if test "x$kunittest_SUBDIR_included" = xyes; then
+ if test "x$kunittest_SUBDIR_included" = xyes; then
   kunittest_SUBDIR_included_TRUE=
   kunittest_SUBDIR_included_FALSE='#'
 else
@@ -58521,9 +52927,7 @@
   kunittest_SUBDIR_included_FALSE=
 fi
 
-
-
-if test "x$kdeui_SUBDIR_included" = xyes; then
+ if test "x$kdeui_SUBDIR_included" = xyes; then
   kdeui_SUBDIR_included_TRUE=
   kdeui_SUBDIR_included_FALSE='#'
 else
@@ -58531,9 +52935,7 @@
   kdeui_SUBDIR_included_FALSE=
 fi
 
-
-
-if test "x$kdesu_SUBDIR_included" = xyes; then
+ if test "x$kdesu_SUBDIR_included" = xyes; then
   kdesu_SUBDIR_included_TRUE=
   kdesu_SUBDIR_included_FALSE='#'
 else
@@ -58541,9 +52943,7 @@
   kdesu_SUBDIR_included_FALSE=
 fi
 
-
-
-if test "x$kjs_SUBDIR_included" = xyes; then
+ if test "x$kjs_SUBDIR_included" = xyes; then
   kjs_SUBDIR_included_TRUE=
   kjs_SUBDIR_included_FALSE='#'
 else
@@ -58551,9 +52951,7 @@
   kjs_SUBDIR_included_FALSE=
 fi
 
-
-
-if test "x$kwallet_SUBDIR_included" = xyes; then
+ if test "x$kwallet_SUBDIR_included" = xyes; then
   kwallet_SUBDIR_included_TRUE=
   kwallet_SUBDIR_included_FALSE='#'
 else
@@ -58561,9 +52959,7 @@
   kwallet_SUBDIR_included_FALSE=
 fi
 
-
-
-if test "x$kio_SUBDIR_included" = xyes; then
+ if test "x$kio_SUBDIR_included" = xyes; then
   kio_SUBDIR_included_TRUE=
   kio_SUBDIR_included_FALSE='#'
 else
@@ -58571,9 +52967,7 @@
   kio_SUBDIR_included_FALSE=
 fi
 
-
-
-if test "x$arts_SUBDIR_included" = xyes; then
+ if test "x$arts_SUBDIR_included" = xyes; then
   arts_SUBDIR_included_TRUE=
   arts_SUBDIR_included_FALSE='#'
 else
@@ -58581,9 +52975,7 @@
   arts_SUBDIR_included_FALSE=
 fi
 
-
-
-if test "x$dnssd_SUBDIR_included" = xyes; then
+ if test "x$dnssd_SUBDIR_included" = xyes; then
   dnssd_SUBDIR_included_TRUE=
   dnssd_SUBDIR_included_FALSE='#'
 else
@@ -58591,9 +52983,7 @@
   dnssd_SUBDIR_included_FALSE=
 fi
 
-
-
-if test "x$kab_SUBDIR_included" = xyes; then
+ if test "x$kab_SUBDIR_included" = xyes; then
   kab_SUBDIR_included_TRUE=
   kab_SUBDIR_included_FALSE='#'
 else
@@ -58601,9 +52991,7 @@
   kab_SUBDIR_included_FALSE=
 fi
 
-
-
-if test "x$kconf_update_SUBDIR_included" = xyes; then
+ if test "x$kconf_update_SUBDIR_included" = xyes; then
   kconf_update_SUBDIR_included_TRUE=
   kconf_update_SUBDIR_included_FALSE='#'
 else
@@ -58611,9 +52999,7 @@
   kconf_update_SUBDIR_included_FALSE=
 fi
 
-
-
-if test "x$kded_SUBDIR_included" = xyes; then
+ if test "x$kded_SUBDIR_included" = xyes; then
   kded_SUBDIR_included_TRUE=
   kded_SUBDIR_included_FALSE='#'
 else
@@ -58621,9 +53007,7 @@
   kded_SUBDIR_included_FALSE=
 fi
 
-
-
-if test "x$kdoctools_SUBDIR_included" = xyes; then
+ if test "x$kdoctools_SUBDIR_included" = xyes; then
   kdoctools_SUBDIR_included_TRUE=
   kdoctools_SUBDIR_included_FALSE='#'
 else
@@ -58631,9 +53015,7 @@
   kdoctools_SUBDIR_included_FALSE=
 fi
 
-
-
-if test "x$kimgio_SUBDIR_included" = xyes; then
+ if test "x$kimgio_SUBDIR_included" = xyes; then
   kimgio_SUBDIR_included_TRUE=
   kimgio_SUBDIR_included_FALSE='#'
 else
@@ -58641,9 +53023,7 @@
   kimgio_SUBDIR_included_FALSE=
 fi
 
-
-
-if test "x$kioslave_SUBDIR_included" = xyes; then
+ if test "x$kioslave_SUBDIR_included" = xyes; then
   kioslave_SUBDIR_included_TRUE=
   kioslave_SUBDIR_included_FALSE='#'
 else
@@ -58651,9 +53031,7 @@
   kioslave_SUBDIR_included_FALSE=
 fi
 
-
-
-if test "x$knewstuff_SUBDIR_included" = xyes; then
+ if test "x$knewstuff_SUBDIR_included" = xyes; then
   knewstuff_SUBDIR_included_TRUE=
   knewstuff_SUBDIR_included_FALSE='#'
 else
@@ -58661,9 +53039,7 @@
   knewstuff_SUBDIR_included_FALSE=
 fi
 
-
-
-if test "x$kparts_SUBDIR_included" = xyes; then
+ if test "x$kparts_SUBDIR_included" = xyes; then
   kparts_SUBDIR_included_TRUE=
   kparts_SUBDIR_included_FALSE='#'
 else
@@ -58671,9 +53047,7 @@
   kparts_SUBDIR_included_FALSE=
 fi
 
-
-
-if test "x$kresources_SUBDIR_included" = xyes; then
+ if test "x$kresources_SUBDIR_included" = xyes; then
   kresources_SUBDIR_included_TRUE=
   kresources_SUBDIR_included_FALSE='#'
 else
@@ -58681,9 +53055,7 @@
   kresources_SUBDIR_included_FALSE=
 fi
 
-
-
-if test "x$kstyles_SUBDIR_included" = xyes; then
+ if test "x$kstyles_SUBDIR_included" = xyes; then
   kstyles_SUBDIR_included_TRUE=
   kstyles_SUBDIR_included_FALSE='#'
 else
@@ -58691,9 +53063,7 @@
   kstyles_SUBDIR_included_FALSE=
 fi
 
-
-
-if test "x$kutils_SUBDIR_included" = xyes; then
+ if test "x$kutils_SUBDIR_included" = xyes; then
   kutils_SUBDIR_included_TRUE=
   kutils_SUBDIR_included_FALSE='#'
 else
@@ -58701,9 +53071,7 @@
   kutils_SUBDIR_included_FALSE=
 fi
 
-
-
-if test "x$libkmid_SUBDIR_included" = xyes; then
+ if test "x$libkmid_SUBDIR_included" = xyes; then
   libkmid_SUBDIR_included_TRUE=
   libkmid_SUBDIR_included_FALSE='#'
 else
@@ -58711,9 +53079,7 @@
   libkmid_SUBDIR_included_FALSE=
 fi
 
-
-
-if test "x$libkscreensaver_SUBDIR_included" = xyes; then
+ if test "x$libkscreensaver_SUBDIR_included" = xyes; then
   libkscreensaver_SUBDIR_included_TRUE=
   libkscreensaver_SUBDIR_included_FALSE='#'
 else
@@ -58721,9 +53087,7 @@
   libkscreensaver_SUBDIR_included_FALSE=
 fi
 
-
-
-if test "x$licenses_SUBDIR_included" = xyes; then
+ if test "x$licenses_SUBDIR_included" = xyes; then
   licenses_SUBDIR_included_TRUE=
   licenses_SUBDIR_included_FALSE='#'
 else
@@ -58731,9 +53095,7 @@
   licenses_SUBDIR_included_FALSE=
 fi
 
-
-
-if test "x$mimetypes_SUBDIR_included" = xyes; then
+ if test "x$mimetypes_SUBDIR_included" = xyes; then
   mimetypes_SUBDIR_included_TRUE=
   mimetypes_SUBDIR_included_FALSE='#'
 else
@@ -58741,9 +53103,7 @@
   mimetypes_SUBDIR_included_FALSE=
 fi
 
-
-
-if test "x$pics_SUBDIR_included" = xyes; then
+ if test "x$pics_SUBDIR_included" = xyes; then
   pics_SUBDIR_included_TRUE=
   pics_SUBDIR_included_FALSE='#'
 else
@@ -58751,9 +53111,7 @@
   pics_SUBDIR_included_FALSE=
 fi
 
-
-
-if test "x$doc_SUBDIR_included" = xyes; then
+ if test "x$doc_SUBDIR_included" = xyes; then
   doc_SUBDIR_included_TRUE=
   doc_SUBDIR_included_FALSE='#'
 else
@@ -58761,9 +53119,7 @@
   doc_SUBDIR_included_FALSE=
 fi
 
-
-
-if test "x$kcert_SUBDIR_included" = xyes; then
+ if test "x$kcert_SUBDIR_included" = xyes; then
   kcert_SUBDIR_included_TRUE=
   kcert_SUBDIR_included_FALSE='#'
 else
@@ -58771,9 +53127,7 @@
   kcert_SUBDIR_included_FALSE=
 fi
 
-
-
-if test "x$kinit_SUBDIR_included" = xyes; then
+ if test "x$kinit_SUBDIR_included" = xyes; then
   kinit_SUBDIR_included_TRUE=
   kinit_SUBDIR_included_FALSE='#'
 else
@@ -58781,9 +53135,7 @@
   kinit_SUBDIR_included_FALSE=
 fi
 
-
-
-if test "x$kdeprint_SUBDIR_included" = xyes; then
+ if test "x$kdeprint_SUBDIR_included" = xyes; then
   kdeprint_SUBDIR_included_TRUE=
   kdeprint_SUBDIR_included_FALSE='#'
 else
@@ -58791,9 +53143,7 @@
   kdeprint_SUBDIR_included_FALSE=
 fi
 
-
-
-if test "x$kabc_SUBDIR_included" = xyes; then
+ if test "x$kabc_SUBDIR_included" = xyes; then
   kabc_SUBDIR_included_TRUE=
   kabc_SUBDIR_included_FALSE='#'
 else
@@ -58801,9 +53151,7 @@
   kabc_SUBDIR_included_FALSE=
 fi
 
-
-
-if test "x$kspell2_SUBDIR_included" = xyes; then
+ if test "x$kspell2_SUBDIR_included" = xyes; then
   kspell2_SUBDIR_included_TRUE=
   kspell2_SUBDIR_included_FALSE='#'
 else
@@ -58811,9 +53159,7 @@
   kspell2_SUBDIR_included_FALSE=
 fi
 
-
-
-if test "x$kmdi_SUBDIR_included" = xyes; then
+ if test "x$kmdi_SUBDIR_included" = xyes; then
   kmdi_SUBDIR_included_TRUE=
   kmdi_SUBDIR_included_FALSE='#'
 else
@@ -58821,9 +53167,7 @@
   kmdi_SUBDIR_included_FALSE=
 fi
 
-
-
-if test "x$kcmshell_SUBDIR_included" = xyes; then
+ if test "x$kcmshell_SUBDIR_included" = xyes; then
   kcmshell_SUBDIR_included_TRUE=
   kcmshell_SUBDIR_included_FALSE='#'
 else
@@ -58831,9 +53175,7 @@
   kcmshell_SUBDIR_included_FALSE=
 fi
 
-
-
-if test "x$khtml_SUBDIR_included" = xyes; then
+ if test "x$khtml_SUBDIR_included" = xyes; then
   khtml_SUBDIR_included_TRUE=
   khtml_SUBDIR_included_FALSE='#'
 else
@@ -58841,9 +53183,7 @@
   khtml_SUBDIR_included_FALSE=
 fi
 
-
-
-if test "x$interfaces_SUBDIR_included" = xyes; then
+ if test "x$interfaces_SUBDIR_included" = xyes; then
   interfaces_SUBDIR_included_TRUE=
   interfaces_SUBDIR_included_FALSE='#'
 else
@@ -58851,9 +53191,7 @@
   interfaces_SUBDIR_included_FALSE=
 fi
 
-
-
-if test "x$kdewidgets_SUBDIR_included" = xyes; then
+ if test "x$kdewidgets_SUBDIR_included" = xyes; then
   kdewidgets_SUBDIR_included_TRUE=
   kdewidgets_SUBDIR_included_FALSE='#'
 else
@@ -58861,9 +53199,7 @@
   kdewidgets_SUBDIR_included_FALSE=
 fi
 
-
-
-if test "x$kate_SUBDIR_included" = xyes; then
+ if test "x$kate_SUBDIR_included" = xyes; then
   kate_SUBDIR_included_TRUE=
   kate_SUBDIR_included_FALSE='#'
 else
@@ -59384,6 +53720,13 @@
 LTLIBOBJS=$ac_ltlibobjs
 
 
+if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
+  { { echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
 if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
   { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
@@ -59447,13 +53790,6 @@
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
-if test -z "${HAVE_DNSSD_TRUE}" && test -z "${HAVE_DNSSD_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"HAVE_DNSSD\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"HAVE_DNSSD\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
 if test -z "${include_SVGICONS_TRUE}" && test -z "${include_SVGICONS_FALSE}"; then
   { { echo "$as_me:$LINENO: error: conditional \"include_SVGICONS\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
@@ -59835,7 +54171,8 @@
 ## M4sh Initialization.  ##
 ## --------------------- ##
 
-# Be Bourne compatible
+# Be more Bourne compatible
+DUALCASE=1; export DUALCASE # for MKS sh
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
@@ -59844,10 +54181,13 @@
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
 else
-  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
+  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
@@ -60071,19 +54411,28 @@
   as_mkdir_p=false
 fi
 
-# 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"
+if test -x / >/dev/null 2>&1; then
+  as_test_x='test -x'
 else
-  as_executable_p=:
+  if ls -dL / >/dev/null 2>&1; then
+    as_ls_L_option=L
+  else
+    as_ls_L_option=
+  fi
+  as_test_x='
+    eval sh -c '\''
+      if test -d "$1"; then
+        test -d "$1/.";
+      else
+	case $1 in
+        -*)set "./$1";;
+	esac;
+	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
+	???[sx]*):;;*)false;;esac;fi
+    '\'' sh
+  '
 fi
-rm -f conf$$.file
+as_executable_p=$as_test_x
 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -60099,7 +54448,7 @@
 # values after options handling.
 ac_log="
 This file was extended by $as_me, which was
-generated by GNU Autoconf 2.60.  Invocation command line was
+generated by GNU Autoconf 2.61.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -60128,7 +54477,7 @@
 Usage: $0 [OPTIONS] [FILE]...
 
   -h, --help       print this help, then exit
-  -V, --version    print version number, then exit
+  -V, --version    print version number and configuration settings, then exit
   -q, --quiet      do not print progress messages
   -d, --debug      don't remove temporary files
       --recheck    update $as_me by reconfiguring in the same conditions
@@ -60152,7 +54501,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
 config.status
-configured by $0, generated by GNU Autoconf 2.60,
+configured by $0, generated by GNU Autoconf 2.61,
   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
 Copyright (C) 2006 Free Software Foundation, Inc.
@@ -60162,6 +54511,7 @@
 ac_pwd='$ac_pwd'
 srcdir='$srcdir'
 INSTALL='$INSTALL'
+MKDIR_P='$MKDIR_P'
 _ACEOF
 
 cat >>$CONFIG_STATUS <<\_ACEOF
@@ -60593,6 +54943,7 @@
 INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
 INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
 INSTALL_DATA!$INSTALL_DATA$ac_delim
+am__isrc!$am__isrc$ac_delim
 CYGPATH_W!$CYGPATH_W$ac_delim
 PACKAGE!$PACKAGE$ac_delim
 VERSION!$VERSION$ac_delim
@@ -60611,6 +54962,9 @@
 AMTAR!$AMTAR$ac_delim
 am__tar!$am__tar$ac_delim
 am__untar!$am__untar$ac_delim
+MAINTAINER_MODE_TRUE!$MAINTAINER_MODE_TRUE$ac_delim
+MAINTAINER_MODE_FALSE!$MAINTAINER_MODE_FALSE$ac_delim
+MAINT!$MAINT$ac_delim
 CC!$CC$ac_delim
 CFLAGS!$CFLAGS$ac_delim
 LDFLAGS!$LDFLAGS$ac_delim
@@ -60631,10 +54985,6 @@
 CXX!$CXX$ac_delim
 CXXFLAGS!$CXXFLAGS$ac_delim
 ac_ct_CXX!$ac_ct_CXX$ac_delim
-CXXDEPMODE!$CXXDEPMODE$ac_delim
-am__fastdepCXX_TRUE!$am__fastdepCXX_TRUE$ac_delim
-am__fastdepCXX_FALSE!$am__fastdepCXX_FALSE$ac_delim
-WOVERLOADED_VIRTUAL!$WOVERLOADED_VIRTUAL$ac_delim
 _ACEOF
 
   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -60676,6 +55026,10 @@
 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
@@ -60769,10 +55123,6 @@
 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
 _ACEOF
 
   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -60814,6 +55164,10 @@
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   cat >conf$$subs.sed <<_ACEOF
+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
@@ -60886,9 +55240,10 @@
 include_VERSION_SCRIPT_TRUE!$include_VERSION_SCRIPT_TRUE$ac_delim
 include_VERSION_SCRIPT_FALSE!$include_VERSION_SCRIPT_FALSE$ac_delim
 MD5SUM!$MD5SUM$ac_delim
-LIB_DNSSD!$LIB_DNSSD$ac_delim
-HAVE_DNSSD_TRUE!$HAVE_DNSSD_TRUE$ac_delim
-HAVE_DNSSD_FALSE!$HAVE_DNSSD_FALSE$ac_delim
+have_pkg_config!$have_pkg_config$ac_delim
+PKG_CONFIG!$PKG_CONFIG$ac_delim
+AVAHI_CFLAGS!$AVAHI_CFLAGS$ac_delim
+AVAHI_LIBS!$AVAHI_LIBS$ac_delim
 LUA!$LUA$ac_delim
 LUA_INCLUDES!$LUA_INCLUDES$ac_delim
 LUA_LIBS!$LUA_LIBS$ac_delim
@@ -60906,11 +55261,6 @@
 cups_modeldir!$cups_modeldir$ac_delim
 path_su!$path_su$ac_delim
 path_sudo!$path_sudo$ac_delim
-LIBBZ2!$LIBBZ2$ac_delim
-include_BZIP2_TRUE!$include_BZIP2_TRUE$ac_delim
-include_BZIP2_FALSE!$include_BZIP2_FALSE$ac_delim
-LIBXSLT_LIBS!$LIBXSLT_LIBS$ac_delim
-LIBXSLT_CFLAGS!$LIBXSLT_CFLAGS$ac_delim
 _ACEOF
 
   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -60952,6 +55302,11 @@
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   cat >conf$$subs.sed <<_ACEOF
+LIBBZ2!$LIBBZ2$ac_delim
+include_BZIP2_TRUE!$include_BZIP2_TRUE$ac_delim
+include_BZIP2_FALSE!$include_BZIP2_FALSE$ac_delim
+LIBXSLT_LIBS!$LIBXSLT_LIBS$ac_delim
+LIBXSLT_CFLAGS!$LIBXSLT_CFLAGS$ac_delim
 LIBXSLT_RPATH!$LIBXSLT_RPATH$ac_delim
 LIBXML_LIBS!$LIBXML_LIBS$ac_delim
 LIBXML_CFLAGS!$LIBXML_CFLAGS$ac_delim
@@ -60964,7 +55319,6 @@
 KJAVA_POLICYPATH!$KJAVA_POLICYPATH$ac_delim
 LIBTIFF!$LIBTIFF$ac_delim
 LIB_JASPER!$LIB_JASPER$ac_delim
-PKG_CONFIG!$PKG_CONFIG$ac_delim
 LIB_EXR!$LIB_EXR$ac_delim
 EXR_FLAGS!$EXR_FLAGS$ac_delim
 include_TIFF_MODULES_TRUE!$include_TIFF_MODULES_TRUE$ac_delim
@@ -61045,10 +55399,6 @@
 libkmid_SUBDIR_included_FALSE!$libkmid_SUBDIR_included_FALSE$ac_delim
 libkscreensaver_SUBDIR_included_TRUE!$libkscreensaver_SUBDIR_included_TRUE$ac_delim
 libkscreensaver_SUBDIR_included_FALSE!$libkscreensaver_SUBDIR_included_FALSE$ac_delim
-licenses_SUBDIR_included_TRUE!$licenses_SUBDIR_included_TRUE$ac_delim
-licenses_SUBDIR_included_FALSE!$licenses_SUBDIR_included_FALSE$ac_delim
-mimetypes_SUBDIR_included_TRUE!$mimetypes_SUBDIR_included_TRUE$ac_delim
-mimetypes_SUBDIR_included_FALSE!$mimetypes_SUBDIR_included_FALSE$ac_delim
 _ACEOF
 
   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -61090,6 +55440,10 @@
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   cat >conf$$subs.sed <<_ACEOF
+licenses_SUBDIR_included_TRUE!$licenses_SUBDIR_included_TRUE$ac_delim
+licenses_SUBDIR_included_FALSE!$licenses_SUBDIR_included_FALSE$ac_delim
+mimetypes_SUBDIR_included_TRUE!$mimetypes_SUBDIR_included_TRUE$ac_delim
+mimetypes_SUBDIR_included_FALSE!$mimetypes_SUBDIR_included_FALSE$ac_delim
 pics_SUBDIR_included_TRUE!$pics_SUBDIR_included_TRUE$ac_delim
 pics_SUBDIR_included_FALSE!$pics_SUBDIR_included_FALSE$ac_delim
 doc_SUBDIR_included_TRUE!$doc_SUBDIR_included_TRUE$ac_delim
@@ -61120,7 +55474,7 @@
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 28; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 32; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
@@ -61347,6 +55701,11 @@
   [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
   *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
   esac
+  ac_MKDIR_P=$MKDIR_P
+  case $MKDIR_P in
+  [\\/$]* | ?:[\\/]* ) ;;
+  */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;;
+  esac
 _ACEOF
 
 cat >>$CONFIG_STATUS <<\_ACEOF
@@ -61400,6 +55759,7 @@
 s&@abs_builddir@&$ac_abs_builddir&;t t
 s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
 s&@INSTALL@&$ac_INSTALL&;t t
+s&@MKDIR_P@&$ac_MKDIR_P&;t t
 $ac_datarootdir_hack
 " $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" | sed -f "$tmp/subs-3.sed" | sed -f "$tmp/subs-4.sed" | sed -f "$tmp/subs-5.sed" >$tmp/out
 
@@ -61564,8 +55924,9 @@
   # some people rename them; so instead we look at the file content.
   # Grep'ing the first line is not enough: some people post-process
   # each Makefile.in and add a new line on top of each file to say so.
-  # So let's grep whole file.
-  if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
+  # Grep'ing the whole file is not good either: AIX grep has a line
+  # limit of 2048, but all sed's we know have understand at least 4000.
+  if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
     dirpart=`$as_dirname -- "$mf" ||
 $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$mf" : 'X\(//\)[^/]' \| \
--- kdelibs-3.5.7.orig/kdewidgets/tests/Makefile.in
+++ kdelibs-3.5.7/kdewidgets/tests/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -33,15 +33,11 @@
 #    along with this library; see the file COPYING.  If not, write to
 #    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 #    Boston, MA 02110-1301, USA.
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -78,8 +74,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -87,13 +81,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -107,8 +101,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -129,17 +121,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -208,7 +197,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -245,12 +233,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -295,87 +285,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -399,75 +345,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -475,16 +363,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -496,7 +383,7 @@
 all: docs-am  all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -534,9 +421,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 mostlyclean-libtool:
@@ -544,10 +431,6 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 tags: TAGS
 TAGS:
 
@@ -556,22 +439,21 @@
 
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -622,7 +504,7 @@
 
 distclean: distclean-am
 	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool
+distclean-am: clean-am distclean-generic
 
 dvi: dvi-am
 
@@ -636,12 +518,20 @@
 
 install-data-am:
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -660,17 +550,21 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am
+uninstall-am:
+
+.MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am check-local clean clean-generic \
 	clean-libtool distclean distclean-generic distclean-libtool \
 	distdir dvi dvi-am html html-am info info-am install \
-	install-am install-data install-data-am install-exec \
-	install-exec-am install-info install-info-am install-man \
+	install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
 	install-strip installcheck installcheck-am installdirs \
 	maintainer-clean maintainer-clean-generic mostlyclean \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	uninstall uninstall-am uninstall-info-am
+	uninstall uninstall-am
 
 
 check-local: testwithpixmaps.cpp testkde.cpp
--- kdelibs-3.5.7.orig/kdewidgets/pics/Makefile.in
+++ kdelibs-3.5.7/kdewidgets/pics/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -15,15 +15,11 @@
 
 @SET_MAKE@
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -69,8 +65,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -78,13 +72,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -98,8 +92,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -120,17 +112,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -199,7 +188,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -236,12 +224,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -286,87 +276,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -390,75 +336,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -466,16 +354,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -501,7 +388,7 @@
 all: docs-am  all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -539,9 +426,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 mostlyclean-libtool:
@@ -549,13 +436,9 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 install-kdewidgetsdataDATA: $(kdewidgetsdata_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(kdewidgetsdatadir)" || $(mkdir_p) "$(DESTDIR)$(kdewidgetsdatadir)"
+	test -z "$(kdewidgetsdatadir)" || $(MKDIR_P) "$(DESTDIR)$(kdewidgetsdatadir)"
 	@list='$(kdewidgetsdata_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -578,22 +461,21 @@
 
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -609,7 +491,7 @@
 all-am: Makefile $(DATA)
 installdirs:
 	for dir in "$(DESTDIR)$(kdewidgetsdatadir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -645,7 +527,7 @@
 
 distclean: distclean-am
 	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool
+distclean-am: clean-am distclean-generic
 
 dvi: dvi-am
 
@@ -659,12 +541,20 @@
 
 install-data-am: install-kdewidgetsdataDATA
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -683,18 +573,21 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-kdewidgetsdataDATA
+uninstall-am: uninstall-kdewidgetsdataDATA
+
+.MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
 	distclean distclean-generic distclean-libtool distdir dvi \
 	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-exec install-exec-am \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
 	install-info install-info-am install-kdewidgetsdataDATA \
-	install-man install-strip installcheck installcheck-am \
+	install-man install-pdf install-pdf-am install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
 	installdirs maintainer-clean maintainer-clean-generic \
 	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
-	ps ps-am uninstall uninstall-am uninstall-info-am \
-	uninstall-kdewidgetsdataDATA
+	ps ps-am uninstall uninstall-am uninstall-kdewidgetsdataDATA
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- kdelibs-3.5.7.orig/kdewidgets/Makefile.in
+++ kdelibs-3.5.7/kdewidgets/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -35,15 +35,11 @@
 #    Boston, MA 02110-1301, USA.
 
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -93,6 +89,13 @@
 kdewidgets_la_nofinal_OBJECTS = classpreviews.lo kdewidgets.lo
 @KDE_USE_FINAL_FALSE@kdewidgets_la_OBJECTS = $(kdewidgets_la_nofinal_OBJECTS)
 @KDE_USE_FINAL_TRUE@kdewidgets_la_OBJECTS = $(kdewidgets_la_final_OBJECTS)
+#>- kdewidgets_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(kdewidgets_la_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+kdewidgets_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(kdewidgets_la_LDFLAGS) $(LDFLAGS) -o $@
 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(bin_PROGRAMS)
 am_makekdewidgets_OBJECTS = makekdewidgets.$(OBJEXT)
@@ -101,7 +104,14 @@
 makekdewidgets_OBJECTS = makekdewidgets.$(OBJEXT)
 makekdewidgets_DEPENDENCIES = $(am__DEPENDENCIES_1) \
 	../kdecore/libkdecore.la
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+#>- makekdewidgets_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(makekdewidgets_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+makekdewidgets_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(makekdewidgets_LDFLAGS) $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -109,34 +119,40 @@
 #>+ 2
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 #>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
 CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 3
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(kdewidgets_la_SOURCES) $(makekdewidgets_SOURCES)
 DIST_SOURCES = $(kdewidgets_la_SOURCES) $(makekdewidgets_SOURCES)
 #>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 #>- 	html-recursive info-recursive install-data-recursive \
-#>- 	install-exec-recursive install-info-recursive \
-#>- 	install-recursive installcheck-recursive installdirs-recursive \
-#>- 	pdf-recursive ps-recursive uninstall-info-recursive \
-#>- 	uninstall-recursive
-#>+ 6
+#>- 	install-dvi-recursive install-exec-recursive \
+#>- 	install-html-recursive install-info-recursive \
+#>- 	install-pdf-recursive install-ps-recursive install-recursive \
+#>- 	installcheck-recursive installdirs-recursive pdf-recursive \
+#>- 	ps-recursive uninstall-recursive
+#>+ 7
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	html-recursive info-recursive install-data-recursive \
-	install-exec-recursive install-info-recursive \
-	install-recursive installcheck-recursive installdirs-recursive \
-	pdf-recursive ps-recursive uninstall-info-recursive \
-	uninstall-recursive nmcheck-recursive bcheck-recursive
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive nmcheck-recursive bcheck-recursive
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
@@ -146,8 +162,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -155,13 +169,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -175,8 +189,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -197,17 +209,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -276,7 +285,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -313,12 +321,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -363,87 +373,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -467,75 +433,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -543,16 +451,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -575,7 +482,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -613,13 +520,13 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-kde_widgetLTLIBRARIES: $(kde_widget_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(kde_widgetdir)" || $(mkdir_p) "$(DESTDIR)$(kde_widgetdir)"
+	test -z "$(kde_widgetdir)" || $(MKDIR_P) "$(DESTDIR)$(kde_widgetdir)"
 	@list='$(kde_widget_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
@@ -630,7 +537,7 @@
 
 uninstall-kde_widgetLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@set -x; list='$(kde_widget_LTLIBRARIES)'; for p in $$list; do \
+	@list='$(kde_widget_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_widgetdir)/$$p'"; \
 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_widgetdir)/$$p"; \
@@ -644,14 +551,11 @@
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
-#>- kdewidgets.la: $(kdewidgets_la_OBJECTS) $(kdewidgets_la_DEPENDENCIES) 
-#>+ 2
-@KDE_USE_CLOSURE_TRUE@kdewidgets.la: kdewidgets.la.closure $(kdewidgets_la_OBJECTS) $(kdewidgets_la_DEPENDENCIES) 
-@KDE_USE_CLOSURE_FALSE@kdewidgets.la: $(kdewidgets_la_OBJECTS) $(kdewidgets_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(kde_widgetdir) $(kdewidgets_la_LDFLAGS) $(kdewidgets_la_OBJECTS) $(kdewidgets_la_LIBADD) $(LIBS)
+kdewidgets.la: $(kdewidgets_la_OBJECTS) $(kdewidgets_la_DEPENDENCIES) 
+	$(kdewidgets_la_LINK) -rpath $(kde_widgetdir) $(kdewidgets_la_OBJECTS) $(kdewidgets_la_LIBADD) $(LIBS)
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
+	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
 	  if test -f $$p \
@@ -679,7 +583,7 @@
 	done
 makekdewidgets$(EXEEXT): $(makekdewidgets_OBJECTS) $(makekdewidgets_DEPENDENCIES) 
 	@rm -f makekdewidgets$(EXEEXT)
-	$(CXXLINK) $(makekdewidgets_LDFLAGS) $(makekdewidgets_OBJECTS) $(makekdewidgets_LDADD) $(LIBS)
+	$(makekdewidgets_LINK) $(makekdewidgets_OBJECTS) $(makekdewidgets_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -692,22 +596,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/makekdewidgets.Po@am__quote@
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -718,10 +622,6 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
 # To change the values of `make' variables: instead of editing Makefiles,
@@ -753,8 +653,7 @@
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
+$(RECURSIVE_CLEAN_TARGETS):
 	@failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
@@ -855,22 +754,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -884,7 +782,7 @@
 	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
-	    || $(mkdir_p) "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 	    || exit 1; \
 	    distdir=`$(am__cd) $(distdir) && pwd`; \
 	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
@@ -892,6 +790,8 @@
 	      $(MAKE) $(AM_MAKEFLAGS) \
 	        top_distdir="$$top_distdir" \
 	        distdir="$$distdir/$$subdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -902,7 +802,7 @@
 installdirs: installdirs-recursive
 installdirs-am:
 	for dir in "$(DESTDIR)$(kde_widgetdir)" "$(DESTDIR)$(bindir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-recursive
 install-exec: install-exec-recursive
@@ -936,14 +836,14 @@
 #>- clean-am: clean-binPROGRAMS clean-generic clean-kde_widgetLTLIBRARIES \
 #>- 	clean-libtool mostlyclean-am
 #>+ 2
-clean-am: clean-closures clean-bcheck clean-final  clean-binPROGRAMS clean-generic clean-kde_widgetLTLIBRARIES \
+clean-am: clean-bcheck clean-final  clean-binPROGRAMS clean-generic clean-kde_widgetLTLIBRARIES \
 	clean-libtool mostlyclean-am
 
 distclean: distclean-recursive
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-recursive
 
@@ -957,12 +857,20 @@
 
 install-data-am: install-kde_widgetLTLIBRARIES
 
+install-dvi: install-dvi-recursive
+
 install-exec-am: install-binPROGRAMS
 
+install-html: install-html-recursive
+
 install-info: install-info-recursive
 
 install-man:
 
+install-pdf: install-pdf-recursive
+
+install-ps: install-ps-recursive
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
@@ -983,27 +891,27 @@
 
 ps-am:
 
-uninstall-am: uninstall-binPROGRAMS uninstall-info-am \
-	uninstall-kde_widgetLTLIBRARIES
+uninstall-am: uninstall-binPROGRAMS uninstall-kde_widgetLTLIBRARIES
 
-uninstall-info: uninstall-info-recursive
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+	install-strip
 
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-	clean clean-binPROGRAMS clean-generic \
-	clean-kde_widgetLTLIBRARIES clean-libtool clean-recursive \
-	ctags ctags-recursive distclean distclean-compile \
-	distclean-generic distclean-libtool distclean-recursive \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-binPROGRAMS install-data \
-	install-data-am install-exec install-exec-am install-info \
-	install-info-am install-kde_widgetLTLIBRARIES install-man \
-	install-strip installcheck installcheck-am installdirs \
-	installdirs-am maintainer-clean maintainer-clean-generic \
-	maintainer-clean-recursive mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
-	pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
-	uninstall-binPROGRAMS uninstall-info-am \
-	uninstall-kde_widgetLTLIBRARIES
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+	all all-am check check-am clean clean-binPROGRAMS \
+	clean-generic clean-kde_widgetLTLIBRARIES clean-libtool ctags \
+	ctags-recursive distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-binPROGRAMS \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-kde_widgetLTLIBRARIES \
+	install-man install-pdf install-pdf-am install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs installdirs-am maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags tags-recursive uninstall uninstall-am \
+	uninstall-binPROGRAMS uninstall-kde_widgetLTLIBRARIES
 
 
 kdewidgets.cpp: $(srcdir)/kde.widgets makekdewidgets
@@ -1012,22 +920,9 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
-#>+ 8
-kdewidgets.la.closure: $(kdewidgets_la_OBJECTS) $(kdewidgets_la_DEPENDENCIES)
-	@echo "int main() {return 0;}" > kdewidgets_la_closure.cpp
-	@$(LTCXXCOMPILE) -c kdewidgets_la_closure.cpp
-	$(CXXLINK) kdewidgets_la_closure.lo $(kdewidgets_la_LDFLAGS) $(kdewidgets_la_OBJECTS) $(kdewidgets_la_LIBADD) $(LIBS)
-	@rm -f kdewidgets_la_closure.* kdewidgets.la.closure
-	@echo "timestamp" > kdewidgets.la.closure
-
-
 #>+ 2
 KDE_DIST=Makefile.in kde.widgets classpreviews.h Makefile.am 
 
-#>+ 3
-clean-closures:
-	-rm -f  kdewidgets.la.closure
-
 #>+ 2
 docs-am:
 
--- kdelibs-3.5.7.orig/kdeprint/cups/Makefile.in
+++ kdelibs-3.5.7/kdeprint/cups/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -18,15 +18,11 @@
 
 
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -95,6 +91,13 @@
 	kmwother.lo ippreportdlg.lo kptagspage.lo
 @KDE_USE_FINAL_FALSE@kdeprint_cups_la_OBJECTS = $(kdeprint_cups_la_nofinal_OBJECTS)
 @KDE_USE_FINAL_TRUE@kdeprint_cups_la_OBJECTS = $(kdeprint_cups_la_final_OBJECTS)
+#>- kdeprint_cups_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(kdeprint_cups_la_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+kdeprint_cups_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(kdeprint_cups_la_LDFLAGS) $(LDFLAGS) -o $@
 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(bin_PROGRAMS)
 am_cupsdoprint_OBJECTS = cupsdoprint.$(OBJEXT)
@@ -103,6 +106,9 @@
 cupsdoprint_OBJECTS = cupsdoprint.$(OBJEXT)
 cupsdoprint_DEPENDENCIES = $(am__DEPENDENCIES_1) \
 	$(top_builddir)/kdecore/libkdefakes.la
+cupsdoprint_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(cupsdoprint_LDFLAGS) $(LDFLAGS) -o $@
 am_make_driver_db_cups_OBJECTS = make_driver_db_cups.$(OBJEXT)
 #>- make_driver_db_cups_OBJECTS = $(am_make_driver_db_cups_OBJECTS)
 #>+ 1
@@ -110,56 +116,66 @@
 make_driver_db_cups_DEPENDENCIES = ../libdriverparse.a \
 	$(top_builddir)/kdecore/libkdefakes.la $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+make_driver_db_cups_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(make_driver_db_cups_LDFLAGS) $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 #>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 #>+ 2
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
-#>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+#>+ 3
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
 CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 3
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(kdeprint_cups_la_SOURCES) $(cupsdoprint_SOURCES) \
 	$(make_driver_db_cups_SOURCES)
 DIST_SOURCES = $(kdeprint_cups_la_SOURCES) $(cupsdoprint_SOURCES) \
 	$(make_driver_db_cups_SOURCES)
 #>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 #>- 	html-recursive info-recursive install-data-recursive \
-#>- 	install-exec-recursive install-info-recursive \
-#>- 	install-recursive installcheck-recursive installdirs-recursive \
-#>- 	pdf-recursive ps-recursive uninstall-info-recursive \
-#>- 	uninstall-recursive
-#>+ 6
+#>- 	install-dvi-recursive install-exec-recursive \
+#>- 	install-html-recursive install-info-recursive \
+#>- 	install-pdf-recursive install-ps-recursive install-recursive \
+#>- 	installcheck-recursive installdirs-recursive pdf-recursive \
+#>- 	ps-recursive uninstall-recursive
+#>+ 7
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	html-recursive info-recursive install-data-recursive \
-	install-exec-recursive install-info-recursive \
-	install-recursive installcheck-recursive installdirs-recursive \
-	pdf-recursive ps-recursive uninstall-info-recursive \
-	uninstall-recursive nmcheck-recursive bcheck-recursive
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive nmcheck-recursive bcheck-recursive
 entryDATA_INSTALL = $(INSTALL_DATA)
 miscDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(entry_DATA) $(misc_DATA)
 HEADERS = $(noinst_HEADERS)
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
@@ -169,8 +185,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -178,13 +192,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -198,8 +212,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -220,17 +232,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -299,7 +308,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -336,12 +344,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -386,87 +396,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -490,75 +456,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -566,16 +474,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -594,9 +501,7 @@
 				  kptextpage.cpp kphpgl2page.cpp cupsaddsmb2.cpp kmwother.cpp ippreportdlg.cpp \
 				  kptagspage.cpp
 
-#>- kdeprint_cups_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
-#>+ 1
-kdeprint_cups_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined $(KDE_NO_UNDEFINED)
+kdeprint_cups_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
 kdeprint_cups_la_LIBADD = $(top_builddir)/kdeprint/management/libkdeprint_management.la $(LIB_KIO) $(LIB_CUPS) $(top_builddir)/kdecore/libkdefakes.la
 #>- kdeprint_cups_la_METASOURCES = AUTO
 noinst_HEADERS = cupsinfos.h ipprequest.h kmcupsjobmanager.h kmcupsmanager.h kmcupsuimanager.h \
@@ -623,7 +528,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .c .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -661,13 +566,13 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
+	test -z "$(kde_moduledir)" || $(MKDIR_P) "$(DESTDIR)$(kde_moduledir)"
 	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
@@ -678,7 +583,7 @@
 
 uninstall-kde_moduleLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
@@ -692,14 +597,11 @@
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
-#>- kdeprint_cups.la: $(kdeprint_cups_la_OBJECTS) $(kdeprint_cups_la_DEPENDENCIES) 
-#>+ 2
-@KDE_USE_CLOSURE_TRUE@kdeprint_cups.la: kdeprint_cups.la.closure $(kdeprint_cups_la_OBJECTS) $(kdeprint_cups_la_DEPENDENCIES) 
-@KDE_USE_CLOSURE_FALSE@kdeprint_cups.la: $(kdeprint_cups_la_OBJECTS) $(kdeprint_cups_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(kde_moduledir) $(kdeprint_cups_la_LDFLAGS) $(kdeprint_cups_la_OBJECTS) $(kdeprint_cups_la_LIBADD) $(LIBS)
+kdeprint_cups.la: $(kdeprint_cups_la_OBJECTS) $(kdeprint_cups_la_DEPENDENCIES) 
+	$(kdeprint_cups_la_LINK) -rpath $(kde_moduledir) $(kdeprint_cups_la_OBJECTS) $(kdeprint_cups_la_LIBADD) $(LIBS)
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
+	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
 	  if test -f $$p \
@@ -727,10 +629,10 @@
 	done
 cupsdoprint$(EXEEXT): $(cupsdoprint_OBJECTS) $(cupsdoprint_DEPENDENCIES) 
 	@rm -f cupsdoprint$(EXEEXT)
-	$(LINK) $(cupsdoprint_LDFLAGS) $(cupsdoprint_OBJECTS) $(cupsdoprint_LDADD) $(LIBS)
+	$(cupsdoprint_LINK) $(cupsdoprint_OBJECTS) $(cupsdoprint_LDADD) $(LIBS)
 make_driver_db_cups$(EXEEXT): $(make_driver_db_cups_OBJECTS) $(make_driver_db_cups_DEPENDENCIES) 
 	@rm -f make_driver_db_cups$(EXEEXT)
-	$(LINK) $(make_driver_db_cups_LDFLAGS) $(make_driver_db_cups_OBJECTS) $(make_driver_db_cups_LDADD) $(LIBS)
+	$(make_driver_db_cups_LINK) $(make_driver_db_cups_OBJECTS) $(make_driver_db_cups_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -773,43 +675,43 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/make_driver_db_cups.Po@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -819,13 +721,9 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 install-entryDATA: $(entry_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(entrydir)" || $(mkdir_p) "$(DESTDIR)$(entrydir)"
+	test -z "$(entrydir)" || $(MKDIR_P) "$(DESTDIR)$(entrydir)"
 	@list='$(entry_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -842,7 +740,7 @@
 	done
 install-miscDATA: $(misc_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(miscdir)" || $(mkdir_p) "$(DESTDIR)$(miscdir)"
+	test -z "$(miscdir)" || $(MKDIR_P) "$(DESTDIR)$(miscdir)"
 	@list='$(misc_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -889,8 +787,7 @@
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
+$(RECURSIVE_CLEAN_TARGETS):
 	@failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
@@ -991,22 +888,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -1020,7 +916,7 @@
 	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
-	    || $(mkdir_p) "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 	    || exit 1; \
 	    distdir=`$(am__cd) $(distdir) && pwd`; \
 	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
@@ -1028,6 +924,8 @@
 	      $(MAKE) $(AM_MAKEFLAGS) \
 	        top_distdir="$$top_distdir" \
 	        distdir="$$distdir/$$subdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -1038,7 +936,7 @@
 installdirs: installdirs-recursive
 installdirs-am:
 	for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(entrydir)" "$(DESTDIR)$(miscdir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-recursive
 install-exec: install-exec-recursive
@@ -1071,14 +969,14 @@
 #>- clean-am: clean-binPROGRAMS clean-generic clean-kde_moduleLTLIBRARIES \
 #>- 	clean-libtool mostlyclean-am
 #>+ 2
-clean-am: clean-metasources clean-closures clean-bcheck clean-final  clean-binPROGRAMS clean-generic clean-kde_moduleLTLIBRARIES \
+clean-am: clean-metasources clean-bcheck clean-final  clean-binPROGRAMS clean-generic clean-kde_moduleLTLIBRARIES \
 	clean-libtool mostlyclean-am
 
 distclean: distclean-recursive
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-recursive
 
@@ -1096,14 +994,22 @@
 install-data-am:   install-data-local install-entryDATA \
  install-miscDATA
 
+install-dvi: install-dvi-recursive
+
 #>- install-exec-am: install-binPROGRAMS
 #>+ 1
 install-exec-am:  install-binPROGRAMS install-kde_moduleLTLIBRARIES
 
+install-html: install-html-recursive
+
 install-info: install-info-recursive
 
 install-man:
 
+install-pdf: install-pdf-recursive
+
+install-ps: install-ps-recursive
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
@@ -1125,28 +1031,29 @@
 ps-am:
 
 uninstall-am: uninstall-binPROGRAMS uninstall-entryDATA \
-	uninstall-info-am uninstall-kde_moduleLTLIBRARIES \
-	uninstall-miscDATA
+	uninstall-kde_moduleLTLIBRARIES uninstall-miscDATA
 
-uninstall-info: uninstall-info-recursive
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+	install-strip
 
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-	clean clean-binPROGRAMS clean-generic \
-	clean-kde_moduleLTLIBRARIES clean-libtool clean-recursive \
-	ctags ctags-recursive distclean distclean-compile \
-	distclean-generic distclean-libtool distclean-recursive \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-binPROGRAMS install-data \
-	install-data-am install-data-local install-entryDATA \
-	install-exec install-exec-am install-info install-info-am \
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+	all all-am check check-am clean clean-binPROGRAMS \
+	clean-generic clean-kde_moduleLTLIBRARIES clean-libtool ctags \
+	ctags-recursive distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-binPROGRAMS \
+	install-data install-data-am install-data-local install-dvi \
+	install-dvi-am install-entryDATA install-exec install-exec-am \
+	install-html install-html-am install-info install-info-am \
 	install-kde_moduleLTLIBRARIES install-man install-miscDATA \
+	install-pdf install-pdf-am install-ps install-ps-am \
 	install-strip installcheck installcheck-am installdirs \
 	installdirs-am maintainer-clean maintainer-clean-generic \
-	maintainer-clean-recursive mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
-	pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
-	uninstall-binPROGRAMS uninstall-entryDATA uninstall-info-am \
-	uninstall-kde_moduleLTLIBRARIES uninstall-miscDATA
+	mostlyclean mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
+	uninstall uninstall-am uninstall-binPROGRAMS \
+	uninstall-entryDATA uninstall-kde_moduleLTLIBRARIES \
+	uninstall-miscDATA
 
 
 install-data-local:
@@ -1157,15 +1064,6 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
-#>+ 8
-kdeprint_cups.la.closure: $(kdeprint_cups_la_OBJECTS) $(kdeprint_cups_la_DEPENDENCIES)
-	@echo "int main() {return 0;}" > kdeprint_cups_la_closure.cpp
-	@$(LTCXXCOMPILE) -c kdeprint_cups_la_closure.cpp
-	$(CXXLINK) kdeprint_cups_la_closure.lo $(kdeprint_cups_la_LDFLAGS) $(kdeprint_cups_la_OBJECTS) $(kdeprint_cups_la_LIBADD) $(LIBS)
-	@rm -f kdeprint_cups_la_closure.* kdeprint_cups.la.closure
-	@echo "timestamp" > kdeprint_cups.la.closure
-
-
 #>+ 3
 kmwother.moc: $(srcdir)/kmwother.h
 	$(MOC) $(srcdir)/kmwother.h -o kmwother.moc
@@ -1250,10 +1148,6 @@
 #>+ 2
 KDE_DIST=cups.print Makefile.in preview-mini.png configure.in.in preview.png Makefile.am 
 
-#>+ 3
-clean-closures:
-	-rm -f  kdeprint_cups.la.closure
-
 #>+ 2
 docs-am:
 
--- kdelibs-3.5.7.orig/kdeprint/cups/cupsdconf2/Makefile.in
+++ kdelibs-3.5.7/kdeprint/cups/cupsdconf2/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -20,15 +20,11 @@
 
 
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -88,40 +84,50 @@
 #>- cupsdconf_la_OBJECTS = $(am_cupsdconf_la_OBJECTS)
 #>+ 1
 cupsdconf_la_OBJECTS = cupsdconf_dummy.lo
+#>- cupsdconf_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(cupsdconf_la_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+cupsdconf_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(cupsdconf_la_LDFLAGS) $(LDFLAGS) -o $@
 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 #>- PROGRAMS = $(bin_PROGRAMS)
 #>+ 2
 bin_PROGRAMS += cupsdconf$(EXEEXT) 
 PROGRAMS = $(bin_PROGRAMS)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 #>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 #>+ 2
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
-#>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+#>+ 3
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
 CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 3
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 #>- SOURCES = $(cupsdconf_la_SOURCES)
 #>+ 1
 SOURCES = $(cupsdconf_la_SOURCES) $(cupsdconf_SOURCES) 
@@ -139,8 +145,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -148,13 +152,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -168,8 +172,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -190,17 +192,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -269,7 +268,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -306,12 +304,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -356,87 +356,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -460,75 +416,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -536,16 +434,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -589,7 +486,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .c .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -627,13 +524,13 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(kdeinitdir)" || $(mkdir_p) "$(DESTDIR)$(kdeinitdir)"
+	test -z "$(kdeinitdir)" || $(MKDIR_P) "$(DESTDIR)$(kdeinitdir)"
 	@list='$(kdeinit_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
@@ -644,7 +541,7 @@
 
 uninstall-kdeinitLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@set -x; list='$(kdeinit_LTLIBRARIES)'; for p in $$list; do \
+	@list='$(kdeinit_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kdeinitdir)/$$p'"; \
 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kdeinitdir)/$$p"; \
@@ -660,7 +557,7 @@
 	done
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
@@ -671,7 +568,7 @@
 
 uninstall-libLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
@@ -686,10 +583,10 @@
 	  rm -f "$${dir}/so_locations"; \
 	done
 cupsdconf.la: $(cupsdconf_la_OBJECTS) $(cupsdconf_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(kdeinitdir) $(cupsdconf_la_LDFLAGS) $(cupsdconf_la_OBJECTS) $(cupsdconf_la_LIBADD) $(LIBS)
+	$(cupsdconf_la_LINK) -rpath $(kdeinitdir) $(cupsdconf_la_OBJECTS) $(cupsdconf_la_LIBADD) $(LIBS)
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
+	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
 	  if test -f $$p \
@@ -747,43 +644,43 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sizewidget.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -793,13 +690,9 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 install-cupsdconfdataDATA: $(cupsdconfdata_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(cupsdconfdatadir)" || $(mkdir_p) "$(DESTDIR)$(cupsdconfdatadir)"
+	test -z "$(cupsdconfdatadir)" || $(MKDIR_P) "$(DESTDIR)$(cupsdconfdatadir)"
 	@list='$(cupsdconfdata_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -864,22 +757,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -897,7 +789,7 @@
 
 installdirs:
 	for dir in "$(DESTDIR)$(kdeinitdir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(cupsdconfdatadir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -937,7 +829,7 @@
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
@@ -951,12 +843,20 @@
 
 install-data-am: install-cupsdconfdataDATA install-kdeinitLTLIBRARIES
 
+install-dvi: install-dvi-am
+
 install-exec-am: install-binPROGRAMS install-libLTLIBRARIES
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -978,8 +878,9 @@
 ps-am:
 
 uninstall-am: uninstall-binPROGRAMS uninstall-cupsdconfdataDATA \
-	uninstall-info-am uninstall-kdeinitLTLIBRARIES \
-	uninstall-libLTLIBRARIES
+	uninstall-kdeinitLTLIBRARIES uninstall-libLTLIBRARIES
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
 	clean-generic clean-kdeinitLTLIBRARIES clean-libLTLIBRARIES \
@@ -987,15 +888,17 @@
 	distclean-generic distclean-libtool distclean-tags distdir dvi \
 	dvi-am html html-am info info-am install install-am \
 	install-binPROGRAMS install-cupsdconfdataDATA install-data \
-	install-data-am install-exec install-exec-am install-info \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
 	install-info-am install-kdeinitLTLIBRARIES \
-	install-libLTLIBRARIES install-man install-strip installcheck \
+	install-libLTLIBRARIES install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
 	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 	tags uninstall uninstall-am uninstall-binPROGRAMS \
-	uninstall-cupsdconfdataDATA uninstall-info-am \
-	uninstall-kdeinitLTLIBRARIES uninstall-libLTLIBRARIES
+	uninstall-cupsdconfdataDATA uninstall-kdeinitLTLIBRARIES \
+	uninstall-libLTLIBRARIES
 
 
 # Translations
--- kdelibs-3.5.7.orig/kdeprint/tests/Makefile.in
+++ kdelibs-3.5.7/kdeprint/tests/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,15 +14,11 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -57,6 +53,13 @@
 #>+ 1
 drawdemo_OBJECTS = drawdemo.$(OBJEXT)
 drawdemo_DEPENDENCIES = $(top_builddir)/kdeprint/libkdeprint.la
+#>- drawdemo_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(drawdemo_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+drawdemo_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(drawdemo_LDFLAGS) $(LDFLAGS) -o $@
 am_helpviewer_OBJECTS = helpwindow.$(OBJEXT) main.$(OBJEXT) \
 	richpage.$(OBJEXT)
 #>- helpviewer_OBJECTS = $(am_helpviewer_OBJECTS)
@@ -67,7 +70,14 @@
 @KDE_USE_FINAL_FALSE@helpviewer_OBJECTS = $(helpviewer_nofinal_OBJECTS)
 @KDE_USE_FINAL_TRUE@helpviewer_OBJECTS = $(helpviewer_final_OBJECTS)
 helpviewer_DEPENDENCIES = $(top_builddir)/kdeprint/libkdeprint.la
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+#>- helpviewer_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(helpviewer_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+helpviewer_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(helpviewer_LDFLAGS) $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -75,19 +85,21 @@
 #>+ 2
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
-#>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+#>+ 3
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
 CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 3
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(drawdemo_SOURCES) $(helpviewer_SOURCES)
 DIST_SOURCES = $(drawdemo_SOURCES) $(helpviewer_SOURCES)
 ETAGS = etags
@@ -98,8 +110,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -107,13 +117,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -127,8 +137,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -149,17 +157,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -228,7 +233,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -265,12 +269,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -315,87 +321,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -419,75 +381,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -495,16 +399,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -526,7 +429,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -564,9 +467,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 clean-checkPROGRAMS:
@@ -577,10 +480,10 @@
 	done
 drawdemo$(EXEEXT): $(drawdemo_OBJECTS) $(drawdemo_DEPENDENCIES) 
 	@rm -f drawdemo$(EXEEXT)
-	$(CXXLINK) $(drawdemo_LDFLAGS) $(drawdemo_OBJECTS) $(drawdemo_LDADD) $(LIBS)
+	$(drawdemo_LINK) $(drawdemo_OBJECTS) $(drawdemo_LDADD) $(LIBS)
 helpviewer$(EXEEXT): $(helpviewer_OBJECTS) $(helpviewer_DEPENDENCIES) 
 	@rm -f helpviewer$(EXEEXT)
-	$(CXXLINK) $(helpviewer_LDFLAGS) $(helpviewer_OBJECTS) $(helpviewer_LDADD) $(LIBS)
+	$(helpviewer_LINK) $(helpviewer_OBJECTS) $(helpviewer_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -594,22 +497,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/richpage.Po@am__quote@
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -620,10 +523,6 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -673,22 +572,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -742,7 +640,7 @@
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
@@ -756,12 +654,20 @@
 
 install-data-am:
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -782,19 +688,23 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am
+uninstall-am:
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean \
 	clean-checkPROGRAMS clean-generic clean-libtool ctags \
 	distclean distclean-compile distclean-generic \
 	distclean-libtool distclean-tags distdir dvi dvi-am html \
 	html-am info info-am install install-am install-data \
-	install-data-am install-exec install-exec-am install-info \
-	install-info-am install-man install-strip installcheck \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
 	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-info-am
+	tags uninstall uninstall-am
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- kdelibs-3.5.7.orig/kdeprint/lpdunix/Makefile.in
+++ kdelibs-3.5.7/kdeprint/lpdunix/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -17,15 +17,11 @@
 
 
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -77,7 +73,14 @@
 	kmlpdunixuimanager.lo
 @KDE_USE_FINAL_FALSE@kdeprint_lpdunix_la_OBJECTS = $(kdeprint_lpdunix_la_nofinal_OBJECTS)
 @KDE_USE_FINAL_TRUE@kdeprint_lpdunix_la_OBJECTS = $(kdeprint_lpdunix_la_final_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+#>- kdeprint_lpdunix_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(kdeprint_lpdunix_la_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+kdeprint_lpdunix_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(kdeprint_lpdunix_la_LDFLAGS) $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -85,19 +88,21 @@
 #>+ 2
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 #>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
 CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 3
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(kdeprint_lpdunix_la_SOURCES)
 DIST_SOURCES = $(kdeprint_lpdunix_la_SOURCES)
 entryDATA_INSTALL = $(INSTALL_DATA)
@@ -111,8 +116,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -120,13 +123,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -140,8 +143,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -162,17 +163,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -241,7 +239,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -278,12 +275,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -328,87 +327,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -432,75 +387,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -508,16 +405,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -527,9 +423,7 @@
 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/kdeprint $(all_includes)
 kde_module_LTLIBRARIES = kdeprint_lpdunix.la
 kdeprint_lpdunix_la_SOURCES = kmlpdunixfactory.cpp kmlpdunixmanager.cpp klpdunixprinterimpl.cpp kmlpdunixuimanager.cpp
-#>- kdeprint_lpdunix_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
-#>+ 1
-kdeprint_lpdunix_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined $(KDE_NO_UNDEFINED)
+kdeprint_lpdunix_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
 kdeprint_lpdunix_la_LIBADD = $(top_builddir)/kdeprint/management/libkdeprint_management.la
 #>- kdeprint_lpdunix_la_METASOURCES = AUTO
 noinst_HEADERS = kmlpdunixmanager.h klpdunixprinterimpl.h kmlpdunixuimanager.h
@@ -541,7 +435,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -579,13 +473,13 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
+	test -z "$(kde_moduledir)" || $(MKDIR_P) "$(DESTDIR)$(kde_moduledir)"
 	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
@@ -596,7 +490,7 @@
 
 uninstall-kde_moduleLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
@@ -610,11 +504,8 @@
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
-#>- kdeprint_lpdunix.la: $(kdeprint_lpdunix_la_OBJECTS) $(kdeprint_lpdunix_la_DEPENDENCIES) 
-#>+ 2
-@KDE_USE_CLOSURE_TRUE@kdeprint_lpdunix.la: kdeprint_lpdunix.la.closure $(kdeprint_lpdunix_la_OBJECTS) $(kdeprint_lpdunix_la_DEPENDENCIES) 
-@KDE_USE_CLOSURE_FALSE@kdeprint_lpdunix.la: $(kdeprint_lpdunix_la_OBJECTS) $(kdeprint_lpdunix_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(kde_moduledir) $(kdeprint_lpdunix_la_LDFLAGS) $(kdeprint_lpdunix_la_OBJECTS) $(kdeprint_lpdunix_la_LIBADD) $(LIBS)
+kdeprint_lpdunix.la: $(kdeprint_lpdunix_la_OBJECTS) $(kdeprint_lpdunix_la_DEPENDENCIES) 
+	$(kdeprint_lpdunix_la_LINK) -rpath $(kde_moduledir) $(kdeprint_lpdunix_la_OBJECTS) $(kdeprint_lpdunix_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -628,22 +519,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kmlpdunixuimanager.Plo@am__quote@
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -653,13 +544,9 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 install-entryDATA: $(entry_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(entrydir)" || $(mkdir_p) "$(DESTDIR)$(entrydir)"
+	test -z "$(entrydir)" || $(MKDIR_P) "$(DESTDIR)$(entrydir)"
 	@list='$(entry_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -724,22 +611,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -755,7 +641,7 @@
 all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS)
 installdirs:
 	for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(entrydir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -788,14 +674,14 @@
 #>- clean-am: clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
 #>- 	mostlyclean-am
 #>+ 2
-clean-am: clean-closures clean-bcheck clean-final  clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
+clean-am: clean-bcheck clean-final  clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
 	mostlyclean-am
 
 distclean: distclean-am
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
@@ -811,14 +697,22 @@
 #>+ 1
 install-data-am:   install-entryDATA 
 
+install-dvi: install-dvi-am
+
 #>- install-exec-am:
 #>+ 1
 install-exec-am:  install-kde_moduleLTLIBRARIES
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -839,43 +733,32 @@
 
 ps-am:
 
-uninstall-am: uninstall-entryDATA uninstall-info-am \
-	uninstall-kde_moduleLTLIBRARIES
+uninstall-am: uninstall-entryDATA uninstall-kde_moduleLTLIBRARIES
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-kde_moduleLTLIBRARIES clean-libtool ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
 	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am \
-	install-entryDATA install-exec install-exec-am install-info \
-	install-info-am install-kde_moduleLTLIBRARIES install-man \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-	pdf pdf-am ps ps-am tags uninstall uninstall-am \
-	uninstall-entryDATA uninstall-info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-entryDATA install-exec install-exec-am \
+	install-html install-html-am install-info install-info-am \
+	install-kde_moduleLTLIBRARIES install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags uninstall uninstall-am uninstall-entryDATA \
 	uninstall-kde_moduleLTLIBRARIES
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
-#>+ 8
-kdeprint_lpdunix.la.closure: $(kdeprint_lpdunix_la_OBJECTS) $(kdeprint_lpdunix_la_DEPENDENCIES)
-	@echo "int main() {return 0;}" > kdeprint_lpdunix_la_closure.cpp
-	@$(LTCXXCOMPILE) -c kdeprint_lpdunix_la_closure.cpp
-	$(CXXLINK) kdeprint_lpdunix_la_closure.lo $(kdeprint_lpdunix_la_LDFLAGS) $(kdeprint_lpdunix_la_OBJECTS) $(kdeprint_lpdunix_la_LIBADD) $(LIBS)
-	@rm -f kdeprint_lpdunix_la_closure.* kdeprint_lpdunix.la.closure
-	@echo "timestamp" > kdeprint_lpdunix.la.closure
-
-
 #>+ 2
 KDE_DIST=lpdunix.print Makefile.in Makefile.am 
 
-#>+ 3
-clean-closures:
-	-rm -f  kdeprint_lpdunix.la.closure
-
 #>+ 2
 docs-am:
 
--- kdelibs-3.5.7.orig/kdeprint/lpr/Makefile.in
+++ kdelibs-3.5.7/kdeprint/lpr/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -18,15 +18,11 @@
 
 
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -88,6 +84,13 @@
 	lprngtoolhandler.lo editentrydialog.lo
 @KDE_USE_FINAL_FALSE@kdeprint_lpr_la_OBJECTS = $(kdeprint_lpr_la_nofinal_OBJECTS)
 @KDE_USE_FINAL_TRUE@kdeprint_lpr_la_OBJECTS = $(kdeprint_lpr_la_final_OBJECTS)
+#>- kdeprint_lpr_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(kdeprint_lpr_la_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+kdeprint_lpr_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(kdeprint_lpr_la_LDFLAGS) $(LDFLAGS) -o $@
 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(bin_PROGRAMS)
 am_make_driver_db_lpr_OBJECTS = make_driver_db_lpr.$(OBJEXT)
@@ -98,35 +101,41 @@
 make_driver_db_lpr_DEPENDENCIES =  \
 	$(top_builddir)/kdecore/libkdefakes.la ../libdriverparse.a \
 	$(am__DEPENDENCIES_1)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+make_driver_db_lpr_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(make_driver_db_lpr_LDFLAGS) $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 #>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 #>+ 2
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 #>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
 CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 3
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(kdeprint_lpr_la_SOURCES) $(make_driver_db_lpr_SOURCES)
 DIST_SOURCES = $(kdeprint_lpr_la_SOURCES) \
 	$(make_driver_db_lpr_SOURCES)
@@ -143,8 +152,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -152,13 +159,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -172,8 +179,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -194,17 +199,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -273,7 +275,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -310,12 +311,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -360,87 +363,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -464,75 +423,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -540,16 +441,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -567,9 +467,7 @@
 			     lprngtoolhandler.cpp \
 			     editentrydialog.cpp
 
-#>- kdeprint_lpr_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
-#>+ 1
-kdeprint_lpr_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined $(KDE_NO_UNDEFINED)
+kdeprint_lpr_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
 kdeprint_lpr_la_LIBADD = $(top_builddir)/kdeprint/management/libkdeprint_management.la $(top_builddir)/kdecore/libkdefakes.la
 #>- kdeprint_lpr_la_METASOURCES = AUTO
 noinst_HEADERS = printcapreader.h \
@@ -595,7 +493,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .c .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -633,13 +531,13 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
+	test -z "$(kde_moduledir)" || $(MKDIR_P) "$(DESTDIR)$(kde_moduledir)"
 	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
@@ -650,7 +548,7 @@
 
 uninstall-kde_moduleLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
@@ -664,14 +562,11 @@
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
-#>- kdeprint_lpr.la: $(kdeprint_lpr_la_OBJECTS) $(kdeprint_lpr_la_DEPENDENCIES) 
-#>+ 2
-@KDE_USE_CLOSURE_TRUE@kdeprint_lpr.la: kdeprint_lpr.la.closure $(kdeprint_lpr_la_OBJECTS) $(kdeprint_lpr_la_DEPENDENCIES) 
-@KDE_USE_CLOSURE_FALSE@kdeprint_lpr.la: $(kdeprint_lpr_la_OBJECTS) $(kdeprint_lpr_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(kde_moduledir) $(kdeprint_lpr_la_LDFLAGS) $(kdeprint_lpr_la_OBJECTS) $(kdeprint_lpr_la_LIBADD) $(LIBS)
+kdeprint_lpr.la: $(kdeprint_lpr_la_OBJECTS) $(kdeprint_lpr_la_DEPENDENCIES) 
+	$(kdeprint_lpr_la_LINK) -rpath $(kde_moduledir) $(kdeprint_lpr_la_OBJECTS) $(kdeprint_lpr_la_LIBADD) $(LIBS)
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
+	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
 	  if test -f $$p \
@@ -699,7 +594,7 @@
 	done
 make_driver_db_lpr$(EXEEXT): $(make_driver_db_lpr_OBJECTS) $(make_driver_db_lpr_DEPENDENCIES) 
 	@rm -f make_driver_db_lpr$(EXEEXT)
-	$(LINK) $(make_driver_db_lpr_LDFLAGS) $(make_driver_db_lpr_OBJECTS) $(make_driver_db_lpr_LDADD) $(LIBS)
+	$(make_driver_db_lpr_LINK) $(make_driver_db_lpr_OBJECTS) $(make_driver_db_lpr_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -727,43 +622,43 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/printcapreader.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -773,13 +668,9 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 install-entryDATA: $(entry_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(entrydir)" || $(mkdir_p) "$(DESTDIR)$(entrydir)"
+	test -z "$(entrydir)" || $(MKDIR_P) "$(DESTDIR)$(entrydir)"
 	@list='$(entry_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -796,7 +687,7 @@
 	done
 install-miscdataDATA: $(miscdata_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(miscdatadir)" || $(mkdir_p) "$(DESTDIR)$(miscdatadir)"
+	test -z "$(miscdatadir)" || $(MKDIR_P) "$(DESTDIR)$(miscdatadir)"
 	@list='$(miscdata_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -813,7 +704,7 @@
 	done
 install-kdeprintlprHEADERS: $(kdeprintlpr_HEADERS)
 	@$(NORMAL_INSTALL)
-	test -z "$(kdeprintlprdir)" || $(mkdir_p) "$(DESTDIR)$(kdeprintlprdir)"
+	test -z "$(kdeprintlprdir)" || $(MKDIR_P) "$(DESTDIR)$(kdeprintlprdir)"
 	@list='$(kdeprintlpr_HEADERS)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -878,22 +769,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -909,7 +799,7 @@
 all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA) $(HEADERS)
 installdirs:
 	for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(entrydir)" "$(DESTDIR)$(miscdatadir)" "$(DESTDIR)$(kdeprintlprdir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -942,14 +832,14 @@
 #>- clean-am: clean-binPROGRAMS clean-generic clean-kde_moduleLTLIBRARIES \
 #>- 	clean-libtool mostlyclean-am
 #>+ 2
-clean-am: clean-metasources clean-closures clean-bcheck clean-final  clean-binPROGRAMS clean-generic clean-kde_moduleLTLIBRARIES \
+clean-am: clean-metasources clean-bcheck clean-final  clean-binPROGRAMS clean-generic clean-kde_moduleLTLIBRARIES \
 	clean-libtool mostlyclean-am
 
 distclean: distclean-am
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
@@ -967,14 +857,22 @@
 install-data-am:   install-entryDATA \
 	install-kdeprintlprHEADERS install-miscdataDATA
 
+install-dvi: install-dvi-am
+
 #>- install-exec-am: install-binPROGRAMS
 #>+ 1
 install-exec-am:  install-binPROGRAMS install-kde_moduleLTLIBRARIES
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -996,39 +894,33 @@
 ps-am:
 
 uninstall-am: uninstall-binPROGRAMS uninstall-entryDATA \
-	uninstall-info-am uninstall-kde_moduleLTLIBRARIES \
-	uninstall-kdeprintlprHEADERS uninstall-miscdataDATA
+	uninstall-kde_moduleLTLIBRARIES uninstall-kdeprintlprHEADERS \
+	uninstall-miscdataDATA
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
 	clean-generic clean-kde_moduleLTLIBRARIES clean-libtool ctags \
 	distclean distclean-compile distclean-generic \
 	distclean-libtool distclean-tags distdir dvi dvi-am html \
 	html-am info info-am install install-am install-binPROGRAMS \
-	install-data install-data-am install-entryDATA install-exec \
-	install-exec-am install-info install-info-am \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-entryDATA install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am \
 	install-kde_moduleLTLIBRARIES install-kdeprintlprHEADERS \
-	install-man install-miscdataDATA install-strip installcheck \
+	install-man install-miscdataDATA install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
 	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 	tags uninstall uninstall-am uninstall-binPROGRAMS \
-	uninstall-entryDATA uninstall-info-am \
-	uninstall-kde_moduleLTLIBRARIES uninstall-kdeprintlprHEADERS \
-	uninstall-miscdataDATA
+	uninstall-entryDATA uninstall-kde_moduleLTLIBRARIES \
+	uninstall-kdeprintlprHEADERS uninstall-miscdataDATA
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
-#>+ 8
-kdeprint_lpr.la.closure: $(kdeprint_lpr_la_OBJECTS) $(kdeprint_lpr_la_DEPENDENCIES)
-	@echo "int main() {return 0;}" > kdeprint_lpr_la_closure.cpp
-	@$(LTCXXCOMPILE) -c kdeprint_lpr_la_closure.cpp
-	$(CXXLINK) kdeprint_lpr_la_closure.lo $(kdeprint_lpr_la_LDFLAGS) $(kdeprint_lpr_la_OBJECTS) $(kdeprint_lpr_la_LIBADD) $(LIBS)
-	@rm -f kdeprint_lpr_la_closure.* kdeprint_lpr.la.closure
-	@echo "timestamp" > kdeprint_lpr.la.closure
-
-
 #>+ 3
 editentrydialog.moc: $(srcdir)/editentrydialog.h
 	$(MOC) $(srcdir)/editentrydialog.h -o editentrydialog.moc
@@ -1050,10 +942,6 @@
 #>+ 2
 KDE_DIST=apsdriver1 Makefile.in lprngtooldriver1 apsdriver2 lpr.print Makefile.am 
 
-#>+ 3
-clean-closures:
-	-rm -f  kdeprint_lpr.la.closure
-
 #>+ 2
 docs-am:
 
--- kdelibs-3.5.7.orig/kdeprint/pics/Makefile.in
+++ kdelibs-3.5.7/kdeprint/pics/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -15,15 +15,11 @@
 
 @SET_MAKE@
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -69,8 +65,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -78,13 +72,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -98,8 +92,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -120,17 +112,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -199,7 +188,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -236,12 +224,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -286,87 +276,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -390,75 +336,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -466,16 +354,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -508,7 +395,7 @@
 all: docs-am  all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -546,9 +433,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 mostlyclean-libtool:
@@ -556,13 +443,9 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 install-icondataDATA: $(icondata_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(icondatadir)" || $(mkdir_p) "$(DESTDIR)$(icondatadir)"
+	test -z "$(icondatadir)" || $(MKDIR_P) "$(DESTDIR)$(icondatadir)"
 	@list='$(icondata_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -585,22 +468,21 @@
 
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -616,7 +498,7 @@
 all-am: Makefile $(DATA)
 installdirs:
 	for dir in "$(DESTDIR)$(icondatadir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -652,7 +534,7 @@
 
 distclean: distclean-am
 	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool
+distclean-am: clean-am distclean-generic
 
 dvi: dvi-am
 
@@ -668,12 +550,20 @@
 #>+ 1
 install-data-am: install-kde-icons  install-icondataDATA
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -692,20 +582,23 @@
 
 ps-am:
 
-#>- uninstall-am: uninstall-icondataDATA uninstall-info-am
+#>- uninstall-am: uninstall-icondataDATA
 #>+ 1
-uninstall-am: uninstall-kde-icons  uninstall-icondataDATA uninstall-info-am
+uninstall-am: uninstall-kde-icons  uninstall-icondataDATA
+
+.MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
 	distclean distclean-generic distclean-libtool distdir dvi \
 	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-exec install-exec-am \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
 	install-icondataDATA install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
 	install-strip installcheck installcheck-am installdirs \
 	maintainer-clean maintainer-clean-generic mostlyclean \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	uninstall uninstall-am uninstall-icondataDATA \
-	uninstall-info-am
+	uninstall uninstall-am uninstall-icondataDATA
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- kdelibs-3.5.7.orig/kdeprint/tools/Makefile.in
+++ kdelibs-3.5.7/kdeprint/tools/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,15 +14,11 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -55,17 +51,21 @@
 DIST_SOURCES =
 #>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 #>- 	html-recursive info-recursive install-data-recursive \
-#>- 	install-exec-recursive install-info-recursive \
-#>- 	install-recursive installcheck-recursive installdirs-recursive \
-#>- 	pdf-recursive ps-recursive uninstall-info-recursive \
-#>- 	uninstall-recursive
-#>+ 6
+#>- 	install-dvi-recursive install-exec-recursive \
+#>- 	install-html-recursive install-info-recursive \
+#>- 	install-pdf-recursive install-ps-recursive install-recursive \
+#>- 	installcheck-recursive installdirs-recursive pdf-recursive \
+#>- 	ps-recursive uninstall-recursive
+#>+ 7
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	html-recursive info-recursive install-data-recursive \
-	install-exec-recursive install-info-recursive \
-	install-recursive installcheck-recursive installdirs-recursive \
-	pdf-recursive ps-recursive uninstall-info-recursive \
-	uninstall-recursive nmcheck-recursive bcheck-recursive
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive nmcheck-recursive bcheck-recursive
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
@@ -75,8 +75,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -84,13 +82,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -104,8 +102,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -126,17 +122,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -205,7 +198,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -242,12 +234,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -292,87 +286,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -396,75 +346,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -472,16 +364,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -493,7 +384,7 @@
 all: docs-am  all-recursive
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -531,9 +422,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 mostlyclean-libtool:
@@ -542,10 +433,6 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
 # To change the values of `make' variables: instead of editing Makefiles,
@@ -577,8 +464,7 @@
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
+$(RECURSIVE_CLEAN_TARGETS):
 	@failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
@@ -679,22 +565,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -708,7 +593,7 @@
 	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
-	    || $(mkdir_p) "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 	    || exit 1; \
 	    distdir=`$(am__cd) $(distdir) && pwd`; \
 	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
@@ -716,6 +601,8 @@
 	      $(MAKE) $(AM_MAKEFLAGS) \
 	        top_distdir="$$top_distdir" \
 	        distdir="$$distdir/$$subdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -759,8 +646,7 @@
 
 distclean: distclean-recursive
 	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool \
-	distclean-tags
+distclean-am: clean-am distclean-generic distclean-tags
 
 dvi: dvi-recursive
 
@@ -774,12 +660,20 @@
 
 install-data-am:
 
+install-dvi: install-dvi-recursive
+
 install-exec-am:
 
+install-html: install-html-recursive
+
 install-info: install-info-recursive
 
 install-man:
 
+install-pdf: install-pdf-recursive
+
+install-ps: install-ps-recursive
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
@@ -798,22 +692,24 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am
+uninstall-am:
 
-uninstall-info: uninstall-info-recursive
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+	install-strip
 
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-	clean clean-generic clean-libtool clean-recursive ctags \
-	ctags-recursive distclean distclean-generic distclean-libtool \
-	distclean-recursive distclean-tags distdir dvi dvi-am html \
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+	all all-am check check-am clean clean-generic clean-libtool \
+	ctags ctags-recursive distclean distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
 	html-am info info-am install install-am install-data \
-	install-data-am install-exec install-exec-am install-info \
-	install-info-am install-man install-strip installcheck \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
 	installcheck-am installdirs installdirs-am maintainer-clean \
-	maintainer-clean-generic maintainer-clean-recursive \
-	mostlyclean mostlyclean-generic mostlyclean-libtool \
-	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
-	uninstall uninstall-am uninstall-info-am
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
+	uninstall uninstall-am
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- kdelibs-3.5.7.orig/kdeprint/tools/escputil/Makefile.in
+++ kdelibs-3.5.7/kdeprint/tools/escputil/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -17,15 +17,11 @@
 
 
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -72,7 +68,16 @@
 #>- 	$(am_kdeprint_tool_escputil_la_OBJECTS)
 #>+ 1
 kdeprint_tool_escputil_la_OBJECTS = escpwidget.lo
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+#>- kdeprint_tool_escputil_la_LINK = $(LIBTOOL) --tag=CXX \
+#>- 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
+#>- 	$(AM_CXXFLAGS) $(CXXFLAGS) \
+#>- 	$(kdeprint_tool_escputil_la_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 4
+kdeprint_tool_escputil_la_LINK = $(LIBTOOL) --tag=CXX \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
+	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
+	$(kdeprint_tool_escputil_la_LDFLAGS) $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -80,19 +85,21 @@
 #>+ 2
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 #>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
 CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 3
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(kdeprint_tool_escputil_la_SOURCES)
 DIST_SOURCES = $(kdeprint_tool_escputil_la_SOURCES)
 serviceDATA_INSTALL = $(INSTALL_DATA)
@@ -106,8 +113,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -115,13 +120,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -135,8 +140,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -157,17 +160,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -236,7 +236,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -273,12 +272,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -323,87 +324,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -427,75 +384,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -503,16 +402,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -522,9 +420,7 @@
 kde_module_LTLIBRARIES = kdeprint_tool_escputil.la
 kdeprint_tool_escputil_la_SOURCES = escpwidget.cpp
 #>- kdeprint_tool_escputil_la_METASOURCES = AUTO
-#>- kdeprint_tool_escputil_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
-#>+ 1
-kdeprint_tool_escputil_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined $(KDE_NO_UNDEFINED)
+kdeprint_tool_escputil_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
 kdeprint_tool_escputil_la_LIBADD = $(LIB_KDEUI)
 noinst_HEADERS = escpwidget.h
 service_DATA = escputil.desktop
@@ -535,7 +431,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -573,13 +469,13 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
+	test -z "$(kde_moduledir)" || $(MKDIR_P) "$(DESTDIR)$(kde_moduledir)"
 	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
@@ -590,7 +486,7 @@
 
 uninstall-kde_moduleLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
@@ -604,11 +500,8 @@
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
-#>- kdeprint_tool_escputil.la: $(kdeprint_tool_escputil_la_OBJECTS) $(kdeprint_tool_escputil_la_DEPENDENCIES) 
-#>+ 2
-@KDE_USE_CLOSURE_TRUE@kdeprint_tool_escputil.la: kdeprint_tool_escputil.la.closure $(kdeprint_tool_escputil_la_OBJECTS) $(kdeprint_tool_escputil_la_DEPENDENCIES) 
-@KDE_USE_CLOSURE_FALSE@kdeprint_tool_escputil.la: $(kdeprint_tool_escputil_la_OBJECTS) $(kdeprint_tool_escputil_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(kde_moduledir) $(kdeprint_tool_escputil_la_LDFLAGS) $(kdeprint_tool_escputil_la_OBJECTS) $(kdeprint_tool_escputil_la_LIBADD) $(LIBS)
+kdeprint_tool_escputil.la: $(kdeprint_tool_escputil_la_OBJECTS) $(kdeprint_tool_escputil_la_DEPENDENCIES) 
+	$(kdeprint_tool_escputil_la_LINK) -rpath $(kde_moduledir) $(kdeprint_tool_escputil_la_OBJECTS) $(kdeprint_tool_escputil_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -619,22 +512,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/escpwidget.Plo@am__quote@
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -644,13 +537,9 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 install-serviceDATA: $(service_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(servicedir)" || $(mkdir_p) "$(DESTDIR)$(servicedir)"
+	test -z "$(servicedir)" || $(MKDIR_P) "$(DESTDIR)$(servicedir)"
 	@list='$(service_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -715,22 +604,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -746,7 +634,7 @@
 all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS)
 installdirs:
 	for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(servicedir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -779,14 +667,14 @@
 #>- clean-am: clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
 #>- 	mostlyclean-am
 #>+ 2
-clean-am: clean-metasources clean-closures clean-bcheck  clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
+clean-am: clean-metasources clean-bcheck  clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
 	mostlyclean-am
 
 distclean: distclean-am
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
@@ -802,14 +690,22 @@
 #>+ 1
 install-data-am:   install-serviceDATA
 
+install-dvi: install-dvi-am
+
 #>- install-exec-am:
 #>+ 1
 install-exec-am:  install-kde_moduleLTLIBRARIES
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -830,36 +726,29 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-kde_moduleLTLIBRARIES \
-	uninstall-serviceDATA
+uninstall-am: uninstall-kde_moduleLTLIBRARIES uninstall-serviceDATA
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-kde_moduleLTLIBRARIES clean-libtool ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
 	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-exec \
-	install-exec-am install-info install-info-am \
-	install-kde_moduleLTLIBRARIES install-man install-serviceDATA \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am \
+	install-kde_moduleLTLIBRARIES install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-serviceDATA \
 	install-strip installcheck installcheck-am installdirs \
 	maintainer-clean maintainer-clean-generic mostlyclean \
 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
 	pdf pdf-am ps ps-am tags uninstall uninstall-am \
-	uninstall-info-am uninstall-kde_moduleLTLIBRARIES \
-	uninstall-serviceDATA
+	uninstall-kde_moduleLTLIBRARIES uninstall-serviceDATA
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
-#>+ 8
-kdeprint_tool_escputil.la.closure: $(kdeprint_tool_escputil_la_OBJECTS) $(kdeprint_tool_escputil_la_DEPENDENCIES)
-	@echo "int main() {return 0;}" > kdeprint_tool_escputil_la_closure.cpp
-	@$(LTCXXCOMPILE) -c kdeprint_tool_escputil_la_closure.cpp
-	$(CXXLINK) kdeprint_tool_escputil_la_closure.lo $(kdeprint_tool_escputil_la_LDFLAGS) $(kdeprint_tool_escputil_la_OBJECTS) $(kdeprint_tool_escputil_la_LIBADD) $(LIBS)
-	@rm -f kdeprint_tool_escputil_la_closure.* kdeprint_tool_escputil.la.closure
-	@echo "timestamp" > kdeprint_tool_escputil.la.closure
-
-
 #>+ 3
 escpwidget.moc: $(srcdir)/escpwidget.h
 	$(MOC) $(srcdir)/escpwidget.h -o escpwidget.moc
@@ -874,10 +763,6 @@
 #>+ 2
 KDE_DIST=Makefile.in escputil.desktop Makefile.am 
 
-#>+ 3
-clean-closures:
-	-rm -f  kdeprint_tool_escputil.la.closure
-
 #>+ 2
 docs-am:
 
--- kdelibs-3.5.7.orig/kdeprint/lpd/Makefile.in
+++ kdelibs-3.5.7/kdeprint/lpd/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -18,15 +18,11 @@
 
 
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -78,6 +74,13 @@
 	klpdprinterimpl.lo kmlpduimanager.lo lpdtools.lo gschecker.lo
 @KDE_USE_FINAL_FALSE@kdeprint_lpd_la_OBJECTS = $(kdeprint_lpd_la_nofinal_OBJECTS)
 @KDE_USE_FINAL_TRUE@kdeprint_lpd_la_OBJECTS = $(kdeprint_lpd_la_final_OBJECTS)
+#>- kdeprint_lpd_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(kdeprint_lpd_la_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+kdeprint_lpd_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(kdeprint_lpd_la_LDFLAGS) $(LDFLAGS) -o $@
 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(bin_PROGRAMS)
 am_make_driver_db_lpd_OBJECTS = make_driver_db_lpd.$(OBJEXT)
@@ -86,35 +89,38 @@
 make_driver_db_lpd_OBJECTS = make_driver_db_lpd.$(OBJEXT)
 make_driver_db_lpd_DEPENDENCIES =  \
 	$(top_builddir)/kdecore/libkdefakes.la
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 #>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 #>+ 2
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 #>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
 CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 3
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(kdeprint_lpd_la_SOURCES) $(make_driver_db_lpd_SOURCES)
 DIST_SOURCES = $(kdeprint_lpd_la_SOURCES) \
 	$(make_driver_db_lpd_SOURCES)
@@ -129,8 +135,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -138,13 +142,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -158,8 +162,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -180,17 +182,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -259,7 +258,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -296,12 +294,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -346,87 +346,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -450,75 +406,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -526,16 +424,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -546,9 +443,7 @@
 kdeprint_lpd_la_SOURCES = kmlpdfactory.cpp kmlpdmanager.cpp klpdprinterimpl.cpp kmlpduimanager.cpp \
 			     lpdtools.cpp gschecker.cpp
 
-#>- kdeprint_lpd_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
-#>+ 1
-kdeprint_lpd_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined $(KDE_NO_UNDEFINED)
+kdeprint_lpd_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
 kdeprint_lpd_la_LIBADD = $(top_builddir)/kdeprint/management/libkdeprint_management.la 
 #>- kdeprint_lpd_la_METASOURCES = AUTO
 noinst_HEADERS = kmlpdfactory.h kmlpdmanager.h klpdprinterimpl.h kmlpduimanager.h lpdtools.h gschecker.h
@@ -562,7 +457,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .c .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -600,13 +495,13 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
+	test -z "$(kde_moduledir)" || $(MKDIR_P) "$(DESTDIR)$(kde_moduledir)"
 	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
@@ -617,7 +512,7 @@
 
 uninstall-kde_moduleLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
@@ -631,14 +526,11 @@
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
-#>- kdeprint_lpd.la: $(kdeprint_lpd_la_OBJECTS) $(kdeprint_lpd_la_DEPENDENCIES) 
-#>+ 2
-@KDE_USE_CLOSURE_TRUE@kdeprint_lpd.la: kdeprint_lpd.la.closure $(kdeprint_lpd_la_OBJECTS) $(kdeprint_lpd_la_DEPENDENCIES) 
-@KDE_USE_CLOSURE_FALSE@kdeprint_lpd.la: $(kdeprint_lpd_la_OBJECTS) $(kdeprint_lpd_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(kde_moduledir) $(kdeprint_lpd_la_LDFLAGS) $(kdeprint_lpd_la_OBJECTS) $(kdeprint_lpd_la_LIBADD) $(LIBS)
+kdeprint_lpd.la: $(kdeprint_lpd_la_OBJECTS) $(kdeprint_lpd_la_DEPENDENCIES) 
+	$(kdeprint_lpd_la_LINK) -rpath $(kde_moduledir) $(kdeprint_lpd_la_OBJECTS) $(kdeprint_lpd_la_LIBADD) $(LIBS)
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
+	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
 	  if test -f $$p \
@@ -666,7 +558,7 @@
 	done
 make_driver_db_lpd$(EXEEXT): $(make_driver_db_lpd_OBJECTS) $(make_driver_db_lpd_DEPENDENCIES) 
 	@rm -f make_driver_db_lpd$(EXEEXT)
-	$(LINK) $(make_driver_db_lpd_LDFLAGS) $(make_driver_db_lpd_OBJECTS) $(make_driver_db_lpd_LDADD) $(LIBS)
+	$(LINK) $(make_driver_db_lpd_OBJECTS) $(make_driver_db_lpd_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -683,43 +575,43 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/make_driver_db_lpd.Po@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -729,13 +621,9 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 install-entryDATA: $(entry_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(entrydir)" || $(mkdir_p) "$(DESTDIR)$(entrydir)"
+	test -z "$(entrydir)" || $(MKDIR_P) "$(DESTDIR)$(entrydir)"
 	@list='$(entry_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -800,22 +688,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -831,7 +718,7 @@
 all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA) $(HEADERS)
 installdirs:
 	for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(entrydir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -864,14 +751,14 @@
 #>- clean-am: clean-binPROGRAMS clean-generic clean-kde_moduleLTLIBRARIES \
 #>- 	clean-libtool mostlyclean-am
 #>+ 2
-clean-am: clean-closures clean-bcheck clean-final  clean-binPROGRAMS clean-generic clean-kde_moduleLTLIBRARIES \
+clean-am: clean-bcheck clean-final  clean-binPROGRAMS clean-generic clean-kde_moduleLTLIBRARIES \
 	clean-libtool mostlyclean-am
 
 distclean: distclean-am
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
@@ -887,14 +774,22 @@
 #>+ 1
 install-data-am:   install-entryDATA 
 
+install-dvi: install-dvi-am
+
 #>- install-exec-am: install-binPROGRAMS
 #>+ 1
 install-exec-am:  install-binPROGRAMS install-kde_moduleLTLIBRARIES
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -916,43 +811,33 @@
 ps-am:
 
 uninstall-am: uninstall-binPROGRAMS uninstall-entryDATA \
-	uninstall-info-am uninstall-kde_moduleLTLIBRARIES
+	uninstall-kde_moduleLTLIBRARIES
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
 	clean-generic clean-kde_moduleLTLIBRARIES clean-libtool ctags \
 	distclean distclean-compile distclean-generic \
 	distclean-libtool distclean-tags distdir dvi dvi-am html \
 	html-am info info-am install install-am install-binPROGRAMS \
-	install-data install-data-am install-entryDATA install-exec \
-	install-exec-am install-info install-info-am \
-	install-kde_moduleLTLIBRARIES install-man install-strip \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-entryDATA install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am \
+	install-kde_moduleLTLIBRARIES install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
 	installcheck installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 	tags uninstall uninstall-am uninstall-binPROGRAMS \
-	uninstall-entryDATA uninstall-info-am \
-	uninstall-kde_moduleLTLIBRARIES
+	uninstall-entryDATA uninstall-kde_moduleLTLIBRARIES
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
-#>+ 8
-kdeprint_lpd.la.closure: $(kdeprint_lpd_la_OBJECTS) $(kdeprint_lpd_la_DEPENDENCIES)
-	@echo "int main() {return 0;}" > kdeprint_lpd_la_closure.cpp
-	@$(LTCXXCOMPILE) -c kdeprint_lpd_la_closure.cpp
-	$(CXXLINK) kdeprint_lpd_la_closure.lo $(kdeprint_lpd_la_LDFLAGS) $(kdeprint_lpd_la_OBJECTS) $(kdeprint_lpd_la_LIBADD) $(LIBS)
-	@rm -f kdeprint_lpd_la_closure.* kdeprint_lpd.la.closure
-	@echo "timestamp" > kdeprint_lpd.la.closure
-
-
 #>+ 2
 KDE_DIST=lpd.print Makefile.in Makefile.am 
 
-#>+ 3
-clean-closures:
-	-rm -f  kdeprint_lpd.la.closure
-
 #>+ 2
 docs-am:
 
--- kdelibs-3.5.7.orig/kdeprint/management/Makefile.in
+++ kdelibs-3.5.7/kdeprint/management/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -18,15 +18,11 @@
 
 
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -81,6 +77,13 @@
 #>- kaddprinterwizard_la_OBJECTS = $(am_kaddprinterwizard_la_OBJECTS)
 #>+ 1
 kaddprinterwizard_la_OBJECTS = kaddprinterwizard_dummy.lo
+#>- kaddprinterwizard_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(kaddprinterwizard_la_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+kaddprinterwizard_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(kaddprinterwizard_la_LDFLAGS) $(LDFLAGS) -o $@
 libkdeprint_management_la_DEPENDENCIES = ../libkdeprint.la
 am_libkdeprint_management_la_OBJECTS = kmdbcreator.lo kmdriverdb.lo \
 	kmdriverdbwidget.lo kmiconview.lo kminfopage.lo kmmainview.lo \
@@ -122,6 +125,15 @@
 	networkscanner.lo
 @KDE_USE_FINAL_FALSE@libkdeprint_management_la_OBJECTS = $(libkdeprint_management_la_nofinal_OBJECTS)
 @KDE_USE_FINAL_TRUE@libkdeprint_management_la_OBJECTS = $(libkdeprint_management_la_final_OBJECTS)
+#>- libkdeprint_management_la_LINK = $(LIBTOOL) --tag=CXX \
+#>- 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
+#>- 	$(AM_CXXFLAGS) $(CXXFLAGS) \
+#>- 	$(libkdeprint_management_la_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 4
+libkdeprint_management_la_LINK = $(LIBTOOL) --tag=CXX \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
+	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
+	$(libkdeprint_management_la_LDFLAGS) $(LDFLAGS) -o $@
 libkdeprint_management_module_la_DEPENDENCIES =  \
 	libkdeprint_management.la
 am_libkdeprint_management_module_la_OBJECTS =  \
@@ -130,12 +142,21 @@
 #>- 	$(am_libkdeprint_management_module_la_OBJECTS)
 #>+ 1
 libkdeprint_management_module_la_OBJECTS = kdeprint_management_module.lo
+#>- libkdeprint_management_module_la_LINK = $(LIBTOOL) --tag=CXX \
+#>- 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
+#>- 	$(AM_CXXFLAGS) $(CXXFLAGS) \
+#>- 	$(libkdeprint_management_module_la_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 4
+libkdeprint_management_module_la_LINK = $(LIBTOOL) --tag=CXX \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
+	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
+	$(libkdeprint_management_module_la_LDFLAGS) $(LDFLAGS) -o $@
 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 #>- PROGRAMS = $(bin_PROGRAMS)
 #>+ 2
 bin_PROGRAMS += kaddprinterwizard$(EXEEXT) 
 PROGRAMS = $(bin_PROGRAMS)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -143,19 +164,21 @@
 #>+ 2
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
-#>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+#>+ 3
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
 CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 3
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 #>- SOURCES = $(kaddprinterwizard_la_SOURCES) \
 #>- 	$(libkdeprint_management_la_SOURCES) \
 #>- 	$(libkdeprint_management_module_la_SOURCES)
@@ -182,8 +205,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -191,13 +212,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -211,8 +232,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -233,17 +252,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -312,7 +328,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -349,12 +364,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -399,87 +416,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -503,75 +476,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -579,16 +494,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -621,15 +535,11 @@
 	pluginaction.cpp kxmlcommanddlg.cpp kxmlcommandselector.cpp kmconfigcommand.cpp \
 	kmconfigfilter.cpp kmconfigfonts.cpp kmconfigjobs.cpp networkscanner.cpp
 
-#>- libkdeprint_management_la_LDFLAGS = $(all_libraries) -version-info 6:0:2 -no-undefined
-#>+ 1
-libkdeprint_management_la_LDFLAGS = $(all_libraries) -version-info 6:0:2 -no-undefined $(KDE_NO_UNDEFINED)
+libkdeprint_management_la_LDFLAGS = $(all_libraries) -version-info 6:0:2 -no-undefined
 libkdeprint_management_la_LIBADD = ../libkdeprint.la
 #>- libkdeprint_management_la_METASOURCES = AUTO
 libkdeprint_management_module_la_SOURCES = kdeprint_management_module.cpp
-#>- libkdeprint_management_module_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -no-undefined
-#>+ 1
-libkdeprint_management_module_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -no-undefined $(KDE_NO_UNDEFINED)
+libkdeprint_management_module_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -no-undefined
 libkdeprint_management_module_la_LIBADD = libkdeprint_management.la
 kdeprint_HEADERS = kmmainview.h kmjobviewer.h kmprinterpage.h kiconselectaction.h kmtimer.h
 kdeprintdir = $(includedir)/kdeprint
@@ -652,7 +562,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -690,13 +600,13 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
+	test -z "$(kde_moduledir)" || $(MKDIR_P) "$(DESTDIR)$(kde_moduledir)"
 	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
@@ -707,7 +617,7 @@
 
 uninstall-kde_moduleLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
@@ -723,7 +633,7 @@
 	done
 install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(kdeinitdir)" || $(mkdir_p) "$(DESTDIR)$(kdeinitdir)"
+	test -z "$(kdeinitdir)" || $(MKDIR_P) "$(DESTDIR)$(kdeinitdir)"
 	@list='$(kdeinit_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
@@ -734,7 +644,7 @@
 
 uninstall-kdeinitLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@set -x; list='$(kdeinit_LTLIBRARIES)'; for p in $$list; do \
+	@list='$(kdeinit_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kdeinitdir)/$$p'"; \
 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kdeinitdir)/$$p"; \
@@ -750,7 +660,7 @@
 	done
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
@@ -761,7 +671,7 @@
 
 uninstall-libLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
@@ -776,20 +686,14 @@
 	  rm -f "$${dir}/so_locations"; \
 	done
 kaddprinterwizard.la: $(kaddprinterwizard_la_OBJECTS) $(kaddprinterwizard_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(kdeinitdir) $(kaddprinterwizard_la_LDFLAGS) $(kaddprinterwizard_la_OBJECTS) $(kaddprinterwizard_la_LIBADD) $(LIBS)
-#>- libkdeprint_management.la: $(libkdeprint_management_la_OBJECTS) $(libkdeprint_management_la_DEPENDENCIES) 
-#>+ 2
-@KDE_USE_CLOSURE_TRUE@libkdeprint_management.la: libkdeprint_management.la.closure $(libkdeprint_management_la_OBJECTS) $(libkdeprint_management_la_DEPENDENCIES) 
-@KDE_USE_CLOSURE_FALSE@libkdeprint_management.la: $(libkdeprint_management_la_OBJECTS) $(libkdeprint_management_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(libdir) $(libkdeprint_management_la_LDFLAGS) $(libkdeprint_management_la_OBJECTS) $(libkdeprint_management_la_LIBADD) $(LIBS)
-#>- libkdeprint_management_module.la: $(libkdeprint_management_module_la_OBJECTS) $(libkdeprint_management_module_la_DEPENDENCIES) 
-#>+ 2
-@KDE_USE_CLOSURE_TRUE@libkdeprint_management_module.la: libkdeprint_management_module.la.closure $(libkdeprint_management_module_la_OBJECTS) $(libkdeprint_management_module_la_DEPENDENCIES) 
-@KDE_USE_CLOSURE_FALSE@libkdeprint_management_module.la: $(libkdeprint_management_module_la_OBJECTS) $(libkdeprint_management_module_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(kde_moduledir) $(libkdeprint_management_module_la_LDFLAGS) $(libkdeprint_management_module_la_OBJECTS) $(libkdeprint_management_module_la_LIBADD) $(LIBS)
+	$(kaddprinterwizard_la_LINK) -rpath $(kdeinitdir) $(kaddprinterwizard_la_OBJECTS) $(kaddprinterwizard_la_LIBADD) $(LIBS)
+libkdeprint_management.la: $(libkdeprint_management_la_OBJECTS) $(libkdeprint_management_la_DEPENDENCIES) 
+	$(libkdeprint_management_la_LINK) -rpath $(libdir) $(libkdeprint_management_la_OBJECTS) $(libkdeprint_management_la_LIBADD) $(LIBS)
+libkdeprint_management_module.la: $(libkdeprint_management_module_la_OBJECTS) $(libkdeprint_management_module_la_DEPENDENCIES) 
+	$(libkdeprint_management_module_la_LINK) -rpath $(kde_moduledir) $(libkdeprint_management_module_la_OBJECTS) $(libkdeprint_management_module_la_LIBADD) $(LIBS)
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
+	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
 	  if test -f $$p \
@@ -882,22 +786,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/smbview.Plo@am__quote@
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -907,13 +811,9 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 install-dataiconDATA: $(dataicon_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(dataicondir)" || $(mkdir_p) "$(DESTDIR)$(dataicondir)"
+	test -z "$(dataicondir)" || $(MKDIR_P) "$(DESTDIR)$(dataicondir)"
 	@list='$(dataicon_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -930,7 +830,7 @@
 	done
 install-kdeprintHEADERS: $(kdeprint_HEADERS)
 	@$(NORMAL_INSTALL)
-	test -z "$(kdeprintdir)" || $(mkdir_p) "$(DESTDIR)$(kdeprintdir)"
+	test -z "$(kdeprintdir)" || $(MKDIR_P) "$(DESTDIR)$(kdeprintdir)"
 	@list='$(kdeprint_HEADERS)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -995,22 +895,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -1028,7 +927,7 @@
 
 installdirs:
 	for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(kdeinitdir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(dataicondir)" "$(DESTDIR)$(kdeprintdir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -1062,7 +961,7 @@
 #>- 	clean-kdeinitLTLIBRARIES clean-libLTLIBRARIES clean-libtool \
 #>- 	mostlyclean-am
 #>+ 3
-clean-am: clean-metasources clean-closures clean-bcheck clean-final  clean-binPROGRAMS clean-generic clean-kde_moduleLTLIBRARIES \
+clean-am: clean-metasources clean-bcheck clean-final  clean-binPROGRAMS clean-generic clean-kde_moduleLTLIBRARIES \
 	clean-kdeinitLTLIBRARIES clean-libLTLIBRARIES clean-libtool \
 	mostlyclean-am
 
@@ -1070,7 +969,7 @@
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
@@ -1088,14 +987,22 @@
 install-data-am:   install-dataiconDATA \
 	install-kdeinitLTLIBRARIES install-kdeprintHEADERS
 
+install-dvi: install-dvi-am
+
 #>- install-exec-am: install-binPROGRAMS install-libLTLIBRARIES
 #>+ 1
 install-exec-am:  install-binPROGRAMS install-libLTLIBRARIES install-kde_moduleLTLIBRARIES
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -1117,9 +1024,10 @@
 ps-am:
 
 uninstall-am: uninstall-binPROGRAMS uninstall-dataiconDATA \
-	uninstall-info-am uninstall-kde_moduleLTLIBRARIES \
-	uninstall-kdeinitLTLIBRARIES uninstall-kdeprintHEADERS \
-	uninstall-libLTLIBRARIES
+	uninstall-kde_moduleLTLIBRARIES uninstall-kdeinitLTLIBRARIES \
+	uninstall-kdeprintHEADERS uninstall-libLTLIBRARIES
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
 	clean-generic clean-kde_moduleLTLIBRARIES \
@@ -1127,15 +1035,17 @@
 	ctags distclean distclean-compile distclean-generic \
 	distclean-libtool distclean-tags distdir dvi dvi-am html \
 	html-am info info-am install install-am install-binPROGRAMS \
-	install-data install-data-am install-dataiconDATA install-exec \
-	install-exec-am install-info install-info-am \
+	install-data install-data-am install-dataiconDATA install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am \
 	install-kde_moduleLTLIBRARIES install-kdeinitLTLIBRARIES \
 	install-kdeprintHEADERS install-libLTLIBRARIES install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
 	install-strip installcheck installcheck-am installdirs \
 	maintainer-clean maintainer-clean-generic mostlyclean \
 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
 	pdf pdf-am ps ps-am tags uninstall uninstall-am \
-	uninstall-binPROGRAMS uninstall-dataiconDATA uninstall-info-am \
+	uninstall-binPROGRAMS uninstall-dataiconDATA \
 	uninstall-kde_moduleLTLIBRARIES uninstall-kdeinitLTLIBRARIES \
 	uninstall-kdeprintHEADERS uninstall-libLTLIBRARIES
 
@@ -1169,15 +1079,6 @@
 kaddprinterwizard_LDADD = libkdeinit_kaddprinterwizard.la
 kaddprinterwizard_DEPENDENCIES = libkdeinit_kaddprinterwizard.la
 
-#>+ 8
-libkdeprint_management.la.closure: $(libkdeprint_management_la_OBJECTS) $(libkdeprint_management_la_DEPENDENCIES)
-	@echo "int main() {return 0;}" > libkdeprint_management_la_closure.cpp
-	@$(LTCXXCOMPILE) -c libkdeprint_management_la_closure.cpp
-	$(CXXLINK) libkdeprint_management_la_closure.lo $(libkdeprint_management_la_LDFLAGS) $(libkdeprint_management_la_OBJECTS) $(libkdeprint_management_la_LIBADD) $(LIBS)
-	@rm -f libkdeprint_management_la_closure.* libkdeprint_management.la.closure
-	@echo "timestamp" > libkdeprint_management.la.closure
-
-
 #>+ 3
 kmpropcontainer.moc: $(srcdir)/kmpropcontainer.h
 	$(MOC) $(srcdir)/kmpropcontainer.h -o kmpropcontainer.moc
@@ -1437,15 +1338,6 @@
 #>+ 2
 mocs: kmpropertypage.moc
 
-#>+ 8
-libkdeprint_management_module.la.closure: $(libkdeprint_management_module_la_OBJECTS) $(libkdeprint_management_module_la_DEPENDENCIES)
-	@echo "int main() {return 0;}" > libkdeprint_management_module_la_closure.cpp
-	@$(LTCXXCOMPILE) -c libkdeprint_management_module_la_closure.cpp
-	$(CXXLINK) libkdeprint_management_module_la_closure.lo $(libkdeprint_management_module_la_LDFLAGS) $(libkdeprint_management_module_la_OBJECTS) $(libkdeprint_management_module_la_LIBADD) $(LIBS)
-	@rm -f libkdeprint_management_module_la_closure.* libkdeprint_management_module.la.closure
-	@echo "timestamp" > libkdeprint_management_module.la.closure
-
-
 #>+ 3
 clean-metasources:
 	-rm -f  kmpropcontainer.moc kmwsocketutil.moc kmconfigfonts.moc kmspecialprinterdlg.moc kmconfigfilter.moc kmwclass.moc kmconfigpage.moc kmwizardpage.moc kxmlcommanddlg.moc pluginaction.moc kmwdriverselect.moc kmdriverdbwidget.moc kmdbcreator.moc kxmlcommandselector.moc kmwdrivertest.moc kmmainview.moc kmpropwidget.moc kmwizard.moc cjanuswidget.moc kmconfigdialog.moc kiconselectaction.moc kminstancepage.moc kmdriverdialog.moc kmlistview.moc kmwsmb.moc kmconfiggeneral.moc kmprinterview.moc kmwlocal.moc smbview.moc kmconfigjobs.moc kmdriverdb.moc networkscanner.moc kmwsocket.moc kmiconview.moc kmtimer.moc kmjobviewer.moc kmpropertypage.moc
@@ -1453,10 +1345,6 @@
 #>+ 2
 KDE_DIST=Makefile.in side.png tileup.png tiledown.png Makefile.am 
 
-#>+ 3
-clean-closures:
-	-rm -f  libkdeprint_management.la.closure libkdeprint_management_module.la.closure
-
 #>+ 2
 docs-am:
 
--- kdelibs-3.5.7.orig/kdeprint/Makefile.in
+++ kdelibs-3.5.7/kdeprint/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -18,15 +18,11 @@
 
 
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -86,6 +82,13 @@
 #>- kded_kdeprintd_la_OBJECTS = $(am_kded_kdeprintd_la_OBJECTS)
 #>+ 1
 kded_kdeprintd_la_OBJECTS = kdeprintd.lo kprintprocess.lo kdeprintd_skel.lo
+#>- kded_kdeprintd_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(kded_kdeprintd_la_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+kded_kdeprintd_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(kded_kdeprintd_la_LDFLAGS) $(LDFLAGS) -o $@
 am_libkdeprint_la_OBJECTS = kmfactory.lo kmjob.lo kmjobmanager.lo \
 	kmmanager.lo kmprinter.lo kmuimanager.lo kmvirtualmanager.lo \
 	driver.lo driveritem.lo droptionview.lo driverview.lo \
@@ -118,52 +121,64 @@
 	posterpreview.lo kpposterpage.lo foomatic2loader.lo \
 	fooparser.lo fooscanner.lo ppdparser.lo ppdscanner.lo \
 	ppdloader.lo kmfactory_skel.lo
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+#>- libkdeprint_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(libkdeprint_la_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+libkdeprint_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(libkdeprint_la_LDFLAGS) $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 #>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 #>+ 2
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
-#>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+#>+ 3
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
 CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 3
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(libdriverparse_a_SOURCES) $(kded_kdeprintd_la_SOURCES) \
 	$(libkdeprint_la_SOURCES)
 DIST_SOURCES = $(libdriverparse_a_SOURCES) \
 	$(kded_kdeprintd_la_SOURCES) $(libkdeprint_la_SOURCES)
 #>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 #>- 	html-recursive info-recursive install-data-recursive \
-#>- 	install-exec-recursive install-info-recursive \
-#>- 	install-recursive installcheck-recursive installdirs-recursive \
-#>- 	pdf-recursive ps-recursive uninstall-info-recursive \
-#>- 	uninstall-recursive
-#>+ 6
+#>- 	install-dvi-recursive install-exec-recursive \
+#>- 	install-html-recursive install-info-recursive \
+#>- 	install-pdf-recursive install-ps-recursive install-recursive \
+#>- 	installcheck-recursive installdirs-recursive pdf-recursive \
+#>- 	ps-recursive uninstall-recursive
+#>+ 7
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	html-recursive info-recursive install-data-recursive \
-	install-exec-recursive install-info-recursive \
-	install-recursive installcheck-recursive installdirs-recursive \
-	pdf-recursive ps-recursive uninstall-info-recursive \
-	uninstall-recursive nmcheck-recursive bcheck-recursive
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive nmcheck-recursive bcheck-recursive
 configDATA_INSTALL = $(INSTALL_DATA)
 printdataDATA_INSTALL = $(INSTALL_DATA)
 servicesDATA_INSTALL = $(INSTALL_DATA)
@@ -174,6 +189,8 @@
 includeHEADERS_INSTALL = $(INSTALL_HEADER)
 kdeprintHEADERS_INSTALL = $(INSTALL_HEADER)
 HEADERS = $(include_HEADERS) $(kdeprint_HEADERS) $(noinst_HEADERS)
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = . management lpdunix cups lpr rlpr ext filters pics \
@@ -184,8 +201,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -193,13 +208,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -213,8 +228,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -235,17 +248,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -314,7 +324,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -351,12 +360,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -401,87 +412,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -505,75 +472,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -581,16 +490,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -632,9 +540,7 @@
 			 kpmarginpage.cpp messagewindow.cpp posterpreview.cpp kpposterpage.cpp foomatic2loader.cpp \
 			 fooparser.cpp fooscanner.cpp ppdparser.cpp ppdscanner.cpp ppdloader.cpp kmfactory_skel.cpp
 
-#>- libkdeprint_la_LDFLAGS = $(all_libraries) -version-info 6:0:2 -no-undefined
-#>+ 1
-libkdeprint_la_LDFLAGS = $(all_libraries) -version-info 6:0:2 -no-undefined $(KDE_NO_UNDEFINED)
+libkdeprint_la_LDFLAGS = $(all_libraries) -version-info 6:0:2 -no-undefined
 libkdeprint_la_LIBADD = $(LIB_KPARTS) $(LIBZ)
 libkdeprint_la_DEPENDENCIES = $(LIB_KPARTS) 
 #>- libkdeprint_la_METASOURCES = AUTO
@@ -685,7 +591,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .c .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(srcdir)/../admin/Doxyfile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../admin/Doxyfile.am $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -723,9 +629,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 clean-noinstLIBRARIES:
@@ -736,7 +642,7 @@
 	$(RANLIB) libdriverparse.a
 install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
+	test -z "$(kde_moduledir)" || $(MKDIR_P) "$(DESTDIR)$(kde_moduledir)"
 	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
@@ -747,7 +653,7 @@
 
 uninstall-kde_moduleLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
@@ -763,7 +669,7 @@
 	done
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
@@ -774,7 +680,7 @@
 
 uninstall-libLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
@@ -789,12 +695,9 @@
 	  rm -f "$${dir}/so_locations"; \
 	done
 kded_kdeprintd.la: $(kded_kdeprintd_la_OBJECTS) $(kded_kdeprintd_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(kde_moduledir) $(kded_kdeprintd_la_LDFLAGS) $(kded_kdeprintd_la_OBJECTS) $(kded_kdeprintd_la_LIBADD) $(LIBS)
-#>- libkdeprint.la: $(libkdeprint_la_OBJECTS) $(libkdeprint_la_DEPENDENCIES) 
-#>+ 2
-@KDE_USE_CLOSURE_TRUE@libkdeprint.la: libkdeprint.la.closure $(libkdeprint_la_OBJECTS) $(libkdeprint_la_DEPENDENCIES) 
-@KDE_USE_CLOSURE_FALSE@libkdeprint.la: $(libkdeprint_la_OBJECTS) $(libkdeprint_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(libdir) $(libkdeprint_la_LDFLAGS) $(libkdeprint_la_OBJECTS) $(libkdeprint_la_LIBADD) $(LIBS)
+	$(kded_kdeprintd_la_LINK) -rpath $(kde_moduledir) $(kded_kdeprintd_la_OBJECTS) $(kded_kdeprintd_la_LIBADD) $(LIBS)
+libkdeprint.la: $(libkdeprint_la_OBJECTS) $(libkdeprint_la_DEPENDENCIES) 
+	$(libkdeprint_la_LINK) -rpath $(libdir) $(libkdeprint_la_OBJECTS) $(libkdeprint_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -856,43 +759,43 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/util.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -902,13 +805,9 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 install-configDATA: $(config_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(configdir)" || $(mkdir_p) "$(DESTDIR)$(configdir)"
+	test -z "$(configdir)" || $(MKDIR_P) "$(DESTDIR)$(configdir)"
 	@list='$(config_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -925,7 +824,7 @@
 	done
 install-printdataDATA: $(printdata_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(printdatadir)" || $(mkdir_p) "$(DESTDIR)$(printdatadir)"
+	test -z "$(printdatadir)" || $(MKDIR_P) "$(DESTDIR)$(printdatadir)"
 	@list='$(printdata_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -942,7 +841,7 @@
 	done
 install-servicesDATA: $(services_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(servicesdir)" || $(mkdir_p) "$(DESTDIR)$(servicesdir)"
+	test -z "$(servicesdir)" || $(MKDIR_P) "$(DESTDIR)$(servicesdir)"
 	@list='$(services_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -959,7 +858,7 @@
 	done
 install-uidataDATA: $(uidata_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(uidatadir)" || $(mkdir_p) "$(DESTDIR)$(uidatadir)"
+	test -z "$(uidatadir)" || $(MKDIR_P) "$(DESTDIR)$(uidatadir)"
 	@list='$(uidata_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -976,7 +875,7 @@
 	done
 install-updateDATA: $(update_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(updatedir)" || $(mkdir_p) "$(DESTDIR)$(updatedir)"
+	test -z "$(updatedir)" || $(MKDIR_P) "$(DESTDIR)$(updatedir)"
 	@list='$(update_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -993,7 +892,7 @@
 	done
 install-includeHEADERS: $(include_HEADERS)
 	@$(NORMAL_INSTALL)
-	test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"
+	test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)"
 	@list='$(include_HEADERS)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -1010,7 +909,7 @@
 	done
 install-kdeprintHEADERS: $(kdeprint_HEADERS)
 	@$(NORMAL_INSTALL)
-	test -z "$(kdeprintdir)" || $(mkdir_p) "$(DESTDIR)$(kdeprintdir)"
+	test -z "$(kdeprintdir)" || $(MKDIR_P) "$(DESTDIR)$(kdeprintdir)"
 	@list='$(kdeprint_HEADERS)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -1057,8 +956,7 @@
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
+$(RECURSIVE_CLEAN_TARGETS):
 	@failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
@@ -1159,23 +1057,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	$(mkdir_p) $(distdir)/../admin
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -1189,7 +1085,7 @@
 	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
-	    || $(mkdir_p) "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 	    || exit 1; \
 	    distdir=`$(am__cd) $(distdir) && pwd`; \
 	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
@@ -1197,6 +1093,8 @@
 	      $(MAKE) $(AM_MAKEFLAGS) \
 	        top_distdir="$$top_distdir" \
 	        distdir="$$distdir/$$subdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -1207,7 +1105,7 @@
 installdirs: installdirs-recursive
 installdirs-am:
 	for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(configdir)" "$(DESTDIR)$(printdatadir)" "$(DESTDIR)$(servicesdir)" "$(DESTDIR)$(uidatadir)" "$(DESTDIR)$(updatedir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(kdeprintdir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-recursive
 install-exec: install-exec-recursive
@@ -1241,7 +1139,7 @@
 #>- 	clean-libLTLIBRARIES clean-libtool clean-noinstLIBRARIES \
 #>- 	mostlyclean-am
 #>+ 3
-clean-am: clean-metasources clean-idl clean-closures clean-bcheck  clean-generic clean-kde_moduleLTLIBRARIES \
+clean-am: clean-metasources clean-idl clean-bcheck  clean-generic clean-kde_moduleLTLIBRARIES \
 	clean-libLTLIBRARIES clean-libtool clean-noinstLIBRARIES \
 	mostlyclean-am
 
@@ -1249,7 +1147,7 @@
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-recursive
 
@@ -1271,14 +1169,22 @@
 	install-kdeprintHEADERS install-printdataDATA \
 	install-servicesDATA install-uidataDATA install-updateDATA
 
+install-dvi: install-dvi-recursive
+
 #>- install-exec-am: install-libLTLIBRARIES
 #>+ 1
 install-exec-am:  install-libLTLIBRARIES install-kde_moduleLTLIBRARIES
 
+install-html: install-html-recursive
+
 install-info: install-info-recursive
 
 install-man:
 
+install-pdf: install-pdf-recursive
+
+install-ps: install-ps-recursive
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
@@ -1300,33 +1206,34 @@
 ps-am:
 
 uninstall-am: uninstall-configDATA uninstall-includeHEADERS \
-	uninstall-info-am uninstall-kde_moduleLTLIBRARIES \
-	uninstall-kdeprintHEADERS uninstall-libLTLIBRARIES \
-	uninstall-local uninstall-printdataDATA uninstall-servicesDATA \
+	uninstall-kde_moduleLTLIBRARIES uninstall-kdeprintHEADERS \
+	uninstall-libLTLIBRARIES uninstall-local \
+	uninstall-printdataDATA uninstall-servicesDATA \
 	uninstall-uidataDATA uninstall-updateDATA
 
-uninstall-info: uninstall-info-recursive
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+	install-strip
 
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-	clean clean-generic clean-kde_moduleLTLIBRARIES \
-	clean-libLTLIBRARIES clean-libtool clean-noinstLIBRARIES \
-	clean-recursive ctags ctags-recursive distclean \
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+	all all-am check check-am clean clean-generic \
+	clean-kde_moduleLTLIBRARIES clean-libLTLIBRARIES clean-libtool \
+	clean-noinstLIBRARIES ctags ctags-recursive distclean \
 	distclean-compile distclean-generic distclean-libtool \
-	distclean-recursive distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-configDATA \
-	install-data install-data-am install-data-local install-exec \
-	install-exec-am install-includeHEADERS install-info \
-	install-info-am install-kde_moduleLTLIBRARIES \
-	install-kdeprintHEADERS install-libLTLIBRARIES install-man \
-	install-printdataDATA install-servicesDATA install-strip \
-	install-uidataDATA install-updateDATA installcheck \
-	installcheck-am installdirs installdirs-am maintainer-clean \
-	maintainer-clean-generic maintainer-clean-recursive \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-configDATA install-data \
+	install-data-am install-data-local install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-includeHEADERS install-info install-info-am \
+	install-kde_moduleLTLIBRARIES install-kdeprintHEADERS \
+	install-libLTLIBRARIES install-man install-pdf install-pdf-am \
+	install-printdataDATA install-ps install-ps-am \
+	install-servicesDATA install-strip install-uidataDATA \
+	install-updateDATA installcheck installcheck-am installdirs \
+	installdirs-am maintainer-clean maintainer-clean-generic \
 	mostlyclean mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
-	tags tags-recursive uninstall uninstall-am \
-	uninstall-configDATA uninstall-includeHEADERS \
-	uninstall-info-am uninstall-kde_moduleLTLIBRARIES \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
+	uninstall uninstall-am uninstall-configDATA \
+	uninstall-includeHEADERS uninstall-kde_moduleLTLIBRARIES \
 	uninstall-kdeprintHEADERS uninstall-libLTLIBRARIES \
 	uninstall-local uninstall-printdataDATA uninstall-servicesDATA \
 	uninstall-uidataDATA uninstall-updateDATA
@@ -1469,15 +1376,6 @@
 kmfactory_skel.cpp: kmfactory.kidl
 	$(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub kmfactory.kidl
 
-#>+ 8
-libkdeprint.la.closure: $(libkdeprint_la_OBJECTS) $(libkdeprint_la_DEPENDENCIES)
-	@echo "int main() {return 0;}" > libkdeprint_la_closure.cpp
-	@$(LTCXXCOMPILE) -c libkdeprint_la_closure.cpp
-	$(CXXLINK) libkdeprint_la_closure.lo $(libkdeprint_la_LDFLAGS) $(libkdeprint_la_OBJECTS) $(libkdeprint_la_LIBADD) $(LIBS)
-	@rm -f libkdeprint_la_closure.* libkdeprint.la.closure
-	@echo "timestamp" > libkdeprint.la.closure
-
-
 #>+ 3
 posterpreview.moc: $(srcdir)/posterpreview.h
 	$(MOC) $(srcdir)/posterpreview.h -o posterpreview.moc
@@ -1673,10 +1571,6 @@
 	kdeprintd_skel.cpp kdeprintd_skel.h kdeprintd.kidl \
 	kmfactory_skel.cpp kmfactory_skel.h kmfactory.kidl 
 
-#>+ 3
-clean-closures:
-	-rm -f  libkdeprint.la.closure
-
 #>+ 2
 docs-am:
 
--- kdelibs-3.5.7.orig/kdeprint/filters/Makefile.in
+++ kdelibs-3.5.7/kdeprint/filters/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,15 +16,11 @@
 @SET_MAKE@
 
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -72,8 +68,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -81,13 +75,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -101,8 +95,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -123,17 +115,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -202,7 +191,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -239,12 +227,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -289,87 +279,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -393,75 +339,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -469,16 +357,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -502,7 +389,7 @@
 all: docs-am  all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -540,13 +427,13 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-binSCRIPTS: $(bin_SCRIPTS)
 	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
+	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
 	@list='$(bin_SCRIPTS)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  if test -f $$d$$p; then \
@@ -569,13 +456,9 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 install-filtersDATA: $(filters_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(filtersdir)" || $(mkdir_p) "$(DESTDIR)$(filtersdir)"
+	test -z "$(filtersdir)" || $(MKDIR_P) "$(DESTDIR)$(filtersdir)"
 	@list='$(filters_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -598,22 +481,21 @@
 
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -629,7 +511,7 @@
 all-am: Makefile $(SCRIPTS) $(DATA)
 installdirs:
 	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(filtersdir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -665,7 +547,7 @@
 
 distclean: distclean-am
 	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool
+distclean-am: clean-am distclean-generic
 
 dvi: dvi-am
 
@@ -679,12 +561,20 @@
 
 install-data-am: install-filtersDATA
 
+install-dvi: install-dvi-am
+
 install-exec-am: install-binSCRIPTS
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -703,19 +593,22 @@
 
 ps-am:
 
-uninstall-am: uninstall-binSCRIPTS uninstall-filtersDATA \
-	uninstall-info-am
+uninstall-am: uninstall-binSCRIPTS uninstall-filtersDATA
+
+.MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
 	distclean distclean-generic distclean-libtool distdir dvi \
 	dvi-am html html-am info info-am install install-am \
-	install-binSCRIPTS install-data install-data-am install-exec \
-	install-exec-am install-filtersDATA install-info \
-	install-info-am install-man install-strip installcheck \
+	install-binSCRIPTS install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am \
+	install-filtersDATA install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
 	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-generic \
 	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
-	uninstall-binSCRIPTS uninstall-filtersDATA uninstall-info-am
+	uninstall-binSCRIPTS uninstall-filtersDATA
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- kdelibs-3.5.7.orig/kdeprint/foomatic/Makefile.in
+++ kdelibs-3.5.7/kdeprint/foomatic/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -18,15 +18,11 @@
 
 
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -78,6 +74,13 @@
 	kmfoomaticmanager.lo kfoomaticprinterimpl.lo
 @KDE_USE_FINAL_FALSE@kdeprint_foomatic_la_OBJECTS = $(kdeprint_foomatic_la_nofinal_OBJECTS)
 @KDE_USE_FINAL_TRUE@kdeprint_foomatic_la_OBJECTS = $(kdeprint_foomatic_la_final_OBJECTS)
+#>- kdeprint_foomatic_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(kdeprint_foomatic_la_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+kdeprint_foomatic_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(kdeprint_foomatic_la_LDFLAGS) $(LDFLAGS) -o $@
 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(bin_PROGRAMS)
 am_make_driver_db_foomatic_OBJECTS =  \
@@ -87,35 +90,38 @@
 #>+ 1
 make_driver_db_foomatic_OBJECTS = make_driver_db_foomatic.$(OBJEXT)
 make_driver_db_foomatic_LDADD = $(LDADD)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 #>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 #>+ 2
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 #>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
 CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 3
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(kdeprint_foomatic_la_SOURCES) \
 	$(make_driver_db_foomatic_SOURCES)
 DIST_SOURCES = $(kdeprint_foomatic_la_SOURCES) \
@@ -131,8 +137,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -140,13 +144,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -160,8 +164,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -182,17 +184,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -261,7 +260,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -298,12 +296,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -348,87 +348,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -452,75 +408,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -528,16 +426,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -549,9 +446,7 @@
 				  kmfoomaticmanager.cpp \
 				  kfoomaticprinterimpl.cpp
 
-#>- kdeprint_foomatic_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
-#>+ 1
-kdeprint_foomatic_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined $(KDE_NO_UNDEFINED)
+kdeprint_foomatic_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
 kdeprint_foomatic_la_LIBADD = $(top_builddir)/kdeprint/management/libkdeprint_management.la
 #>- kdeprint_foomatic_la_METASOURCES = AUTO
 noinst_HEADERS = kmfoomaticmanager.h \
@@ -566,7 +461,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .c .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -604,13 +499,13 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
+	test -z "$(kde_moduledir)" || $(MKDIR_P) "$(DESTDIR)$(kde_moduledir)"
 	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
@@ -621,7 +516,7 @@
 
 uninstall-kde_moduleLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
@@ -635,14 +530,11 @@
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
-#>- kdeprint_foomatic.la: $(kdeprint_foomatic_la_OBJECTS) $(kdeprint_foomatic_la_DEPENDENCIES) 
-#>+ 2
-@KDE_USE_CLOSURE_TRUE@kdeprint_foomatic.la: kdeprint_foomatic.la.closure $(kdeprint_foomatic_la_OBJECTS) $(kdeprint_foomatic_la_DEPENDENCIES) 
-@KDE_USE_CLOSURE_FALSE@kdeprint_foomatic.la: $(kdeprint_foomatic_la_OBJECTS) $(kdeprint_foomatic_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(kde_moduledir) $(kdeprint_foomatic_la_LDFLAGS) $(kdeprint_foomatic_la_OBJECTS) $(kdeprint_foomatic_la_LIBADD) $(LIBS)
+kdeprint_foomatic.la: $(kdeprint_foomatic_la_OBJECTS) $(kdeprint_foomatic_la_DEPENDENCIES) 
+	$(kdeprint_foomatic_la_LINK) -rpath $(kde_moduledir) $(kdeprint_foomatic_la_OBJECTS) $(kdeprint_foomatic_la_LIBADD) $(LIBS)
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
+	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
 	  if test -f $$p \
@@ -670,7 +562,7 @@
 	done
 make_driver_db_foomatic$(EXEEXT): $(make_driver_db_foomatic_OBJECTS) $(make_driver_db_foomatic_DEPENDENCIES) 
 	@rm -f make_driver_db_foomatic$(EXEEXT)
-	$(LINK) $(make_driver_db_foomatic_LDFLAGS) $(make_driver_db_foomatic_OBJECTS) $(make_driver_db_foomatic_LDADD) $(LIBS)
+	$(LINK) $(make_driver_db_foomatic_OBJECTS) $(make_driver_db_foomatic_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -684,43 +576,43 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/make_driver_db_foomatic.Po@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -730,13 +622,9 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 install-entryDATA: $(entry_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(entrydir)" || $(mkdir_p) "$(DESTDIR)$(entrydir)"
+	test -z "$(entrydir)" || $(MKDIR_P) "$(DESTDIR)$(entrydir)"
 	@list='$(entry_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -801,22 +689,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -832,7 +719,7 @@
 all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA) $(HEADERS)
 installdirs:
 	for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(entrydir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -865,14 +752,14 @@
 #>- clean-am: clean-binPROGRAMS clean-generic clean-kde_moduleLTLIBRARIES \
 #>- 	clean-libtool mostlyclean-am
 #>+ 2
-clean-am: clean-closures clean-bcheck clean-final  clean-binPROGRAMS clean-generic clean-kde_moduleLTLIBRARIES \
+clean-am: clean-bcheck clean-final  clean-binPROGRAMS clean-generic clean-kde_moduleLTLIBRARIES \
 	clean-libtool mostlyclean-am
 
 distclean: distclean-am
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
@@ -888,14 +775,22 @@
 #>+ 1
 install-data-am:   install-entryDATA 
 
+install-dvi: install-dvi-am
+
 #>- install-exec-am: install-binPROGRAMS
 #>+ 1
 install-exec-am:  install-binPROGRAMS install-kde_moduleLTLIBRARIES
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -917,43 +812,33 @@
 ps-am:
 
 uninstall-am: uninstall-binPROGRAMS uninstall-entryDATA \
-	uninstall-info-am uninstall-kde_moduleLTLIBRARIES
+	uninstall-kde_moduleLTLIBRARIES
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
 	clean-generic clean-kde_moduleLTLIBRARIES clean-libtool ctags \
 	distclean distclean-compile distclean-generic \
 	distclean-libtool distclean-tags distdir dvi dvi-am html \
 	html-am info info-am install install-am install-binPROGRAMS \
-	install-data install-data-am install-entryDATA install-exec \
-	install-exec-am install-info install-info-am \
-	install-kde_moduleLTLIBRARIES install-man install-strip \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-entryDATA install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am \
+	install-kde_moduleLTLIBRARIES install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
 	installcheck installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 	tags uninstall uninstall-am uninstall-binPROGRAMS \
-	uninstall-entryDATA uninstall-info-am \
-	uninstall-kde_moduleLTLIBRARIES
+	uninstall-entryDATA uninstall-kde_moduleLTLIBRARIES
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
-#>+ 8
-kdeprint_foomatic.la.closure: $(kdeprint_foomatic_la_OBJECTS) $(kdeprint_foomatic_la_DEPENDENCIES)
-	@echo "int main() {return 0;}" > kdeprint_foomatic_la_closure.cpp
-	@$(LTCXXCOMPILE) -c kdeprint_foomatic_la_closure.cpp
-	$(CXXLINK) kdeprint_foomatic_la_closure.lo $(kdeprint_foomatic_la_LDFLAGS) $(kdeprint_foomatic_la_OBJECTS) $(kdeprint_foomatic_la_LIBADD) $(LIBS)
-	@rm -f kdeprint_foomatic_la_closure.* kdeprint_foomatic.la.closure
-	@echo "timestamp" > kdeprint_foomatic.la.closure
-
-
 #>+ 2
 KDE_DIST=Makefile.in foomatic.print Makefile.am 
 
-#>+ 3
-clean-closures:
-	-rm -f  kdeprint_foomatic.la.closure
-
 #>+ 2
 docs-am:
 
--- kdelibs-3.5.7.orig/kdeprint/ext/Makefile.in
+++ kdelibs-3.5.7/kdeprint/ext/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -17,15 +17,11 @@
 
 
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -75,7 +71,14 @@
 	kextprinterimpl.lo kmextuimanager.lo
 @KDE_USE_FINAL_FALSE@kdeprint_ext_la_OBJECTS = $(kdeprint_ext_la_nofinal_OBJECTS)
 @KDE_USE_FINAL_TRUE@kdeprint_ext_la_OBJECTS = $(kdeprint_ext_la_final_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+#>- kdeprint_ext_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(kdeprint_ext_la_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+kdeprint_ext_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(kdeprint_ext_la_LDFLAGS) $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -83,19 +86,21 @@
 #>+ 2
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 #>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
 CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 3
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(kdeprint_ext_la_SOURCES)
 DIST_SOURCES = $(kdeprint_ext_la_SOURCES)
 entryDATA_INSTALL = $(INSTALL_DATA)
@@ -109,8 +114,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -118,13 +121,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -138,8 +141,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -160,17 +161,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -239,7 +237,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -276,12 +273,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -326,87 +325,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -430,75 +385,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -506,16 +403,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -525,9 +421,7 @@
 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/kdeprint $(all_includes)
 kde_module_LTLIBRARIES = kdeprint_ext.la
 kdeprint_ext_la_SOURCES = kmextfactory.cpp kmextmanager.cpp kextprinterimpl.cpp kmextuimanager.cpp
-#>- kdeprint_ext_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
-#>+ 1
-kdeprint_ext_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined $(KDE_NO_UNDEFINED)
+kdeprint_ext_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
 kdeprint_ext_la_LIBADD = $(top_builddir)/kdeprint/libkdeprint.la
 #>- kdeprint_ext_la_METASOURCES = AUTO
 noinst_HEADERS = kmextmanager.h kextprinterimpl.h kmextuimanager.h
@@ -539,7 +433,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -577,13 +471,13 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
+	test -z "$(kde_moduledir)" || $(MKDIR_P) "$(DESTDIR)$(kde_moduledir)"
 	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
@@ -594,7 +488,7 @@
 
 uninstall-kde_moduleLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
@@ -608,11 +502,8 @@
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
-#>- kdeprint_ext.la: $(kdeprint_ext_la_OBJECTS) $(kdeprint_ext_la_DEPENDENCIES) 
-#>+ 2
-@KDE_USE_CLOSURE_TRUE@kdeprint_ext.la: kdeprint_ext.la.closure $(kdeprint_ext_la_OBJECTS) $(kdeprint_ext_la_DEPENDENCIES) 
-@KDE_USE_CLOSURE_FALSE@kdeprint_ext.la: $(kdeprint_ext_la_OBJECTS) $(kdeprint_ext_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(kde_moduledir) $(kdeprint_ext_la_LDFLAGS) $(kdeprint_ext_la_OBJECTS) $(kdeprint_ext_la_LIBADD) $(LIBS)
+kdeprint_ext.la: $(kdeprint_ext_la_OBJECTS) $(kdeprint_ext_la_DEPENDENCIES) 
+	$(kdeprint_ext_la_LINK) -rpath $(kde_moduledir) $(kdeprint_ext_la_OBJECTS) $(kdeprint_ext_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -626,22 +517,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kmextuimanager.Plo@am__quote@
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -651,13 +542,9 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 install-entryDATA: $(entry_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(entrydir)" || $(mkdir_p) "$(DESTDIR)$(entrydir)"
+	test -z "$(entrydir)" || $(MKDIR_P) "$(DESTDIR)$(entrydir)"
 	@list='$(entry_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -722,22 +609,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -753,7 +639,7 @@
 all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS)
 installdirs:
 	for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(entrydir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -786,14 +672,14 @@
 #>- clean-am: clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
 #>- 	mostlyclean-am
 #>+ 2
-clean-am: clean-closures clean-bcheck clean-final  clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
+clean-am: clean-bcheck clean-final  clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
 	mostlyclean-am
 
 distclean: distclean-am
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
@@ -809,14 +695,22 @@
 #>+ 1
 install-data-am:   install-entryDATA 
 
+install-dvi: install-dvi-am
+
 #>- install-exec-am:
 #>+ 1
 install-exec-am:  install-kde_moduleLTLIBRARIES
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -837,43 +731,32 @@
 
 ps-am:
 
-uninstall-am: uninstall-entryDATA uninstall-info-am \
-	uninstall-kde_moduleLTLIBRARIES
+uninstall-am: uninstall-entryDATA uninstall-kde_moduleLTLIBRARIES
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-kde_moduleLTLIBRARIES clean-libtool ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
 	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am \
-	install-entryDATA install-exec install-exec-am install-info \
-	install-info-am install-kde_moduleLTLIBRARIES install-man \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-	pdf pdf-am ps ps-am tags uninstall uninstall-am \
-	uninstall-entryDATA uninstall-info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-entryDATA install-exec install-exec-am \
+	install-html install-html-am install-info install-info-am \
+	install-kde_moduleLTLIBRARIES install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags uninstall uninstall-am uninstall-entryDATA \
 	uninstall-kde_moduleLTLIBRARIES
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
-#>+ 8
-kdeprint_ext.la.closure: $(kdeprint_ext_la_OBJECTS) $(kdeprint_ext_la_DEPENDENCIES)
-	@echo "int main() {return 0;}" > kdeprint_ext_la_closure.cpp
-	@$(LTCXXCOMPILE) -c kdeprint_ext_la_closure.cpp
-	$(CXXLINK) kdeprint_ext_la_closure.lo $(kdeprint_ext_la_LDFLAGS) $(kdeprint_ext_la_OBJECTS) $(kdeprint_ext_la_LIBADD) $(LIBS)
-	@rm -f kdeprint_ext_la_closure.* kdeprint_ext.la.closure
-	@echo "timestamp" > kdeprint_ext.la.closure
-
-
 #>+ 2
 KDE_DIST=Makefile.in ext.print Makefile.am 
 
-#>+ 3
-clean-closures:
-	-rm -f  kdeprint_ext.la.closure
-
 #>+ 2
 docs-am:
 
--- kdelibs-3.5.7.orig/kdeprint/rlpr/Makefile.in
+++ kdelibs-3.5.7/kdeprint/rlpr/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -17,15 +17,11 @@
 
 
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -77,7 +73,14 @@
 	kmproprlpr.lo kmproxywidget.lo kmconfigproxy.lo
 @KDE_USE_FINAL_FALSE@kdeprint_rlpr_la_OBJECTS = $(kdeprint_rlpr_la_nofinal_OBJECTS)
 @KDE_USE_FINAL_TRUE@kdeprint_rlpr_la_OBJECTS = $(kdeprint_rlpr_la_final_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+#>- kdeprint_rlpr_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(kdeprint_rlpr_la_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+kdeprint_rlpr_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(kdeprint_rlpr_la_LDFLAGS) $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -85,19 +88,21 @@
 #>+ 2
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
-#>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+#>+ 3
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
 CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 3
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(kdeprint_rlpr_la_SOURCES)
 DIST_SOURCES = $(kdeprint_rlpr_la_SOURCES)
 entryDATA_INSTALL = $(INSTALL_DATA)
@@ -111,8 +116,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -120,13 +123,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -140,8 +143,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -162,17 +163,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -241,7 +239,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -278,12 +275,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -328,87 +327,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -432,75 +387,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -508,16 +405,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -529,9 +425,7 @@
 kdeprint_rlpr_la_SOURCES = kmrlprfactory.cpp kmrlprmanager.cpp krlprprinterimpl.cpp kmrlpruimanager.cpp \
 			      kmwrlpr.cpp kmproprlpr.cpp kmproxywidget.cpp kmconfigproxy.cpp
 
-#>- kdeprint_rlpr_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
-#>+ 1
-kdeprint_rlpr_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined $(KDE_NO_UNDEFINED)
+kdeprint_rlpr_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
 kdeprint_rlpr_la_LIBADD = $(top_builddir)/kdeprint/management/libkdeprint_management.la
 #>- kdeprint_rlpr_la_METASOURCES = AUTO
 noinst_HEADERS = kmrlprmanager.h krlprprinterimpl.h kmrlpruimanager.h kmwrlpr.h kmproprlpr.h \
@@ -545,7 +439,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -583,13 +477,13 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
+	test -z "$(kde_moduledir)" || $(MKDIR_P) "$(DESTDIR)$(kde_moduledir)"
 	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
@@ -600,7 +494,7 @@
 
 uninstall-kde_moduleLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
@@ -614,11 +508,8 @@
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
-#>- kdeprint_rlpr.la: $(kdeprint_rlpr_la_OBJECTS) $(kdeprint_rlpr_la_DEPENDENCIES) 
-#>+ 2
-@KDE_USE_CLOSURE_TRUE@kdeprint_rlpr.la: kdeprint_rlpr.la.closure $(kdeprint_rlpr_la_OBJECTS) $(kdeprint_rlpr_la_DEPENDENCIES) 
-@KDE_USE_CLOSURE_FALSE@kdeprint_rlpr.la: $(kdeprint_rlpr_la_OBJECTS) $(kdeprint_rlpr_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(kde_moduledir) $(kdeprint_rlpr_la_LDFLAGS) $(kdeprint_rlpr_la_OBJECTS) $(kdeprint_rlpr_la_LIBADD) $(LIBS)
+kdeprint_rlpr.la: $(kdeprint_rlpr_la_OBJECTS) $(kdeprint_rlpr_la_DEPENDENCIES) 
+	$(kdeprint_rlpr_la_LINK) -rpath $(kde_moduledir) $(kdeprint_rlpr_la_OBJECTS) $(kdeprint_rlpr_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -636,22 +527,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/krlprprinterimpl.Plo@am__quote@
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -661,13 +552,9 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 install-entryDATA: $(entry_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(entrydir)" || $(mkdir_p) "$(DESTDIR)$(entrydir)"
+	test -z "$(entrydir)" || $(MKDIR_P) "$(DESTDIR)$(entrydir)"
 	@list='$(entry_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -732,22 +619,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -763,7 +649,7 @@
 all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS)
 installdirs:
 	for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(entrydir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -796,14 +682,14 @@
 #>- clean-am: clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
 #>- 	mostlyclean-am
 #>+ 2
-clean-am: clean-metasources clean-closures clean-bcheck clean-final  clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
+clean-am: clean-metasources clean-bcheck clean-final  clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
 	mostlyclean-am
 
 distclean: distclean-am
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
@@ -819,14 +705,22 @@
 #>+ 1
 install-data-am:   install-entryDATA 
 
+install-dvi: install-dvi-am
+
 #>- install-exec-am:
 #>+ 1
 install-exec-am:  install-kde_moduleLTLIBRARIES
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -847,36 +741,29 @@
 
 ps-am:
 
-uninstall-am: uninstall-entryDATA uninstall-info-am \
-	uninstall-kde_moduleLTLIBRARIES
+uninstall-am: uninstall-entryDATA uninstall-kde_moduleLTLIBRARIES
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-kde_moduleLTLIBRARIES clean-libtool ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
 	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am \
-	install-entryDATA install-exec install-exec-am install-info \
-	install-info-am install-kde_moduleLTLIBRARIES install-man \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-	pdf pdf-am ps ps-am tags uninstall uninstall-am \
-	uninstall-entryDATA uninstall-info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-entryDATA install-exec install-exec-am \
+	install-html install-html-am install-info install-info-am \
+	install-kde_moduleLTLIBRARIES install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags uninstall uninstall-am uninstall-entryDATA \
 	uninstall-kde_moduleLTLIBRARIES
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
-#>+ 8
-kdeprint_rlpr.la.closure: $(kdeprint_rlpr_la_OBJECTS) $(kdeprint_rlpr_la_DEPENDENCIES)
-	@echo "int main() {return 0;}" > kdeprint_rlpr_la_closure.cpp
-	@$(LTCXXCOMPILE) -c kdeprint_rlpr_la_closure.cpp
-	$(CXXLINK) kdeprint_rlpr_la_closure.lo $(kdeprint_rlpr_la_LDFLAGS) $(kdeprint_rlpr_la_OBJECTS) $(kdeprint_rlpr_la_LIBADD) $(LIBS)
-	@rm -f kdeprint_rlpr_la_closure.* kdeprint_rlpr.la.closure
-	@echo "timestamp" > kdeprint_rlpr.la.closure
-
-
 #>+ 3
 kmwrlpr.moc: $(srcdir)/kmwrlpr.h
 	$(MOC) $(srcdir)/kmwrlpr.h -o kmwrlpr.moc
@@ -891,10 +778,6 @@
 #>+ 2
 KDE_DIST=Makefile.in rlpr.print Makefile.am 
 
-#>+ 3
-clean-closures:
-	-rm -f  kdeprint_rlpr.la.closure
-
 #>+ 2
 docs-am:
 
--- kdelibs-3.5.7.orig/kio/tests/Makefile.in
+++ kdelibs-3.5.7/kio/tests/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -33,15 +33,11 @@
 #    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 #    Boston, MA 02110-1301, USA.
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -70,6 +66,7 @@
 	netaccesstest$(EXEEXT) jobtest$(EXEEXT) \
 	kurlcompletiontest$(EXEEXT) kmimetypetest$(EXEEXT) \
 	kacltest$(EXEEXT)
+TESTS = kmimetypetest$(EXEEXT)
 bin_PROGRAMS = ktradertest$(EXEEXT)
 subdir = kio/tests
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
@@ -92,6 +89,13 @@
 #>- kunittest_kdirwatch_la_OBJECTS = $(am_kunittest_kdirwatch_la_OBJECTS)
 #>+ 1
 kunittest_kdirwatch_la_OBJECTS = kdirwatchunittest.lo
+#>- kunittest_kdirwatch_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(kunittest_kdirwatch_la_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+kunittest_kdirwatch_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(kunittest_kdirwatch_la_LDFLAGS) $(LDFLAGS) -o $@
 am__installdirs = "$(DESTDIR)$(bindir)"
 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(bin_PROGRAMS)
@@ -287,7 +291,7 @@
 speed_OBJECTS = speed.$(OBJEXT)
 speed_LDADD = $(LDADD)
 speed_DEPENDENCIES = $(am__DEPENDENCIES_1)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -295,19 +299,21 @@
 #>+ 2
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 #>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
 CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 3
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(kunittest_kdirwatch_la_SOURCES) \
 	$(dataprotocoltest_SOURCES) $(getalltest_SOURCES) \
 	$(jobtest_SOURCES) $(kacltest_SOURCES) $(kdcopcheck_SOURCES) \
@@ -350,8 +356,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -359,13 +363,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -379,8 +383,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -401,17 +403,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -480,7 +479,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -517,12 +515,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -567,87 +567,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -671,75 +627,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -747,16 +645,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -765,7 +662,6 @@
 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/kio $(all_includes)
 LDADD = $(LIB_KIO)
 AM_LDFLAGS = $(all_libraries) $(KDE_RPATH)
-TESTS = kmimetypetest
 #>- METASOURCES = AUTO
 speed_SOURCES = speed.cpp
 kioslavetest_SOURCES = kioslavetest.cpp
@@ -809,7 +705,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -847,9 +743,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 clean-checkLTLIBRARIES:
@@ -861,10 +757,10 @@
 	  rm -f "$${dir}/so_locations"; \
 	done
 kunittest_kdirwatch.la: $(kunittest_kdirwatch_la_OBJECTS) $(kunittest_kdirwatch_la_DEPENDENCIES) 
-	$(CXXLINK)  $(kunittest_kdirwatch_la_LDFLAGS) $(kunittest_kdirwatch_la_OBJECTS) $(kunittest_kdirwatch_la_LIBADD) $(LIBS)
+	$(kunittest_kdirwatch_la_LINK)  $(kunittest_kdirwatch_la_OBJECTS) $(kunittest_kdirwatch_la_LIBADD) $(LIBS)
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
+	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
 	  if test -f $$p \
@@ -899,100 +795,100 @@
 	done
 dataprotocoltest$(EXEEXT): $(dataprotocoltest_OBJECTS) $(dataprotocoltest_DEPENDENCIES) 
 	@rm -f dataprotocoltest$(EXEEXT)
-	$(CXXLINK) $(dataprotocoltest_LDFLAGS) $(dataprotocoltest_OBJECTS) $(dataprotocoltest_LDADD) $(LIBS)
+	$(CXXLINK) $(dataprotocoltest_OBJECTS) $(dataprotocoltest_LDADD) $(LIBS)
 getalltest$(EXEEXT): $(getalltest_OBJECTS) $(getalltest_DEPENDENCIES) 
 	@rm -f getalltest$(EXEEXT)
-	$(CXXLINK) $(getalltest_LDFLAGS) $(getalltest_OBJECTS) $(getalltest_LDADD) $(LIBS)
+	$(CXXLINK) $(getalltest_OBJECTS) $(getalltest_LDADD) $(LIBS)
 jobtest$(EXEEXT): $(jobtest_OBJECTS) $(jobtest_DEPENDENCIES) 
 	@rm -f jobtest$(EXEEXT)
-	$(CXXLINK) $(jobtest_LDFLAGS) $(jobtest_OBJECTS) $(jobtest_LDADD) $(LIBS)
+	$(CXXLINK) $(jobtest_OBJECTS) $(jobtest_LDADD) $(LIBS)
 kacltest$(EXEEXT): $(kacltest_OBJECTS) $(kacltest_DEPENDENCIES) 
 	@rm -f kacltest$(EXEEXT)
-	$(CXXLINK) $(kacltest_LDFLAGS) $(kacltest_OBJECTS) $(kacltest_LDADD) $(LIBS)
+	$(CXXLINK) $(kacltest_OBJECTS) $(kacltest_LDADD) $(LIBS)
 kdcopcheck$(EXEEXT): $(kdcopcheck_OBJECTS) $(kdcopcheck_DEPENDENCIES) 
 	@rm -f kdcopcheck$(EXEEXT)
-	$(CXXLINK) $(kdcopcheck_LDFLAGS) $(kdcopcheck_OBJECTS) $(kdcopcheck_LDADD) $(LIBS)
+	$(CXXLINK) $(kdcopcheck_OBJECTS) $(kdcopcheck_LDADD) $(LIBS)
 kdefaultprogresstest$(EXEEXT): $(kdefaultprogresstest_OBJECTS) $(kdefaultprogresstest_DEPENDENCIES) 
 	@rm -f kdefaultprogresstest$(EXEEXT)
-	$(CXXLINK) $(kdefaultprogresstest_LDFLAGS) $(kdefaultprogresstest_OBJECTS) $(kdefaultprogresstest_LDADD) $(LIBS)
+	$(CXXLINK) $(kdefaultprogresstest_OBJECTS) $(kdefaultprogresstest_LDADD) $(LIBS)
 kdirlistertest$(EXEEXT): $(kdirlistertest_OBJECTS) $(kdirlistertest_DEPENDENCIES) 
 	@rm -f kdirlistertest$(EXEEXT)
-	$(CXXLINK) $(kdirlistertest_LDFLAGS) $(kdirlistertest_OBJECTS) $(kdirlistertest_LDADD) $(LIBS)
+	$(CXXLINK) $(kdirlistertest_OBJECTS) $(kdirlistertest_LDADD) $(LIBS)
 kdirwatchtest$(EXEEXT): $(kdirwatchtest_OBJECTS) $(kdirwatchtest_DEPENDENCIES) 
 	@rm -f kdirwatchtest$(EXEEXT)
-	$(CXXLINK) $(kdirwatchtest_LDFLAGS) $(kdirwatchtest_OBJECTS) $(kdirwatchtest_LDADD) $(LIBS)
+	$(CXXLINK) $(kdirwatchtest_OBJECTS) $(kdirwatchtest_LDADD) $(LIBS)
 kfiltertest$(EXEEXT): $(kfiltertest_OBJECTS) $(kfiltertest_DEPENDENCIES) 
 	@rm -f kfiltertest$(EXEEXT)
-	$(CXXLINK) $(kfiltertest_LDFLAGS) $(kfiltertest_OBJECTS) $(kfiltertest_LDADD) $(LIBS)
+	$(CXXLINK) $(kfiltertest_OBJECTS) $(kfiltertest_LDADD) $(LIBS)
 kionetrctest$(EXEEXT): $(kionetrctest_OBJECTS) $(kionetrctest_DEPENDENCIES) 
 	@rm -f kionetrctest$(EXEEXT)
-	$(CXXLINK) $(kionetrctest_LDFLAGS) $(kionetrctest_OBJECTS) $(kionetrctest_LDADD) $(LIBS)
+	$(CXXLINK) $(kionetrctest_OBJECTS) $(kionetrctest_LDADD) $(LIBS)
 kiopassdlgtest$(EXEEXT): $(kiopassdlgtest_OBJECTS) $(kiopassdlgtest_DEPENDENCIES) 
 	@rm -f kiopassdlgtest$(EXEEXT)
-	$(CXXLINK) $(kiopassdlgtest_LDFLAGS) $(kiopassdlgtest_OBJECTS) $(kiopassdlgtest_LDADD) $(LIBS)
+	$(CXXLINK) $(kiopassdlgtest_OBJECTS) $(kiopassdlgtest_LDADD) $(LIBS)
 kioslavetest$(EXEEXT): $(kioslavetest_OBJECTS) $(kioslavetest_DEPENDENCIES) 
 	@rm -f kioslavetest$(EXEEXT)
-	$(CXXLINK) $(kioslavetest_LDFLAGS) $(kioslavetest_OBJECTS) $(kioslavetest_LDADD) $(LIBS)
+	$(CXXLINK) $(kioslavetest_OBJECTS) $(kioslavetest_LDADD) $(LIBS)
 kmfitest$(EXEEXT): $(kmfitest_OBJECTS) $(kmfitest_DEPENDENCIES) 
 	@rm -f kmfitest$(EXEEXT)
-	$(CXXLINK) $(kmfitest_LDFLAGS) $(kmfitest_OBJECTS) $(kmfitest_LDADD) $(LIBS)
+	$(CXXLINK) $(kmfitest_OBJECTS) $(kmfitest_LDADD) $(LIBS)
 kmimefromext$(EXEEXT): $(kmimefromext_OBJECTS) $(kmimefromext_DEPENDENCIES) 
 	@rm -f kmimefromext$(EXEEXT)
-	$(CXXLINK) $(kmimefromext_LDFLAGS) $(kmimefromext_OBJECTS) $(kmimefromext_LDADD) $(LIBS)
+	$(CXXLINK) $(kmimefromext_OBJECTS) $(kmimefromext_LDADD) $(LIBS)
 kmimemagictest$(EXEEXT): $(kmimemagictest_OBJECTS) $(kmimemagictest_DEPENDENCIES) 
 	@rm -f kmimemagictest$(EXEEXT)
-	$(CXXLINK) $(kmimemagictest_LDFLAGS) $(kmimemagictest_OBJECTS) $(kmimemagictest_LDADD) $(LIBS)
+	$(CXXLINK) $(kmimemagictest_OBJECTS) $(kmimemagictest_LDADD) $(LIBS)
 kmimetypetest$(EXEEXT): $(kmimetypetest_OBJECTS) $(kmimetypetest_DEPENDENCIES) 
 	@rm -f kmimetypetest$(EXEEXT)
-	$(CXXLINK) $(kmimetypetest_LDFLAGS) $(kmimetypetest_OBJECTS) $(kmimetypetest_LDADD) $(LIBS)
+	$(CXXLINK) $(kmimetypetest_OBJECTS) $(kmimetypetest_LDADD) $(LIBS)
 kpropsdlgtest$(EXEEXT): $(kpropsdlgtest_OBJECTS) $(kpropsdlgtest_DEPENDENCIES) 
 	@rm -f kpropsdlgtest$(EXEEXT)
-	$(CXXLINK) $(kpropsdlgtest_LDFLAGS) $(kpropsdlgtest_OBJECTS) $(kpropsdlgtest_LDADD) $(LIBS)
+	$(CXXLINK) $(kpropsdlgtest_OBJECTS) $(kpropsdlgtest_LDADD) $(LIBS)
 kprotocolinfotest$(EXEEXT): $(kprotocolinfotest_OBJECTS) $(kprotocolinfotest_DEPENDENCIES) 
 	@rm -f kprotocolinfotest$(EXEEXT)
-	$(CXXLINK) $(kprotocolinfotest_LDFLAGS) $(kprotocolinfotest_OBJECTS) $(kprotocolinfotest_LDADD) $(LIBS)
+	$(CXXLINK) $(kprotocolinfotest_OBJECTS) $(kprotocolinfotest_LDADD) $(LIBS)
 kruntest$(EXEEXT): $(kruntest_OBJECTS) $(kruntest_DEPENDENCIES) 
 	@rm -f kruntest$(EXEEXT)
-	$(CXXLINK) $(kruntest_LDFLAGS) $(kruntest_OBJECTS) $(kruntest_LDADD) $(LIBS)
+	$(CXXLINK) $(kruntest_OBJECTS) $(kruntest_LDADD) $(LIBS)
 kscantest$(EXEEXT): $(kscantest_OBJECTS) $(kscantest_DEPENDENCIES) 
 	@rm -f kscantest$(EXEEXT)
-	$(CXXLINK) $(kscantest_LDFLAGS) $(kscantest_OBJECTS) $(kscantest_LDADD) $(LIBS)
+	$(CXXLINK) $(kscantest_OBJECTS) $(kscantest_LDADD) $(LIBS)
 kshredtest$(EXEEXT): $(kshredtest_OBJECTS) $(kshredtest_DEPENDENCIES) 
 	@rm -f kshredtest$(EXEEXT)
-	$(CXXLINK) $(kshredtest_LDFLAGS) $(kshredtest_OBJECTS) $(kshredtest_LDADD) $(LIBS)
+	$(CXXLINK) $(kshredtest_OBJECTS) $(kshredtest_LDADD) $(LIBS)
 ksycocatest$(EXEEXT): $(ksycocatest_OBJECTS) $(ksycocatest_DEPENDENCIES) 
 	@rm -f ksycocatest$(EXEEXT)
-	$(CXXLINK) $(ksycocatest_LDFLAGS) $(ksycocatest_OBJECTS) $(ksycocatest_LDADD) $(LIBS)
+	$(CXXLINK) $(ksycocatest_OBJECTS) $(ksycocatest_LDADD) $(LIBS)
 ksycocaupdatetest$(EXEEXT): $(ksycocaupdatetest_OBJECTS) $(ksycocaupdatetest_DEPENDENCIES) 
 	@rm -f ksycocaupdatetest$(EXEEXT)
-	$(CXXLINK) $(ksycocaupdatetest_LDFLAGS) $(ksycocaupdatetest_OBJECTS) $(ksycocaupdatetest_LDADD) $(LIBS)
+	$(CXXLINK) $(ksycocaupdatetest_OBJECTS) $(ksycocaupdatetest_LDADD) $(LIBS)
 ktartest$(EXEEXT): $(ktartest_OBJECTS) $(ktartest_DEPENDENCIES) 
 	@rm -f ktartest$(EXEEXT)
-	$(CXXLINK) $(ktartest_LDFLAGS) $(ktartest_OBJECTS) $(ktartest_LDADD) $(LIBS)
+	$(CXXLINK) $(ktartest_OBJECTS) $(ktartest_LDADD) $(LIBS)
 ktradertest$(EXEEXT): $(ktradertest_OBJECTS) $(ktradertest_DEPENDENCIES) 
 	@rm -f ktradertest$(EXEEXT)
-	$(CXXLINK) $(ktradertest_LDFLAGS) $(ktradertest_OBJECTS) $(ktradertest_LDADD) $(LIBS)
+	$(CXXLINK) $(ktradertest_OBJECTS) $(ktradertest_LDADD) $(LIBS)
 kurifiltertest$(EXEEXT): $(kurifiltertest_OBJECTS) $(kurifiltertest_DEPENDENCIES) 
 	@rm -f kurifiltertest$(EXEEXT)
-	$(CXXLINK) $(kurifiltertest_LDFLAGS) $(kurifiltertest_OBJECTS) $(kurifiltertest_LDADD) $(LIBS)
+	$(CXXLINK) $(kurifiltertest_OBJECTS) $(kurifiltertest_LDADD) $(LIBS)
 kurlcompletiontest$(EXEEXT): $(kurlcompletiontest_OBJECTS) $(kurlcompletiontest_DEPENDENCIES) 
 	@rm -f kurlcompletiontest$(EXEEXT)
-	$(CXXLINK) $(kurlcompletiontest_LDFLAGS) $(kurlcompletiontest_OBJECTS) $(kurlcompletiontest_LDADD) $(LIBS)
+	$(CXXLINK) $(kurlcompletiontest_OBJECTS) $(kurlcompletiontest_LDADD) $(LIBS)
 kziptest$(EXEEXT): $(kziptest_OBJECTS) $(kziptest_DEPENDENCIES) 
 	@rm -f kziptest$(EXEEXT)
-	$(CXXLINK) $(kziptest_LDFLAGS) $(kziptest_OBJECTS) $(kziptest_LDADD) $(LIBS)
+	$(CXXLINK) $(kziptest_OBJECTS) $(kziptest_LDADD) $(LIBS)
 metatest$(EXEEXT): $(metatest_OBJECTS) $(metatest_DEPENDENCIES) 
 	@rm -f metatest$(EXEEXT)
-	$(CXXLINK) $(metatest_LDFLAGS) $(metatest_OBJECTS) $(metatest_LDADD) $(LIBS)
+	$(CXXLINK) $(metatest_OBJECTS) $(metatest_LDADD) $(LIBS)
 netaccesstest$(EXEEXT): $(netaccesstest_OBJECTS) $(netaccesstest_DEPENDENCIES) 
 	@rm -f netaccesstest$(EXEEXT)
-	$(CXXLINK) $(netaccesstest_LDFLAGS) $(netaccesstest_OBJECTS) $(netaccesstest_LDADD) $(LIBS)
+	$(CXXLINK) $(netaccesstest_OBJECTS) $(netaccesstest_LDADD) $(LIBS)
 previewtest$(EXEEXT): $(previewtest_OBJECTS) $(previewtest_DEPENDENCIES) 
 	@rm -f previewtest$(EXEEXT)
-	$(CXXLINK) $(previewtest_LDFLAGS) $(previewtest_OBJECTS) $(previewtest_LDADD) $(LIBS)
+	$(CXXLINK) $(previewtest_OBJECTS) $(previewtest_LDADD) $(LIBS)
 speed$(EXEEXT): $(speed_OBJECTS) $(speed_DEPENDENCIES) 
 	@rm -f speed$(EXEEXT)
-	$(CXXLINK) $(speed_LDFLAGS) $(speed_OBJECTS) $(speed_LDADD) $(LIBS)
+	$(CXXLINK) $(speed_OBJECTS) $(speed_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -1035,22 +931,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/speed.Po@am__quote@
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -1061,10 +957,6 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -1114,9 +1006,9 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 check-TESTS: $(TESTS)
-	@failed=0; all=0; xfail=0; xpass=0; skip=0; \
+	@failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[	 ]'; \
 	srcdir=$(srcdir); export srcdir; \
-	list='$(TESTS)'; \
+	list=' $(TESTS) '; \
 	if test -n "$$list"; then \
 	  for tst in $$list; do \
 	    if test -f ./$$tst; then dir=./; \
@@ -1125,7 +1017,7 @@
 	    if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
 	      all=`expr $$all + 1`; \
 	      case " $(XFAIL_TESTS) " in \
-	      *" $$tst "*) \
+	      *$$ws$$tst$$ws*) \
 		xpass=`expr $$xpass + 1`; \
 		failed=`expr $$failed + 1`; \
 		echo "XPASS: $$tst"; \
@@ -1137,7 +1029,7 @@
 	    elif test $$? -ne 77; then \
 	      all=`expr $$all + 1`; \
 	      case " $(XFAIL_TESTS) " in \
-	      *" $$tst "*) \
+	      *$$ws$$tst$$ws*) \
 		xfail=`expr $$xfail + 1`; \
 		echo "XFAIL: $$tst"; \
 	      ;; \
@@ -1187,22 +1079,21 @@
 	else :; fi
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -1220,7 +1111,7 @@
 all-am: Makefile $(PROGRAMS)
 installdirs:
 	for dir in "$(DESTDIR)$(bindir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -1260,7 +1151,7 @@
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
@@ -1274,12 +1165,20 @@
 
 install-data-am:
 
+install-dvi: install-dvi-am
+
 install-exec-am: install-binPROGRAMS
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -1300,7 +1199,9 @@
 
 ps-am:
 
-uninstall-am: uninstall-binPROGRAMS uninstall-info-am
+uninstall-am: uninstall-binPROGRAMS
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am check-local \
 	clean clean-binPROGRAMS clean-checkLTLIBRARIES \
@@ -1308,13 +1209,14 @@
 	distclean distclean-compile distclean-generic \
 	distclean-libtool distclean-tags distdir dvi dvi-am html \
 	html-am info info-am install install-am install-binPROGRAMS \
-	install-data install-data-am install-exec install-exec-am \
-	install-info install-info-am install-man install-strip \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
 	installcheck installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-binPROGRAMS \
-	uninstall-info-am
+	tags uninstall uninstall-am uninstall-binPROGRAMS
 
 
 # Unfortunately some tests depend on the network settings, it seems
--- kdelibs-3.5.7.orig/kio/kpasswdserver/Makefile.in
+++ kdelibs-3.5.7/kio/kpasswdserver/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -18,15 +18,11 @@
 # $Id: Makefile.am 433401 2005-07-10 18:42:04Z adridg $
 # Makefile.am of kdebase/kioslave/http
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -76,7 +72,14 @@
 kded_kpasswdserver_la_nofinal_OBJECTS = kpasswdserver.lo kpasswdserver_skel.lo
 @KDE_USE_FINAL_FALSE@kded_kpasswdserver_la_OBJECTS = $(kded_kpasswdserver_la_nofinal_OBJECTS)
 @KDE_USE_FINAL_TRUE@kded_kpasswdserver_la_OBJECTS = $(kded_kpasswdserver_la_final_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+#>- kded_kpasswdserver_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(kded_kpasswdserver_la_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+kded_kpasswdserver_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(kded_kpasswdserver_la_LDFLAGS) $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -84,19 +87,21 @@
 #>+ 2
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 #>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
 CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 3
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(kded_kpasswdserver_la_SOURCES)
 DIST_SOURCES = $(kded_kpasswdserver_la_SOURCES)
 ETAGS = etags
@@ -107,8 +112,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -116,13 +119,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -136,8 +139,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -158,17 +159,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -237,7 +235,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -274,12 +271,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -324,87 +323,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -428,75 +383,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -504,16 +401,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -535,7 +431,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -573,13 +469,13 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
+	test -z "$(kde_moduledir)" || $(MKDIR_P) "$(DESTDIR)$(kde_moduledir)"
 	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
@@ -590,7 +486,7 @@
 
 uninstall-kde_moduleLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
@@ -605,7 +501,7 @@
 	  rm -f "$${dir}/so_locations"; \
 	done
 kded_kpasswdserver.la: $(kded_kpasswdserver_la_OBJECTS) $(kded_kpasswdserver_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(kde_moduledir) $(kded_kpasswdserver_la_LDFLAGS) $(kded_kpasswdserver_la_OBJECTS) $(kded_kpasswdserver_la_LIBADD) $(LIBS)
+	$(kded_kpasswdserver_la_LINK) -rpath $(kde_moduledir) $(kded_kpasswdserver_la_OBJECTS) $(kded_kpasswdserver_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -616,22 +512,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kpasswdserver.Plo@am__quote@
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -642,10 +538,6 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -695,23 +587,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	$(mkdir_p) $(distdir)/../../admin
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -727,7 +617,7 @@
 all-am: Makefile $(LTLIBRARIES)
 installdirs:
 	for dir in "$(DESTDIR)$(kde_moduledir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -767,7 +657,7 @@
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
@@ -783,14 +673,22 @@
 #>+ 1
 install-data-am:   install-data-local 
 
+install-dvi: install-dvi-am
+
 #>- install-exec-am:
 #>+ 1
 install-exec-am:  install-kde_moduleLTLIBRARIES
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -811,22 +709,24 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-kde_moduleLTLIBRARIES \
-	uninstall-local
+uninstall-am: uninstall-kde_moduleLTLIBRARIES uninstall-local
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-kde_moduleLTLIBRARIES clean-libtool ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
 	distclean-tags distdir dvi dvi-am html html-am info info-am \
 	install install-am install-data install-data-am \
-	install-data-local install-exec install-exec-am install-info \
+	install-data-local install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
 	install-info-am install-kde_moduleLTLIBRARIES install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
 	install-strip installcheck installcheck-am installdirs \
 	maintainer-clean maintainer-clean-generic mostlyclean \
 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
 	pdf pdf-am ps ps-am tags uninstall uninstall-am \
-	uninstall-info-am uninstall-kde_moduleLTLIBRARIES \
-	uninstall-local
+	uninstall-kde_moduleLTLIBRARIES uninstall-local
 
 apidox-am-yes:
 	@if test \! -d "$(top_srcdir)/doc/common/" && test -z "$$DOXDATA" ; then \
--- kdelibs-3.5.7.orig/kio/kio/Makefile.in
+++ kdelibs-3.5.7/kio/kio/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -34,15 +34,11 @@
 #    Boston, MA 02110-1301, USA.
 
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -128,35 +124,38 @@
 	posixacladdons.lo
 @KDE_USE_FINAL_FALSE@libksycoca_la_OBJECTS = $(libksycoca_la_nofinal_OBJECTS)
 @KDE_USE_FINAL_TRUE@libksycoca_la_OBJECTS = $(libksycoca_la_final_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 #>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 #>+ 2
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
-#>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+#>+ 3
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
 CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 3
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(libkiocore_la_SOURCES) $(libksycoca_la_SOURCES)
 DIST_SOURCES = $(libkiocore_la_SOURCES) $(libksycoca_la_SOURCES)
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -178,8 +177,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -187,13 +184,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -207,8 +204,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -229,17 +224,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -308,7 +300,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -345,12 +336,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -395,87 +388,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -499,75 +448,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -575,16 +466,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -701,7 +591,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .c .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(srcdir)/../../admin/Doxyfile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../admin/Doxyfile.am $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -739,9 +629,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 clean-noinstLTLIBRARIES:
@@ -753,9 +643,9 @@
 	  rm -f "$${dir}/so_locations"; \
 	done
 libkiocore.la: $(libkiocore_la_OBJECTS) $(libkiocore_la_DEPENDENCIES) 
-	$(CXXLINK)  $(libkiocore_la_LDFLAGS) $(libkiocore_la_OBJECTS) $(libkiocore_la_LIBADD) $(LIBS)
+	$(CXXLINK)  $(libkiocore_la_OBJECTS) $(libkiocore_la_LIBADD) $(LIBS)
 libksycoca.la: $(libksycoca_la_OBJECTS) $(libksycoca_la_DEPENDENCIES) 
-	$(CXXLINK)  $(libksycoca_la_LDFLAGS) $(libksycoca_la_OBJECTS) $(libksycoca_la_LIBADD) $(LIBS)
+	$(CXXLINK)  $(libksycoca_la_OBJECTS) $(libksycoca_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -841,43 +731,43 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/yacc.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -887,13 +777,9 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 install-includeHEADERS: $(include_HEADERS)
 	@$(NORMAL_INSTALL)
-	test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"
+	test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)"
 	@list='$(include_HEADERS)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -910,7 +796,7 @@
 	done
 install-kioincludeHEADERS: $(kioinclude_HEADERS)
 	@$(NORMAL_INSTALL)
-	test -z "$(kioincludedir)" || $(mkdir_p) "$(DESTDIR)$(kioincludedir)"
+	test -z "$(kioincludedir)" || $(MKDIR_P) "$(DESTDIR)$(kioincludedir)"
 	@list='$(kioinclude_HEADERS)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -975,23 +861,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	$(mkdir_p) $(distdir)/../../admin
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -1007,7 +891,7 @@
 all-am: Makefile $(LTLIBRARIES) $(HEADERS)
 installdirs:
 	for dir in "$(DESTDIR)$(includedir)" "$(DESTDIR)$(kioincludedir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -1047,7 +931,7 @@
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
@@ -1062,12 +946,20 @@
 install-data-am: install-data-local install-includeHEADERS \
 	install-kioincludeHEADERS
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -1088,22 +980,26 @@
 
 ps-am:
 
-uninstall-am: uninstall-includeHEADERS uninstall-info-am \
-	uninstall-kioincludeHEADERS uninstall-local
+uninstall-am: uninstall-includeHEADERS uninstall-kioincludeHEADERS \
+	uninstall-local
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-libtool clean-noinstLTLIBRARIES ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
 	distclean-tags distdir dvi dvi-am html html-am info info-am \
 	install install-am install-data install-data-am \
-	install-data-local install-exec install-exec-am \
+	install-data-local install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am \
 	install-includeHEADERS install-info install-info-am \
-	install-kioincludeHEADERS install-man install-strip \
+	install-kioincludeHEADERS install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
 	installcheck installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 	tags uninstall uninstall-am uninstall-includeHEADERS \
-	uninstall-info-am uninstall-kioincludeHEADERS uninstall-local
+	uninstall-kioincludeHEADERS uninstall-local
 
 
 parser: $(parserfiles)
--- kdelibs-3.5.7.orig/kio/pics/Makefile.in
+++ kdelibs-3.5.7/kio/pics/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,15 +14,11 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -59,8 +55,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -68,13 +62,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -88,8 +82,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -110,17 +102,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -189,7 +178,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -226,12 +214,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -276,87 +266,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -380,75 +326,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -456,16 +344,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -478,7 +365,7 @@
 all: docs-am  all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -516,9 +403,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 mostlyclean-libtool:
@@ -526,10 +413,6 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 tags: TAGS
 TAGS:
 
@@ -538,22 +421,21 @@
 
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -602,7 +484,7 @@
 
 distclean: distclean-am
 	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool
+distclean-am: clean-am distclean-generic
 
 dvi: dvi-am
 
@@ -618,12 +500,20 @@
 #>+ 1
 install-data-am: install-kde-icons 
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -642,19 +532,22 @@
 
 ps-am:
 
-#>- uninstall-am: uninstall-info-am
+#>- uninstall-am:
 #>+ 1
-uninstall-am: uninstall-kde-icons  uninstall-info-am
+uninstall-am: uninstall-kde-icons 
+
+.MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
 	distclean distclean-generic distclean-libtool distdir dvi \
 	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-exec install-exec-am \
-	install-info install-info-am install-man install-strip \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
 	installcheck installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
-	uninstall-info-am
+	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- kdelibs-3.5.7.orig/kio/misc/kntlm/Makefile.in
+++ kdelibs-3.5.7/kio/misc/kntlm/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,15 +16,11 @@
 @SET_MAKE@
 
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -72,7 +68,14 @@
 libkntlm_la_nofinal_OBJECTS = kntlm.lo des.lo
 @KDE_USE_FINAL_FALSE@libkntlm_la_OBJECTS = $(libkntlm_la_nofinal_OBJECTS)
 @KDE_USE_FINAL_TRUE@libkntlm_la_OBJECTS = $(libkntlm_la_final_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+#>- libkntlm_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(libkntlm_la_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+libkntlm_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(libkntlm_la_LDFLAGS) $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -80,19 +83,21 @@
 #>+ 2
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 #>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
 CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 3
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(libkntlm_la_SOURCES)
 DIST_SOURCES = $(libkntlm_la_SOURCES)
 kntlmincludeHEADERS_INSTALL = $(INSTALL_HEADER)
@@ -105,8 +110,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -114,13 +117,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -134,8 +137,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -156,17 +157,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -235,7 +233,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -272,12 +269,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -322,87 +321,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -426,75 +381,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -502,16 +399,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -523,9 +419,7 @@
 kntlmincludedir = $(includedir)/kio
 kntlminclude_HEADERS = kntlm.h
 libkntlm_la_SOURCES = kntlm.cpp des.cpp
-#>- libkntlm_la_LDFLAGS = $(all_libraries) -version-info 0:0:0 -no-undefined
-#>+ 1
-libkntlm_la_LDFLAGS = $(all_libraries) -version-info 0:0:0 -no-undefined $(KDE_NO_UNDEFINED)
+libkntlm_la_LDFLAGS = $(all_libraries) -version-info 0:0:0 -no-undefined
 libkntlm_la_LIBADD = $(LIB_KDECORE)
 #>- all: all-am
 #>+ 1
@@ -533,7 +427,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -571,13 +465,13 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
@@ -588,7 +482,7 @@
 
 uninstall-libLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
@@ -602,11 +496,8 @@
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
-#>- libkntlm.la: $(libkntlm_la_OBJECTS) $(libkntlm_la_DEPENDENCIES) 
-#>+ 2
-@KDE_USE_CLOSURE_TRUE@libkntlm.la: libkntlm.la.closure $(libkntlm_la_OBJECTS) $(libkntlm_la_DEPENDENCIES) 
-@KDE_USE_CLOSURE_FALSE@libkntlm.la: $(libkntlm_la_OBJECTS) $(libkntlm_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(libdir) $(libkntlm_la_LDFLAGS) $(libkntlm_la_OBJECTS) $(libkntlm_la_LIBADD) $(LIBS)
+libkntlm.la: $(libkntlm_la_OBJECTS) $(libkntlm_la_DEPENDENCIES) 
+	$(libkntlm_la_LINK) -rpath $(libdir) $(libkntlm_la_OBJECTS) $(libkntlm_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -618,22 +509,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kntlm.Plo@am__quote@
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -643,13 +534,9 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 install-kntlmincludeHEADERS: $(kntlminclude_HEADERS)
 	@$(NORMAL_INSTALL)
-	test -z "$(kntlmincludedir)" || $(mkdir_p) "$(DESTDIR)$(kntlmincludedir)"
+	test -z "$(kntlmincludedir)" || $(MKDIR_P) "$(DESTDIR)$(kntlmincludedir)"
 	@list='$(kntlminclude_HEADERS)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -714,22 +601,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -745,7 +631,7 @@
 all-am: Makefile $(LTLIBRARIES) $(HEADERS)
 installdirs:
 	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(kntlmincludedir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -778,14 +664,14 @@
 #>- clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
 #>- 	mostlyclean-am
 #>+ 2
-clean-am: clean-closures clean-bcheck clean-final  clean-generic clean-libLTLIBRARIES clean-libtool \
+clean-am: clean-bcheck clean-final  clean-generic clean-libLTLIBRARIES clean-libtool \
 	mostlyclean-am
 
 distclean: distclean-am
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
@@ -799,12 +685,20 @@
 
 install-data-am: install-kntlmincludeHEADERS
 
+install-dvi: install-dvi-am
+
 install-exec-am: install-libLTLIBRARIES
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -825,43 +719,32 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-kntlmincludeHEADERS \
-	uninstall-libLTLIBRARIES
+uninstall-am: uninstall-kntlmincludeHEADERS uninstall-libLTLIBRARIES
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-libLTLIBRARIES clean-libtool ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
 	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-exec \
-	install-exec-am install-info install-info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am \
 	install-kntlmincludeHEADERS install-libLTLIBRARIES install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
 	install-strip installcheck installcheck-am installdirs \
 	maintainer-clean maintainer-clean-generic mostlyclean \
 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
 	pdf pdf-am ps ps-am tags uninstall uninstall-am \
-	uninstall-info-am uninstall-kntlmincludeHEADERS \
-	uninstall-libLTLIBRARIES
+	uninstall-kntlmincludeHEADERS uninstall-libLTLIBRARIES
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
-#>+ 8
-libkntlm.la.closure: $(libkntlm_la_OBJECTS) $(libkntlm_la_DEPENDENCIES)
-	@echo "int main() {return 0;}" > libkntlm_la_closure.cpp
-	@$(LTCXXCOMPILE) -c libkntlm_la_closure.cpp
-	$(CXXLINK) libkntlm_la_closure.lo $(libkntlm_la_LDFLAGS) $(libkntlm_la_OBJECTS) $(libkntlm_la_LIBADD) $(LIBS)
-	@rm -f libkntlm_la_closure.* libkntlm.la.closure
-	@echo "timestamp" > libkntlm.la.closure
-
-
 #>+ 2
 KDE_DIST=Makefile.in des.h kswap.h Makefile.am 
 
-#>+ 3
-clean-closures:
-	-rm -f  libkntlm.la.closure
-
 #>+ 2
 docs-am:
 
--- kdelibs-3.5.7.orig/kio/misc/kwalletd/Makefile.in
+++ kdelibs-3.5.7/kio/misc/kwalletd/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -35,15 +35,11 @@
 
 
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -95,7 +91,14 @@
 kded_kwalletd_la_nofinal_OBJECTS = kwalletd.lo ktimeout.lo kwalletd_skel.lo kwalletwizard.lo kbetterthankdialogbase.lo
 @KDE_USE_FINAL_FALSE@kded_kwalletd_la_OBJECTS = $(kded_kwalletd_la_nofinal_OBJECTS)
 @KDE_USE_FINAL_TRUE@kded_kwalletd_la_OBJECTS = $(kded_kwalletd_la_final_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+#>- kded_kwalletd_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(kded_kwalletd_la_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+kded_kwalletd_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(kded_kwalletd_la_LDFLAGS) $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -103,19 +106,21 @@
 #>+ 2
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 #>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
 CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 3
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(kded_kwalletd_la_SOURCES)
 DIST_SOURCES = $(kded_kwalletd_la_SOURCES)
 servicesDATA_INSTALL = $(INSTALL_DATA)
@@ -129,8 +134,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -138,13 +141,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -158,8 +161,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -180,17 +181,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -259,7 +257,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -296,12 +293,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -346,87 +345,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -450,75 +405,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -526,16 +423,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -558,7 +454,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -596,13 +492,13 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
+	test -z "$(kde_moduledir)" || $(MKDIR_P) "$(DESTDIR)$(kde_moduledir)"
 	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
@@ -613,7 +509,7 @@
 
 uninstall-kde_moduleLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
@@ -628,7 +524,7 @@
 	  rm -f "$${dir}/so_locations"; \
 	done
 kded_kwalletd.la: $(kded_kwalletd_la_OBJECTS) $(kded_kwalletd_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(kde_moduledir) $(kded_kwalletd_la_LDFLAGS) $(kded_kwalletd_la_OBJECTS) $(kded_kwalletd_la_LIBADD) $(LIBS)
+	$(kded_kwalletd_la_LINK) -rpath $(kde_moduledir) $(kded_kwalletd_la_OBJECTS) $(kded_kwalletd_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -640,22 +536,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kwalletd.Plo@am__quote@
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -665,13 +561,9 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 install-servicesDATA: $(services_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(servicesdir)" || $(mkdir_p) "$(DESTDIR)$(servicesdir)"
+	test -z "$(servicesdir)" || $(MKDIR_P) "$(DESTDIR)$(servicesdir)"
 	@list='$(services_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -736,22 +628,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -767,7 +658,7 @@
 all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS)
 installdirs:
 	for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(servicesdir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -807,7 +698,7 @@
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
@@ -823,14 +714,22 @@
 #>+ 1
 install-data-am:   install-servicesDATA
 
+install-dvi: install-dvi-am
+
 #>- install-exec-am:
 #>+ 1
 install-exec-am:  install-kde_moduleLTLIBRARIES
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -851,22 +750,24 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-kde_moduleLTLIBRARIES \
-	uninstall-servicesDATA
+uninstall-am: uninstall-kde_moduleLTLIBRARIES uninstall-servicesDATA
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-kde_moduleLTLIBRARIES clean-libtool ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
 	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-exec \
-	install-exec-am install-info install-info-am \
-	install-kde_moduleLTLIBRARIES install-man install-servicesDATA \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am \
+	install-kde_moduleLTLIBRARIES install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-servicesDATA \
 	install-strip installcheck installcheck-am installdirs \
 	maintainer-clean maintainer-clean-generic mostlyclean \
 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
 	pdf pdf-am ps ps-am tags uninstall uninstall-am \
-	uninstall-info-am uninstall-kde_moduleLTLIBRARIES \
-	uninstall-servicesDATA
+	uninstall-kde_moduleLTLIBRARIES uninstall-servicesDATA
 
 
 kwalletwizard.lo: kwalletwizard.ui kwalletwizard.ui.h
--- kdelibs-3.5.7.orig/kio/misc/kssld/Makefile.in
+++ kdelibs-3.5.7/kio/misc/kssld/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -35,15 +35,11 @@
 
 
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -93,7 +89,14 @@
 kded_kssld_la_nofinal_OBJECTS = kssld.lo kssld_skel.lo
 @KDE_USE_FINAL_FALSE@kded_kssld_la_OBJECTS = $(kded_kssld_la_nofinal_OBJECTS)
 @KDE_USE_FINAL_TRUE@kded_kssld_la_OBJECTS = $(kded_kssld_la_final_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+#>- kded_kssld_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(kded_kssld_la_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+kded_kssld_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(kded_kssld_la_LDFLAGS) $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -101,19 +104,21 @@
 #>+ 2
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
-#>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+#>+ 3
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
 CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 3
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(kded_kssld_la_SOURCES)
 DIST_SOURCES = $(kded_kssld_la_SOURCES)
 servicesDATA_INSTALL = $(INSTALL_DATA)
@@ -127,8 +132,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -136,13 +139,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -156,8 +159,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -178,17 +179,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -257,7 +255,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -294,12 +291,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -344,87 +343,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -448,75 +403,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -524,16 +421,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -556,7 +452,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -594,13 +490,13 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
+	test -z "$(kde_moduledir)" || $(MKDIR_P) "$(DESTDIR)$(kde_moduledir)"
 	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
@@ -611,7 +507,7 @@
 
 uninstall-kde_moduleLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
@@ -626,7 +522,7 @@
 	  rm -f "$${dir}/so_locations"; \
 	done
 kded_kssld.la: $(kded_kssld_la_OBJECTS) $(kded_kssld_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(kde_moduledir) $(kded_kssld_la_LDFLAGS) $(kded_kssld_la_OBJECTS) $(kded_kssld_la_LIBADD) $(LIBS)
+	$(kded_kssld_la_LINK) -rpath $(kde_moduledir) $(kded_kssld_la_OBJECTS) $(kded_kssld_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -637,22 +533,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kssld.Plo@am__quote@
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -662,13 +558,9 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 install-servicesDATA: $(services_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(servicesdir)" || $(mkdir_p) "$(DESTDIR)$(servicesdir)"
+	test -z "$(servicesdir)" || $(MKDIR_P) "$(DESTDIR)$(servicesdir)"
 	@list='$(services_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -733,22 +625,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -764,7 +655,7 @@
 all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS)
 installdirs:
 	for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(servicesdir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -804,7 +695,7 @@
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
@@ -820,14 +711,22 @@
 #>+ 1
 install-data-am:   install-servicesDATA
 
+install-dvi: install-dvi-am
+
 #>- install-exec-am:
 #>+ 1
 install-exec-am:  install-kde_moduleLTLIBRARIES
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -848,22 +747,24 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-kde_moduleLTLIBRARIES \
-	uninstall-servicesDATA
+uninstall-am: uninstall-kde_moduleLTLIBRARIES uninstall-servicesDATA
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-kde_moduleLTLIBRARIES clean-libtool ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
 	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-exec \
-	install-exec-am install-info install-info-am \
-	install-kde_moduleLTLIBRARIES install-man install-servicesDATA \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am \
+	install-kde_moduleLTLIBRARIES install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-servicesDATA \
 	install-strip installcheck installcheck-am installdirs \
 	maintainer-clean maintainer-clean-generic mostlyclean \
 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
 	pdf pdf-am ps ps-am tags uninstall uninstall-am \
-	uninstall-info-am uninstall-kde_moduleLTLIBRARIES \
-	uninstall-servicesDATA
+	uninstall-kde_moduleLTLIBRARIES uninstall-servicesDATA
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- kdelibs-3.5.7.orig/kio/misc/ksendbugmail/Makefile.in
+++ kdelibs-3.5.7/kio/misc/ksendbugmail/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -33,15 +33,11 @@
 #    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 #    Boston, MA 02110-1301, USA.
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -82,7 +78,14 @@
 @KDE_USE_FINAL_FALSE@ksendbugmail_OBJECTS = $(ksendbugmail_nofinal_OBJECTS)
 @KDE_USE_FINAL_TRUE@ksendbugmail_OBJECTS = $(ksendbugmail_final_OBJECTS)
 ksendbugmail_DEPENDENCIES = ../../libkio.la
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+#>- ksendbugmail_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(ksendbugmail_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+ksendbugmail_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(ksendbugmail_LDFLAGS) $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -90,19 +93,21 @@
 #>+ 2
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
-#>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+#>+ 3
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
 CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 3
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(ksendbugmail_SOURCES)
 DIST_SOURCES = $(ksendbugmail_SOURCES)
 ETAGS = etags
@@ -113,8 +118,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -122,13 +125,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -142,8 +145,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -164,17 +165,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -243,7 +241,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -280,12 +277,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -330,87 +329,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -434,75 +389,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -510,16 +407,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -536,7 +432,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -574,13 +470,13 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
+	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
 	  if test -f $$p \
@@ -608,7 +504,7 @@
 	done
 ksendbugmail$(EXEEXT): $(ksendbugmail_OBJECTS) $(ksendbugmail_DEPENDENCIES) 
 	@rm -f ksendbugmail$(EXEEXT)
-	$(CXXLINK) $(ksendbugmail_LDFLAGS) $(ksendbugmail_OBJECTS) $(ksendbugmail_LDADD) $(LIBS)
+	$(ksendbugmail_LINK) $(ksendbugmail_OBJECTS) $(ksendbugmail_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -620,22 +516,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/smtp.Po@am__quote@
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -646,10 +542,6 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -699,22 +591,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -730,7 +621,7 @@
 all-am: Makefile $(PROGRAMS)
 installdirs:
 	for dir in "$(DESTDIR)$(bindir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -768,7 +659,7 @@
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
@@ -782,12 +673,20 @@
 
 install-data-am:
 
+install-dvi: install-dvi-am
+
 install-exec-am: install-binPROGRAMS
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -808,19 +707,23 @@
 
 ps-am:
 
-uninstall-am: uninstall-binPROGRAMS uninstall-info-am
+uninstall-am: uninstall-binPROGRAMS
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
 	clean-generic clean-libtool ctags distclean distclean-compile \
 	distclean-generic distclean-libtool distclean-tags distdir dvi \
 	dvi-am html html-am info info-am install install-am \
-	install-binPROGRAMS install-data install-data-am install-exec \
-	install-exec-am install-info install-info-am install-man \
+	install-binPROGRAMS install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
 	install-strip installcheck installcheck-am installdirs \
 	maintainer-clean maintainer-clean-generic mostlyclean \
 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
 	pdf pdf-am ps ps-am tags uninstall uninstall-am \
-	uninstall-binPROGRAMS uninstall-info-am
+	uninstall-binPROGRAMS
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- kdelibs-3.5.7.orig/kio/misc/kdesasl/Makefile.in
+++ kdelibs-3.5.7/kio/misc/kdesasl/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,15 +16,11 @@
 @SET_MAKE@
 
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -70,7 +66,14 @@
 #>- libkdesasl_la_OBJECTS = $(am_libkdesasl_la_OBJECTS)
 #>+ 1
 libkdesasl_la_OBJECTS = kdesasl.lo
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+#>- libkdesasl_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(libkdesasl_la_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+libkdesasl_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(libkdesasl_la_LDFLAGS) $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -78,19 +81,21 @@
 #>+ 2
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 #>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
 CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 3
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(libkdesasl_la_SOURCES)
 DIST_SOURCES = $(libkdesasl_la_SOURCES)
 kdesaslincludeHEADERS_INSTALL = $(INSTALL_HEADER)
@@ -103,8 +108,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -112,13 +115,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -132,8 +135,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -154,17 +155,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -233,7 +231,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -270,12 +267,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -320,87 +319,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -424,75 +379,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -500,16 +397,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -521,9 +417,7 @@
 kdesaslincludedir = $(includedir)/kio
 kdesaslinclude_HEADERS = kdesasl.h
 libkdesasl_la_SOURCES = kdesasl.cpp
-#>- libkdesasl_la_LDFLAGS = $(all_libraries) -version-info 3:0:2 -no-undefined
-#>+ 1
-libkdesasl_la_LDFLAGS = $(all_libraries) -version-info 3:0:2 -no-undefined $(KDE_NO_UNDEFINED)
+libkdesasl_la_LDFLAGS = $(all_libraries) -version-info 3:0:2 -no-undefined
 libkdesasl_la_LIBADD = $(LIB_KDECORE)
 #>- all: all-am
 #>+ 1
@@ -531,7 +425,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -569,13 +463,13 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
@@ -586,7 +480,7 @@
 
 uninstall-libLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
@@ -600,11 +494,8 @@
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
-#>- libkdesasl.la: $(libkdesasl_la_OBJECTS) $(libkdesasl_la_DEPENDENCIES) 
-#>+ 2
-@KDE_USE_CLOSURE_TRUE@libkdesasl.la: libkdesasl.la.closure $(libkdesasl_la_OBJECTS) $(libkdesasl_la_DEPENDENCIES) 
-@KDE_USE_CLOSURE_FALSE@libkdesasl.la: $(libkdesasl_la_OBJECTS) $(libkdesasl_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(libdir) $(libkdesasl_la_LDFLAGS) $(libkdesasl_la_OBJECTS) $(libkdesasl_la_LIBADD) $(LIBS)
+libkdesasl.la: $(libkdesasl_la_OBJECTS) $(libkdesasl_la_DEPENDENCIES) 
+	$(libkdesasl_la_LINK) -rpath $(libdir) $(libkdesasl_la_OBJECTS) $(libkdesasl_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -615,22 +506,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kdesasl.Plo@am__quote@
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -640,13 +531,9 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 install-kdesaslincludeHEADERS: $(kdesaslinclude_HEADERS)
 	@$(NORMAL_INSTALL)
-	test -z "$(kdesaslincludedir)" || $(mkdir_p) "$(DESTDIR)$(kdesaslincludedir)"
+	test -z "$(kdesaslincludedir)" || $(MKDIR_P) "$(DESTDIR)$(kdesaslincludedir)"
 	@list='$(kdesaslinclude_HEADERS)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -711,22 +598,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -742,7 +628,7 @@
 all-am: Makefile $(LTLIBRARIES) $(HEADERS)
 installdirs:
 	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(kdesaslincludedir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -775,14 +661,14 @@
 #>- clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
 #>- 	mostlyclean-am
 #>+ 2
-clean-am: clean-closures clean-bcheck  clean-generic clean-libLTLIBRARIES clean-libtool \
+clean-am: clean-bcheck  clean-generic clean-libLTLIBRARIES clean-libtool \
 	mostlyclean-am
 
 distclean: distclean-am
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
@@ -796,12 +682,20 @@
 
 install-data-am: install-kdesaslincludeHEADERS
 
+install-dvi: install-dvi-am
+
 install-exec-am: install-libLTLIBRARIES
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -822,43 +716,33 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-kdesaslincludeHEADERS \
-	uninstall-libLTLIBRARIES
+uninstall-am: uninstall-kdesaslincludeHEADERS uninstall-libLTLIBRARIES
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-libLTLIBRARIES clean-libtool ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
 	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-exec \
-	install-exec-am install-info install-info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am \
 	install-kdesaslincludeHEADERS install-libLTLIBRARIES \
-	install-man install-strip installcheck installcheck-am \
+	install-man install-pdf install-pdf-am install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
 	installdirs maintainer-clean maintainer-clean-generic \
 	mostlyclean mostlyclean-compile mostlyclean-generic \
 	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
-	uninstall-am uninstall-info-am uninstall-kdesaslincludeHEADERS \
+	uninstall-am uninstall-kdesaslincludeHEADERS \
 	uninstall-libLTLIBRARIES
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
-#>+ 8
-libkdesasl.la.closure: $(libkdesasl_la_OBJECTS) $(libkdesasl_la_DEPENDENCIES)
-	@echo "int main() {return 0;}" > libkdesasl_la_closure.cpp
-	@$(LTCXXCOMPILE) -c libkdesasl_la_closure.cpp
-	$(CXXLINK) libkdesasl_la_closure.lo $(libkdesasl_la_LDFLAGS) $(libkdesasl_la_OBJECTS) $(libkdesasl_la_LIBADD) $(LIBS)
-	@rm -f libkdesasl_la_closure.* libkdesasl.la.closure
-	@echo "timestamp" > libkdesasl.la.closure
-
-
 #>+ 2
 KDE_DIST=Makefile.in Makefile.am 
 
-#>+ 3
-clean-closures:
-	-rm -f  libkdesasl.la.closure
-
 #>+ 2
 docs-am:
 
--- kdelibs-3.5.7.orig/kio/misc/Makefile.in
+++ kdelibs-3.5.7/kio/misc/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -37,15 +37,11 @@
 
 
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -99,6 +95,13 @@
 #>- kio_uiserver_la_OBJECTS = $(am_kio_uiserver_la_OBJECTS)
 #>+ 1
 kio_uiserver_la_OBJECTS = kio_uiserver_dummy.lo
+#>- kio_uiserver_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(kio_uiserver_la_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+kio_uiserver_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(kio_uiserver_la_LDFLAGS) $(LDFLAGS) -o $@
 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 #>- PROGRAMS = $(bin_PROGRAMS)
 #>+ 2
@@ -109,14 +112,28 @@
 #>+ 1
 kmailservice_OBJECTS = kmailservice.$(OBJEXT)
 kmailservice_DEPENDENCIES = $(am__DEPENDENCIES_1)
+#>- kmailservice_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(kmailservice_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+kmailservice_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(kmailservice_LDFLAGS) $(LDFLAGS) -o $@
 am_ktelnetservice_OBJECTS = ktelnetservice.$(OBJEXT)
 #>- ktelnetservice_OBJECTS = $(am_ktelnetservice_OBJECTS)
 #>+ 1
 ktelnetservice_OBJECTS = ktelnetservice.$(OBJEXT)
 ktelnetservice_DEPENDENCIES = $(am__DEPENDENCIES_1)
+#>- ktelnetservice_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(ktelnetservice_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+ktelnetservice_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(ktelnetservice_LDFLAGS) $(LDFLAGS) -o $@
 binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
 SCRIPTS = $(bin_SCRIPTS)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -124,19 +141,21 @@
 #>+ 2
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 #>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
 CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 3
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 #>- SOURCES = $(kio_uiserver_la_SOURCES) $(kmailservice_SOURCES) \
 #>- 	$(ktelnetservice_SOURCES)
 #>+ 2
@@ -149,22 +168,26 @@
 	$(ktelnetservice_SOURCES) $(kio_uiserver_SOURCES) 
 #>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 #>- 	html-recursive info-recursive install-data-recursive \
-#>- 	install-exec-recursive install-info-recursive \
-#>- 	install-recursive installcheck-recursive installdirs-recursive \
-#>- 	pdf-recursive ps-recursive uninstall-info-recursive \
-#>- 	uninstall-recursive
-#>+ 6
+#>- 	install-dvi-recursive install-exec-recursive \
+#>- 	install-html-recursive install-info-recursive \
+#>- 	install-pdf-recursive install-ps-recursive install-recursive \
+#>- 	installcheck-recursive installdirs-recursive pdf-recursive \
+#>- 	ps-recursive uninstall-recursive
+#>+ 7
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	html-recursive info-recursive install-data-recursive \
-	install-exec-recursive install-info-recursive \
-	install-recursive installcheck-recursive installdirs-recursive \
-	pdf-recursive ps-recursive uninstall-info-recursive \
-	uninstall-recursive nmcheck-recursive bcheck-recursive
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive nmcheck-recursive bcheck-recursive
 kde_servicesDATA_INSTALL = $(INSTALL_DATA)
 protocolDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(kde_services_DATA) $(protocol_DATA)
 kiomiscHEADERS_INSTALL = $(INSTALL_HEADER)
 HEADERS = $(kiomisc_HEADERS)
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
@@ -174,8 +197,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -183,13 +204,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -203,8 +224,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -225,17 +244,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -304,7 +320,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -341,12 +356,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -391,87 +408,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -495,75 +468,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -571,16 +486,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -623,7 +537,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -661,13 +575,13 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(kdeinitdir)" || $(mkdir_p) "$(DESTDIR)$(kdeinitdir)"
+	test -z "$(kdeinitdir)" || $(MKDIR_P) "$(DESTDIR)$(kdeinitdir)"
 	@list='$(kdeinit_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
@@ -678,7 +592,7 @@
 
 uninstall-kdeinitLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@set -x; list='$(kdeinit_LTLIBRARIES)'; for p in $$list; do \
+	@list='$(kdeinit_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kdeinitdir)/$$p'"; \
 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kdeinitdir)/$$p"; \
@@ -694,7 +608,7 @@
 	done
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
@@ -705,7 +619,7 @@
 
 uninstall-libLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
@@ -720,10 +634,10 @@
 	  rm -f "$${dir}/so_locations"; \
 	done
 kio_uiserver.la: $(kio_uiserver_la_OBJECTS) $(kio_uiserver_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(kdeinitdir) $(kio_uiserver_la_LDFLAGS) $(kio_uiserver_la_OBJECTS) $(kio_uiserver_la_LIBADD) $(LIBS)
+	$(kio_uiserver_la_LINK) -rpath $(kdeinitdir) $(kio_uiserver_la_OBJECTS) $(kio_uiserver_la_LIBADD) $(LIBS)
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
+	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
 	  if test -f $$p \
@@ -751,13 +665,13 @@
 	done
 kmailservice$(EXEEXT): $(kmailservice_OBJECTS) $(kmailservice_DEPENDENCIES) 
 	@rm -f kmailservice$(EXEEXT)
-	$(CXXLINK) $(kmailservice_LDFLAGS) $(kmailservice_OBJECTS) $(kmailservice_LDADD) $(LIBS)
+	$(kmailservice_LINK) $(kmailservice_OBJECTS) $(kmailservice_LDADD) $(LIBS)
 ktelnetservice$(EXEEXT): $(ktelnetservice_OBJECTS) $(ktelnetservice_DEPENDENCIES) 
 	@rm -f ktelnetservice$(EXEEXT)
-	$(CXXLINK) $(ktelnetservice_LDFLAGS) $(ktelnetservice_OBJECTS) $(ktelnetservice_LDADD) $(LIBS)
+	$(ktelnetservice_LINK) $(ktelnetservice_OBJECTS) $(ktelnetservice_LDADD) $(LIBS)
 install-binSCRIPTS: $(bin_SCRIPTS)
 	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
+	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
 	@list='$(bin_SCRIPTS)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  if test -f $$d$$p; then \
@@ -786,22 +700,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/uiserver.Plo@am__quote@
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -811,13 +725,9 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 install-kde_servicesDATA: $(kde_services_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(kde_servicesdir)" || $(mkdir_p) "$(DESTDIR)$(kde_servicesdir)"
+	test -z "$(kde_servicesdir)" || $(MKDIR_P) "$(DESTDIR)$(kde_servicesdir)"
 	@list='$(kde_services_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -834,7 +744,7 @@
 	done
 install-protocolDATA: $(protocol_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(protocoldir)" || $(mkdir_p) "$(DESTDIR)$(protocoldir)"
+	test -z "$(protocoldir)" || $(MKDIR_P) "$(DESTDIR)$(protocoldir)"
 	@list='$(protocol_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -851,7 +761,7 @@
 	done
 install-kiomiscHEADERS: $(kiomisc_HEADERS)
 	@$(NORMAL_INSTALL)
-	test -z "$(kiomiscdir)" || $(mkdir_p) "$(DESTDIR)$(kiomiscdir)"
+	test -z "$(kiomiscdir)" || $(MKDIR_P) "$(DESTDIR)$(kiomiscdir)"
 	@list='$(kiomisc_HEADERS)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -898,8 +808,7 @@
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
+$(RECURSIVE_CLEAN_TARGETS):
 	@failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
@@ -1000,22 +909,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -1029,7 +937,7 @@
 	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
-	    || $(mkdir_p) "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 	    || exit 1; \
 	    distdir=`$(am__cd) $(distdir) && pwd`; \
 	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
@@ -1037,6 +945,8 @@
 	      $(MAKE) $(AM_MAKEFLAGS) \
 	        top_distdir="$$top_distdir" \
 	        distdir="$$distdir/$$subdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -1050,7 +960,7 @@
 installdirs: installdirs-recursive
 installdirs-am:
 	for dir in "$(DESTDIR)$(kdeinitdir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(kde_servicesdir)" "$(DESTDIR)$(protocoldir)" "$(DESTDIR)$(kiomiscdir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-recursive
 install-exec: install-exec-recursive
@@ -1090,7 +1000,7 @@
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-recursive
 
@@ -1105,13 +1015,21 @@
 install-data-am: install-kde_servicesDATA install-kdeinitLTLIBRARIES \
 	install-kiomiscHEADERS install-protocolDATA
 
+install-dvi: install-dvi-recursive
+
 install-exec-am: install-binPROGRAMS install-binSCRIPTS \
 	install-exec-local install-libLTLIBRARIES
 
+install-html: install-html-recursive
+
 install-info: install-info-recursive
 
 install-man:
 
+install-pdf: install-pdf-recursive
+
+install-ps: install-ps-recursive
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
@@ -1133,30 +1051,32 @@
 ps-am:
 
 uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \
-	uninstall-info-am uninstall-kde_servicesDATA \
-	uninstall-kdeinitLTLIBRARIES uninstall-kiomiscHEADERS \
-	uninstall-libLTLIBRARIES uninstall-protocolDATA
-
-uninstall-info: uninstall-info-recursive
-
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-	clean clean-binPROGRAMS clean-generic clean-kdeinitLTLIBRARIES \
-	clean-libLTLIBRARIES clean-libtool clean-recursive ctags \
-	ctags-recursive distclean distclean-compile distclean-generic \
-	distclean-libtool distclean-recursive distclean-tags distdir \
-	dvi dvi-am html html-am info info-am install install-am \
-	install-binPROGRAMS install-binSCRIPTS install-data \
-	install-data-am install-exec install-exec-am \
-	install-exec-local install-info install-info-am \
+	uninstall-kde_servicesDATA uninstall-kdeinitLTLIBRARIES \
+	uninstall-kiomiscHEADERS uninstall-libLTLIBRARIES \
+	uninstall-protocolDATA
+
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+	install-strip
+
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+	all all-am check check-am clean clean-binPROGRAMS \
+	clean-generic clean-kdeinitLTLIBRARIES clean-libLTLIBRARIES \
+	clean-libtool ctags ctags-recursive distclean \
+	distclean-compile distclean-generic distclean-libtool \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-binPROGRAMS install-binSCRIPTS \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-exec-local install-html \
+	install-html-am install-info install-info-am \
 	install-kde_servicesDATA install-kdeinitLTLIBRARIES \
 	install-kiomiscHEADERS install-libLTLIBRARIES install-man \
-	install-protocolDATA install-strip installcheck \
-	installcheck-am installdirs installdirs-am maintainer-clean \
-	maintainer-clean-generic maintainer-clean-recursive \
-	mostlyclean mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
+	install-pdf install-pdf-am install-protocolDATA install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs installdirs-am maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 	tags tags-recursive uninstall uninstall-am \
-	uninstall-binPROGRAMS uninstall-binSCRIPTS uninstall-info-am \
+	uninstall-binPROGRAMS uninstall-binSCRIPTS \
 	uninstall-kde_servicesDATA uninstall-kdeinitLTLIBRARIES \
 	uninstall-kiomiscHEADERS uninstall-libLTLIBRARIES \
 	uninstall-protocolDATA
--- kdelibs-3.5.7.orig/kio/misc/kpac/Makefile.in
+++ kdelibs-3.5.7/kio/misc/kpac/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -18,15 +18,11 @@
 
 
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -79,6 +75,13 @@
 	discovery.lo proxyscout_skel.lo
 @KDE_USE_FINAL_FALSE@kded_proxyscout_la_OBJECTS = $(kded_proxyscout_la_nofinal_OBJECTS)
 @KDE_USE_FINAL_TRUE@kded_proxyscout_la_OBJECTS = $(kded_proxyscout_la_final_OBJECTS)
+#>- kded_proxyscout_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(kded_proxyscout_la_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+kded_proxyscout_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(kded_proxyscout_la_LDFLAGS) $(LDFLAGS) -o $@
 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(bin_PROGRAMS)
 am_kpac_dhcp_helper_OBJECTS =  \
@@ -87,35 +90,41 @@
 #>+ 1
 kpac_dhcp_helper_OBJECTS = kpac_dhcp_helper-kpac_dhcp_helper.$(OBJEXT)
 kpac_dhcp_helper_DEPENDENCIES = $(am__DEPENDENCIES_1)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+kpac_dhcp_helper_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(kpac_dhcp_helper_CFLAGS) \
+	$(CFLAGS) $(kpac_dhcp_helper_LDFLAGS) $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 #>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 #>+ 2
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 #>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
 CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 3
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(kded_proxyscout_la_SOURCES) $(kpac_dhcp_helper_SOURCES)
 DIST_SOURCES = $(kded_proxyscout_la_SOURCES) \
 	$(kpac_dhcp_helper_SOURCES)
@@ -131,8 +140,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -140,13 +147,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -160,8 +167,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -182,17 +187,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -261,7 +263,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -298,12 +299,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -348,87 +351,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -452,75 +411,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -528,16 +429,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -572,7 +472,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .c .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -610,13 +510,13 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
+	test -z "$(kde_moduledir)" || $(MKDIR_P) "$(DESTDIR)$(kde_moduledir)"
 	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
@@ -627,7 +527,7 @@
 
 uninstall-kde_moduleLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
@@ -642,10 +542,10 @@
 	  rm -f "$${dir}/so_locations"; \
 	done
 kded_proxyscout.la: $(kded_proxyscout_la_OBJECTS) $(kded_proxyscout_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(kde_moduledir) $(kded_proxyscout_la_LDFLAGS) $(kded_proxyscout_la_OBJECTS) $(kded_proxyscout_la_LIBADD) $(LIBS)
+	$(kded_proxyscout_la_LINK) -rpath $(kde_moduledir) $(kded_proxyscout_la_OBJECTS) $(kded_proxyscout_la_LIBADD) $(LIBS)
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
+	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
 	  if test -f $$p \
@@ -673,7 +573,7 @@
 	done
 kpac_dhcp_helper$(EXEEXT): $(kpac_dhcp_helper_OBJECTS) $(kpac_dhcp_helper_DEPENDENCIES) 
 	@rm -f kpac_dhcp_helper$(EXEEXT)
-	$(LINK) $(kpac_dhcp_helper_LDFLAGS) $(kpac_dhcp_helper_OBJECTS) $(kpac_dhcp_helper_LDADD) $(LIBS)
+	$(kpac_dhcp_helper_LINK) $(kpac_dhcp_helper_OBJECTS) $(kpac_dhcp_helper_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -688,57 +588,57 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/script.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
 kpac_dhcp_helper-kpac_dhcp_helper.o: kpac_dhcp_helper.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kpac_dhcp_helper_CFLAGS) $(CFLAGS) -MT kpac_dhcp_helper-kpac_dhcp_helper.o -MD -MP -MF "$(DEPDIR)/kpac_dhcp_helper-kpac_dhcp_helper.Tpo" -c -o kpac_dhcp_helper-kpac_dhcp_helper.o `test -f 'kpac_dhcp_helper.c' || echo '$(srcdir)/'`kpac_dhcp_helper.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/kpac_dhcp_helper-kpac_dhcp_helper.Tpo" "$(DEPDIR)/kpac_dhcp_helper-kpac_dhcp_helper.Po"; else rm -f "$(DEPDIR)/kpac_dhcp_helper-kpac_dhcp_helper.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kpac_dhcp_helper_CFLAGS) $(CFLAGS) -MT kpac_dhcp_helper-kpac_dhcp_helper.o -MD -MP -MF $(DEPDIR)/kpac_dhcp_helper-kpac_dhcp_helper.Tpo -c -o kpac_dhcp_helper-kpac_dhcp_helper.o `test -f 'kpac_dhcp_helper.c' || echo '$(srcdir)/'`kpac_dhcp_helper.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/kpac_dhcp_helper-kpac_dhcp_helper.Tpo $(DEPDIR)/kpac_dhcp_helper-kpac_dhcp_helper.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='kpac_dhcp_helper.c' object='kpac_dhcp_helper-kpac_dhcp_helper.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kpac_dhcp_helper_CFLAGS) $(CFLAGS) -c -o kpac_dhcp_helper-kpac_dhcp_helper.o `test -f 'kpac_dhcp_helper.c' || echo '$(srcdir)/'`kpac_dhcp_helper.c
 
 kpac_dhcp_helper-kpac_dhcp_helper.obj: kpac_dhcp_helper.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kpac_dhcp_helper_CFLAGS) $(CFLAGS) -MT kpac_dhcp_helper-kpac_dhcp_helper.obj -MD -MP -MF "$(DEPDIR)/kpac_dhcp_helper-kpac_dhcp_helper.Tpo" -c -o kpac_dhcp_helper-kpac_dhcp_helper.obj `if test -f 'kpac_dhcp_helper.c'; then $(CYGPATH_W) 'kpac_dhcp_helper.c'; else $(CYGPATH_W) '$(srcdir)/kpac_dhcp_helper.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/kpac_dhcp_helper-kpac_dhcp_helper.Tpo" "$(DEPDIR)/kpac_dhcp_helper-kpac_dhcp_helper.Po"; else rm -f "$(DEPDIR)/kpac_dhcp_helper-kpac_dhcp_helper.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kpac_dhcp_helper_CFLAGS) $(CFLAGS) -MT kpac_dhcp_helper-kpac_dhcp_helper.obj -MD -MP -MF $(DEPDIR)/kpac_dhcp_helper-kpac_dhcp_helper.Tpo -c -o kpac_dhcp_helper-kpac_dhcp_helper.obj `if test -f 'kpac_dhcp_helper.c'; then $(CYGPATH_W) 'kpac_dhcp_helper.c'; else $(CYGPATH_W) '$(srcdir)/kpac_dhcp_helper.c'; fi`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/kpac_dhcp_helper-kpac_dhcp_helper.Tpo $(DEPDIR)/kpac_dhcp_helper-kpac_dhcp_helper.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='kpac_dhcp_helper.c' object='kpac_dhcp_helper-kpac_dhcp_helper.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kpac_dhcp_helper_CFLAGS) $(CFLAGS) -c -o kpac_dhcp_helper-kpac_dhcp_helper.obj `if test -f 'kpac_dhcp_helper.c'; then $(CYGPATH_W) 'kpac_dhcp_helper.c'; else $(CYGPATH_W) '$(srcdir)/kpac_dhcp_helper.c'; fi`
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -748,13 +648,9 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 install-proxyscoutdataDATA: $(proxyscoutdata_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(proxyscoutdatadir)" || $(mkdir_p) "$(DESTDIR)$(proxyscoutdatadir)"
+	test -z "$(proxyscoutdatadir)" || $(MKDIR_P) "$(DESTDIR)$(proxyscoutdatadir)"
 	@list='$(proxyscoutdata_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -771,7 +667,7 @@
 	done
 install-servicesDATA: $(services_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(servicesdir)" || $(mkdir_p) "$(DESTDIR)$(servicesdir)"
+	test -z "$(servicesdir)" || $(MKDIR_P) "$(DESTDIR)$(servicesdir)"
 	@list='$(services_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -836,22 +732,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -867,7 +762,7 @@
 all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA) $(HEADERS)
 installdirs:
 	for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(proxyscoutdatadir)" "$(DESTDIR)$(servicesdir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -907,7 +802,7 @@
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
@@ -925,14 +820,22 @@
 install-data-am:   \
 	install-proxyscoutdataDATA install-servicesDATA
 
+install-dvi: install-dvi-am
+
 #>- install-exec-am: install-binPROGRAMS install-exec-local
 #>+ 1
 install-exec-am:  install-binPROGRAMS install-exec-local install-kde_moduleLTLIBRARIES
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -953,25 +856,28 @@
 
 ps-am:
 
-uninstall-am: uninstall-binPROGRAMS uninstall-info-am \
-	uninstall-kde_moduleLTLIBRARIES uninstall-proxyscoutdataDATA \
-	uninstall-servicesDATA
+uninstall-am: uninstall-binPROGRAMS uninstall-kde_moduleLTLIBRARIES \
+	uninstall-proxyscoutdataDATA uninstall-servicesDATA
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
 	clean-generic clean-kde_moduleLTLIBRARIES clean-libtool ctags \
 	distclean distclean-compile distclean-generic \
 	distclean-libtool distclean-tags distdir dvi dvi-am html \
 	html-am info info-am install install-am install-binPROGRAMS \
-	install-data install-data-am install-exec install-exec-am \
-	install-exec-local install-info install-info-am \
-	install-kde_moduleLTLIBRARIES install-man \
-	install-proxyscoutdataDATA install-servicesDATA install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-exec-local install-html \
+	install-html-am install-info install-info-am \
+	install-kde_moduleLTLIBRARIES install-man install-pdf \
+	install-pdf-am install-proxyscoutdataDATA install-ps \
+	install-ps-am install-servicesDATA install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 	tags uninstall uninstall-am uninstall-binPROGRAMS \
-	uninstall-info-am uninstall-kde_moduleLTLIBRARIES \
-	uninstall-proxyscoutdataDATA uninstall-servicesDATA
+	uninstall-kde_moduleLTLIBRARIES uninstall-proxyscoutdataDATA \
+	uninstall-servicesDATA
 
 
 install-exec-local:
--- kdelibs-3.5.7.orig/kio/misc/kfile/Makefile.in
+++ kdelibs-3.5.7/kio/misc/kfile/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,15 +16,11 @@
 @SET_MAKE@
 
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -64,7 +60,14 @@
 kfile_OBJECTS = fileprops.$(OBJEXT)
 am__DEPENDENCIES_1 =
 kfile_DEPENDENCIES = $(am__DEPENDENCIES_1)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+#>- kfile_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
+#>- 	$(kfile_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+kfile_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
+	$(kfile_LDFLAGS) $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -72,19 +75,21 @@
 #>+ 2
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 #>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
 CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 3
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(kfile_SOURCES)
 DIST_SOURCES = $(kfile_SOURCES)
 HEADERS = $(noinst_HEADERS)
@@ -96,8 +101,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -105,13 +108,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -125,8 +128,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -147,17 +148,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -226,7 +224,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -263,12 +260,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -313,87 +312,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -417,75 +372,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -493,16 +390,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -520,7 +416,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -558,13 +454,13 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
+	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
 	  if test -f $$p \
@@ -592,7 +488,7 @@
 	done
 kfile$(EXEEXT): $(kfile_OBJECTS) $(kfile_DEPENDENCIES) 
 	@rm -f kfile$(EXEEXT)
-	$(CXXLINK) $(kfile_LDFLAGS) $(kfile_OBJECTS) $(kfile_LDADD) $(LIBS)
+	$(kfile_LINK) $(kfile_OBJECTS) $(kfile_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -603,22 +499,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fileprops.Po@am__quote@
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -629,10 +525,6 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -682,22 +574,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -713,7 +604,7 @@
 all-am: Makefile $(PROGRAMS) $(HEADERS)
 installdirs:
 	for dir in "$(DESTDIR)$(bindir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -751,7 +642,7 @@
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
@@ -765,12 +656,20 @@
 
 install-data-am:
 
+install-dvi: install-dvi-am
+
 install-exec-am: install-binPROGRAMS
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -791,19 +690,23 @@
 
 ps-am:
 
-uninstall-am: uninstall-binPROGRAMS uninstall-info-am
+uninstall-am: uninstall-binPROGRAMS
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
 	clean-generic clean-libtool ctags distclean distclean-compile \
 	distclean-generic distclean-libtool distclean-tags distdir dvi \
 	dvi-am html html-am info info-am install install-am \
-	install-binPROGRAMS install-data install-data-am install-exec \
-	install-exec-am install-info install-info-am install-man \
+	install-binPROGRAMS install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
 	install-strip installcheck installcheck-am installdirs \
 	maintainer-clean maintainer-clean-generic mostlyclean \
 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
 	pdf pdf-am ps ps-am tags uninstall uninstall-am \
-	uninstall-binPROGRAMS uninstall-info-am
+	uninstall-binPROGRAMS
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- kdelibs-3.5.7.orig/kio/bookmarks/Makefile.in
+++ kdelibs-3.5.7/kio/bookmarks/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -34,15 +34,11 @@
 #    Boston, MA 02110-1301, USA.
 
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -91,7 +87,7 @@
 	kbookmarkimporter_kde1.lo kbookmarkdombuilder.lo kbookmarkmanager_skel.lo kbookmarknotifier_skel.lo
 @KDE_USE_FINAL_FALSE@libkbookmarks_la_OBJECTS = $(libkbookmarks_la_nofinal_OBJECTS)
 @KDE_USE_FINAL_TRUE@libkbookmarks_la_OBJECTS = $(libkbookmarks_la_final_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -99,19 +95,21 @@
 #>+ 2
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 #>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
 CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 3
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(libkbookmarks_la_SOURCES)
 DIST_SOURCES = $(libkbookmarks_la_SOURCES)
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -131,8 +129,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -140,13 +136,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -160,8 +156,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -182,17 +176,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -261,7 +252,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -298,12 +288,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -348,87 +340,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -452,75 +400,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -528,16 +418,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -574,7 +463,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cc .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -612,9 +501,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 clean-noinstLTLIBRARIES:
@@ -626,7 +515,7 @@
 	  rm -f "$${dir}/so_locations"; \
 	done
 libkbookmarks.la: $(libkbookmarks_la_OBJECTS) $(libkbookmarks_la_DEPENDENCIES) 
-	$(CXXLINK)  $(libkbookmarks_la_LDFLAGS) $(libkbookmarks_la_OBJECTS) $(libkbookmarks_la_LIBADD) $(LIBS)
+	$(CXXLINK)  $(libkbookmarks_la_OBJECTS) $(libkbookmarks_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -649,22 +538,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kbookmarkmenu.Plo@am__quote@
 
 .cc.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cc.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cc.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -674,13 +563,9 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 install-includeHEADERS: $(include_HEADERS)
 	@$(NORMAL_INSTALL)
-	test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"
+	test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)"
 	@list='$(include_HEADERS)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -745,23 +630,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	$(mkdir_p) $(distdir)/../../admin
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -777,7 +660,7 @@
 all-am: Makefile $(LTLIBRARIES) $(HEADERS)
 installdirs:
 	for dir in "$(DESTDIR)$(includedir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -817,7 +700,7 @@
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
@@ -831,12 +714,20 @@
 
 install-data-am: install-data-local install-includeHEADERS
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -857,22 +748,24 @@
 
 ps-am:
 
-uninstall-am: uninstall-includeHEADERS uninstall-info-am \
-	uninstall-local
+uninstall-am: uninstall-includeHEADERS uninstall-local
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-libtool clean-noinstLTLIBRARIES ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
 	distclean-tags distdir dvi dvi-am html html-am info info-am \
 	install install-am install-data install-data-am \
-	install-data-local install-exec install-exec-am \
+	install-data-local install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am \
 	install-includeHEADERS install-info install-info-am \
-	install-man install-strip installcheck installcheck-am \
+	install-man install-pdf install-pdf-am install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
 	installdirs maintainer-clean maintainer-clean-generic \
 	mostlyclean mostlyclean-compile mostlyclean-generic \
 	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
-	uninstall-am uninstall-includeHEADERS uninstall-info-am \
-	uninstall-local
+	uninstall-am uninstall-includeHEADERS uninstall-local
 
 apidox-am-yes:
 	@if test \! -d "$(top_srcdir)/doc/common/" && test -z "$$DOXDATA" ; then \
--- kdelibs-3.5.7.orig/kio/httpfilter/Makefile.in
+++ kdelibs-3.5.7/kio/httpfilter/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -15,15 +15,11 @@
 
 @SET_MAKE@
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -60,7 +56,14 @@
 #>- libhttpfilter_la_OBJECTS = $(am_libhttpfilter_la_OBJECTS)
 #>+ 1
 libhttpfilter_la_OBJECTS = httpfilter.lo
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+#>- libhttpfilter_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(libhttpfilter_la_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+libhttpfilter_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(libhttpfilter_la_LDFLAGS) $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -68,19 +71,21 @@
 #>+ 2
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 #>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
 CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 3
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(libhttpfilter_la_SOURCES)
 DIST_SOURCES = $(libhttpfilter_la_SOURCES)
 ETAGS = etags
@@ -91,8 +96,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -100,13 +103,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -120,8 +123,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -142,17 +143,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -221,7 +219,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -258,12 +255,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -308,87 +307,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -412,75 +367,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -488,16 +385,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -515,7 +411,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cc .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -553,9 +449,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 clean-noinstLTLIBRARIES:
@@ -567,7 +463,7 @@
 	  rm -f "$${dir}/so_locations"; \
 	done
 libhttpfilter.la: $(libhttpfilter_la_OBJECTS) $(libhttpfilter_la_DEPENDENCIES) 
-	$(CXXLINK)  $(libhttpfilter_la_LDFLAGS) $(libhttpfilter_la_OBJECTS) $(libhttpfilter_la_LIBADD) $(LIBS)
+	$(libhttpfilter_la_LINK)  $(libhttpfilter_la_OBJECTS) $(libhttpfilter_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -578,22 +474,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/httpfilter.Plo@am__quote@
 
 .cc.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cc.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cc.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -604,10 +500,6 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -657,23 +549,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	$(mkdir_p) $(distdir)/../../admin
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -726,7 +616,7 @@
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
@@ -740,12 +630,20 @@
 
 install-data-am: install-data-local
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -766,19 +664,23 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-local
+uninstall-am: uninstall-local
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-libtool clean-noinstLTLIBRARIES ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
 	distclean-tags distdir dvi dvi-am html html-am info info-am \
 	install install-am install-data install-data-am \
-	install-data-local install-exec install-exec-am install-info \
-	install-info-am install-man install-strip installcheck \
+	install-data-local install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
 	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-info-am uninstall-local
+	tags uninstall uninstall-am uninstall-local
 
 apidox-am-yes:
 	@if test \! -d "$(top_srcdir)/doc/common/" && test -z "$$DOXDATA" ; then \
--- kdelibs-3.5.7.orig/kio/Makefile.in
+++ kdelibs-3.5.7/kio/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -35,15 +35,11 @@
 
 
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -96,9 +92,16 @@
 #>- libkio_la_OBJECTS = $(am_libkio_la_OBJECTS)
 #>+ 1
 libkio_la_OBJECTS = dummy.lo
+#>- libkio_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(libkio_la_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+libkio_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(libkio_la_LDFLAGS) $(LDFLAGS) -o $@
 updateSCRIPT_INSTALL = $(INSTALL_SCRIPT)
 SCRIPTS = $(update_SCRIPTS)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -106,34 +109,38 @@
 #>+ 2
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 #>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
 CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 3
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(libkio_la_SOURCES)
 DIST_SOURCES = $(libkio_la_SOURCES)
 #>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 #>- 	html-recursive info-recursive install-data-recursive \
-#>- 	install-exec-recursive install-info-recursive \
-#>- 	install-recursive installcheck-recursive installdirs-recursive \
-#>- 	pdf-recursive ps-recursive uninstall-info-recursive \
-#>- 	uninstall-recursive
-#>+ 6
+#>- 	install-dvi-recursive install-exec-recursive \
+#>- 	install-html-recursive install-info-recursive \
+#>- 	install-pdf-recursive install-ps-recursive install-recursive \
+#>- 	installcheck-recursive installdirs-recursive pdf-recursive \
+#>- 	ps-recursive uninstall-recursive
+#>+ 7
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	html-recursive info-recursive install-data-recursive \
-	install-exec-recursive install-info-recursive \
-	install-recursive installcheck-recursive installdirs-recursive \
-	pdf-recursive ps-recursive uninstall-info-recursive \
-	uninstall-recursive nmcheck-recursive bcheck-recursive
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive nmcheck-recursive bcheck-recursive
 dataprotocolDATA_INSTALL = $(INSTALL_DATA)
 kde_mimeDATA_INSTALL = $(INSTALL_DATA)
 kde_servicetypesDATA_INSTALL = $(INSTALL_DATA)
@@ -142,6 +149,8 @@
 updateDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dataprotocol_DATA) $(kde_mime_DATA) $(kde_servicetypes_DATA) \
 	$(kded_DATA) $(servicetype_DATA) $(update_DATA)
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
@@ -151,8 +160,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -160,13 +167,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -180,8 +187,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -202,17 +207,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -281,7 +283,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -318,12 +319,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -368,87 +371,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -472,75 +431,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -548,16 +449,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -568,10 +468,7 @@
 SUBDIRS = kssl kio bookmarks kfile . kpasswdserver misc pics tests kioexec httpfilter
 lib_LTLIBRARIES = libkio.la
 libkio_la_SOURCES = dummy.cpp
-#>- libkio_la_LDFLAGS = -version-info 6:0:2 -no-undefined $(all_libraries) \
-#>- 	$(KDE_MT_LDFLAGS)
-#>+ 2
-libkio_la_LDFLAGS = -version-info 6:0:2 -no-undefined $(KDE_NO_UNDEFINED) $(all_libraries) \
+libkio_la_LDFLAGS = -version-info 6:0:2 -no-undefined $(all_libraries) \
 	$(KDE_MT_LDFLAGS)
 
 libkio_la_LIBADD = kssl/libkssl.la kio/libkiocore.la \
@@ -603,7 +500,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(srcdir)/../admin/Doxyfile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../admin/Doxyfile.am $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -641,13 +538,13 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
@@ -658,7 +555,7 @@
 
 uninstall-libLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
@@ -672,14 +569,11 @@
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
-#>- libkio.la: $(libkio_la_OBJECTS) $(libkio_la_DEPENDENCIES) 
-#>+ 2
-@KDE_USE_CLOSURE_TRUE@libkio.la: libkio.la.closure $(libkio_la_OBJECTS) $(libkio_la_DEPENDENCIES) 
-@KDE_USE_CLOSURE_FALSE@libkio.la: $(libkio_la_OBJECTS) $(libkio_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(libdir) $(libkio_la_LDFLAGS) $(libkio_la_OBJECTS) $(libkio_la_LIBADD) $(LIBS)
+libkio.la: $(libkio_la_OBJECTS) $(libkio_la_DEPENDENCIES) 
+	$(libkio_la_LINK) -rpath $(libdir) $(libkio_la_OBJECTS) $(libkio_la_LIBADD) $(LIBS)
 install-updateSCRIPTS: $(update_SCRIPTS)
 	@$(NORMAL_INSTALL)
-	test -z "$(updatedir)" || $(mkdir_p) "$(DESTDIR)$(updatedir)"
+	test -z "$(updatedir)" || $(MKDIR_P) "$(DESTDIR)$(updatedir)"
 	@list='$(update_SCRIPTS)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  if test -f $$d$$p; then \
@@ -706,22 +600,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dummy.Plo@am__quote@
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -731,13 +625,9 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 install-dataprotocolDATA: $(dataprotocol_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(dataprotocoldir)" || $(mkdir_p) "$(DESTDIR)$(dataprotocoldir)"
+	test -z "$(dataprotocoldir)" || $(MKDIR_P) "$(DESTDIR)$(dataprotocoldir)"
 	@list='$(dataprotocol_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -754,7 +644,7 @@
 	done
 install-kde_mimeDATA: $(kde_mime_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(kde_mimedir)" || $(mkdir_p) "$(DESTDIR)$(kde_mimedir)"
+	test -z "$(kde_mimedir)" || $(MKDIR_P) "$(DESTDIR)$(kde_mimedir)"
 	@list='$(kde_mime_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -771,7 +661,7 @@
 	done
 install-kde_servicetypesDATA: $(kde_servicetypes_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(kde_servicetypesdir)" || $(mkdir_p) "$(DESTDIR)$(kde_servicetypesdir)"
+	test -z "$(kde_servicetypesdir)" || $(MKDIR_P) "$(DESTDIR)$(kde_servicetypesdir)"
 	@list='$(kde_servicetypes_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -788,7 +678,7 @@
 	done
 install-kdedDATA: $(kded_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(kdeddir)" || $(mkdir_p) "$(DESTDIR)$(kdeddir)"
+	test -z "$(kdeddir)" || $(MKDIR_P) "$(DESTDIR)$(kdeddir)"
 	@list='$(kded_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -805,7 +695,7 @@
 	done
 install-servicetypeDATA: $(servicetype_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(servicetypedir)" || $(mkdir_p) "$(DESTDIR)$(servicetypedir)"
+	test -z "$(servicetypedir)" || $(MKDIR_P) "$(DESTDIR)$(servicetypedir)"
 	@list='$(servicetype_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -822,7 +712,7 @@
 	done
 install-updateDATA: $(update_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(updatedir)" || $(mkdir_p) "$(DESTDIR)$(updatedir)"
+	test -z "$(updatedir)" || $(MKDIR_P) "$(DESTDIR)$(updatedir)"
 	@list='$(update_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -869,8 +759,7 @@
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
+$(RECURSIVE_CLEAN_TARGETS):
 	@failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
@@ -971,23 +860,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	$(mkdir_p) $(distdir)/../admin
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -1001,7 +888,7 @@
 	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
-	    || $(mkdir_p) "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 	    || exit 1; \
 	    distdir=`$(am__cd) $(distdir) && pwd`; \
 	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
@@ -1009,6 +896,8 @@
 	      $(MAKE) $(AM_MAKEFLAGS) \
 	        top_distdir="$$top_distdir" \
 	        distdir="$$distdir/$$subdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -1019,7 +908,7 @@
 installdirs: installdirs-recursive
 installdirs-am:
 	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(updatedir)" "$(DESTDIR)$(dataprotocoldir)" "$(DESTDIR)$(kde_mimedir)" "$(DESTDIR)$(kde_servicetypesdir)" "$(DESTDIR)$(kdeddir)" "$(DESTDIR)$(servicetypedir)" "$(DESTDIR)$(updatedir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-recursive
 install-exec: install-exec-recursive
@@ -1052,14 +941,14 @@
 #>- clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
 #>- 	mostlyclean-am
 #>+ 2
-clean-am: clean-closures clean-bcheck  clean-generic clean-libLTLIBRARIES clean-libtool \
+clean-am: clean-bcheck  clean-generic clean-libLTLIBRARIES clean-libtool \
 	mostlyclean-am
 
 distclean: distclean-recursive
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-recursive
 
@@ -1076,12 +965,20 @@
 	install-kdedDATA install-servicetypeDATA install-updateDATA \
 	install-updateSCRIPTS
 
+install-dvi: install-dvi-recursive
+
 install-exec-am: install-libLTLIBRARIES
 
+install-html: install-html-recursive
+
 install-info: install-info-recursive
 
 install-man:
 
+install-pdf: install-pdf-recursive
+
+install-ps: install-ps-recursive
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
@@ -1102,31 +999,33 @@
 
 ps-am:
 
-uninstall-am: uninstall-dataprotocolDATA uninstall-info-am \
-	uninstall-kde_mimeDATA uninstall-kde_servicetypesDATA \
-	uninstall-kdedDATA uninstall-libLTLIBRARIES uninstall-local \
+uninstall-am: uninstall-dataprotocolDATA uninstall-kde_mimeDATA \
+	uninstall-kde_servicetypesDATA uninstall-kdedDATA \
+	uninstall-libLTLIBRARIES uninstall-local \
 	uninstall-servicetypeDATA uninstall-updateDATA \
 	uninstall-updateSCRIPTS
 
-uninstall-info: uninstall-info-recursive
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+	install-strip
 
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-	clean clean-generic clean-libLTLIBRARIES clean-libtool \
-	clean-recursive ctags ctags-recursive distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-recursive distclean-tags distdir dvi dvi-am html \
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+	all all-am check check-am clean clean-generic \
+	clean-libLTLIBRARIES clean-libtool ctags ctags-recursive \
+	distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
 	html-am info info-am install install-am install-data \
 	install-data-am install-data-local install-dataprotocolDATA \
-	install-exec install-exec-am install-info install-info-am \
+	install-dvi install-dvi-am install-exec install-exec-am \
+	install-html install-html-am install-info install-info-am \
 	install-kde_mimeDATA install-kde_servicetypesDATA \
 	install-kdedDATA install-libLTLIBRARIES install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
 	install-servicetypeDATA install-strip install-updateDATA \
 	install-updateSCRIPTS installcheck installcheck-am installdirs \
 	installdirs-am maintainer-clean maintainer-clean-generic \
-	maintainer-clean-recursive mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
-	pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
-	uninstall-dataprotocolDATA uninstall-info-am \
+	mostlyclean mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
+	uninstall uninstall-am uninstall-dataprotocolDATA \
 	uninstall-kde_mimeDATA uninstall-kde_servicetypesDATA \
 	uninstall-kdedDATA uninstall-libLTLIBRARIES uninstall-local \
 	uninstall-servicetypeDATA uninstall-updateDATA \
@@ -1236,22 +1135,9 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
-#>+ 8
-libkio.la.closure: $(libkio_la_OBJECTS) $(libkio_la_DEPENDENCIES)
-	@echo "int main() {return 0;}" > libkio_la_closure.cpp
-	@$(LTCXXCOMPILE) -c libkio_la_closure.cpp
-	$(CXXLINK) libkio_la_closure.lo $(libkio_la_LDFLAGS) $(libkio_la_OBJECTS) $(libkio_la_LIBADD) $(LIBS)
-	@rm -f libkio_la_closure.* libkio.la.closure
-	@echo "timestamp" > libkio.la.closure
-
-
 #>+ 2
 KDE_DIST=DESIGN Mainpage.dox kcmodule.desktop Makefile.in proxytype.pl DESIGN.metadata kpasswdserver.desktop kcomprfilter.desktop renamedlgplugin.desktop DESKTOP_ENTRY_STANDARD DESIGN.mimetypes DESIGN.krun kfileplugin.desktop kscan.desktop kurifilterplugin.desktop kdatatool.desktop magic data.protocol kioslave.upd application.desktop useragent.pl Makefile.am 
 
-#>+ 3
-clean-closures:
-	-rm -f  libkio.la.closure
-
 #>+ 2
 docs-am:
 
--- kdelibs-3.5.7.orig/kio/kioexec/Makefile.in
+++ kdelibs-3.5.7/kio/kioexec/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,15 +16,11 @@
 @SET_MAKE@
 
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -64,7 +60,14 @@
 kioexec_OBJECTS = main.$(OBJEXT)
 am__DEPENDENCIES_1 =
 kioexec_DEPENDENCIES = $(am__DEPENDENCIES_1)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+#>- kioexec_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
+#>- 	$(kioexec_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+kioexec_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
+	$(kioexec_LDFLAGS) $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -72,19 +75,21 @@
 #>+ 2
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 #>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
 CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 3
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(kioexec_SOURCES)
 DIST_SOURCES = $(kioexec_SOURCES)
 HEADERS = $(noinst_HEADERS)
@@ -96,8 +101,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -105,13 +108,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -125,8 +128,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -147,17 +148,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -226,7 +224,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -263,12 +260,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -313,87 +312,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -417,75 +372,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -493,16 +390,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -520,7 +416,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -558,13 +454,13 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
+	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
 	  if test -f $$p \
@@ -592,7 +488,7 @@
 	done
 kioexec$(EXEEXT): $(kioexec_OBJECTS) $(kioexec_DEPENDENCIES) 
 	@rm -f kioexec$(EXEEXT)
-	$(CXXLINK) $(kioexec_LDFLAGS) $(kioexec_OBJECTS) $(kioexec_LDADD) $(LIBS)
+	$(kioexec_LINK) $(kioexec_OBJECTS) $(kioexec_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -603,22 +499,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -629,10 +525,6 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -682,23 +574,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	$(mkdir_p) $(distdir)/../../admin
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -714,7 +604,7 @@
 all-am: Makefile $(PROGRAMS) $(HEADERS)
 installdirs:
 	for dir in "$(DESTDIR)$(bindir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -752,7 +642,7 @@
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
@@ -766,12 +656,20 @@
 
 install-data-am: install-data-local
 
+install-dvi: install-dvi-am
+
 install-exec-am: install-binPROGRAMS install-exec-local
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -792,20 +690,24 @@
 
 ps-am:
 
-uninstall-am: uninstall-binPROGRAMS uninstall-info-am uninstall-local
+uninstall-am: uninstall-binPROGRAMS uninstall-local
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
 	clean-generic clean-libtool ctags distclean distclean-compile \
 	distclean-generic distclean-libtool distclean-tags distdir dvi \
 	dvi-am html html-am info info-am install install-am \
 	install-binPROGRAMS install-data install-data-am \
-	install-data-local install-exec install-exec-am \
-	install-exec-local install-info install-info-am install-man \
+	install-data-local install-dvi install-dvi-am install-exec \
+	install-exec-am install-exec-local install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
 	install-strip installcheck installcheck-am installdirs \
 	maintainer-clean maintainer-clean-generic mostlyclean \
 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
 	pdf pdf-am ps ps-am tags uninstall uninstall-am \
-	uninstall-binPROGRAMS uninstall-info-am uninstall-local
+	uninstall-binPROGRAMS uninstall-local
 
 
 messages:
--- kdelibs-3.5.7.orig/kio/kfile/tests/Makefile.in
+++ kdelibs-3.5.7/kio/kfile/tests/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -33,15 +33,11 @@
 #    along with this library; see the file COPYING.LIB.  If not, write to
 #    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 #    Boston, MA 02110-1301, USA.
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -126,7 +122,7 @@
 kurlrequestertest_OBJECTS = kurlrequestertest.$(OBJEXT)
 kurlrequestertest_LDADD = $(LDADD)
 kurlrequestertest_DEPENDENCIES = $(am__DEPENDENCIES_1)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -134,19 +130,21 @@
 #>+ 2
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
-#>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+#>+ 3
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
 CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 3
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(kcustommenueditortest_SOURCES) \
 	$(kdirselectdialogtest_SOURCES) $(kfiletreeviewtest_SOURCES) \
 	$(kfstest_SOURCES) $(kicondialogtest_SOURCES) \
@@ -165,8 +163,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -174,13 +170,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -194,8 +190,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -216,17 +210,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -295,7 +286,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -332,12 +322,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -382,87 +374,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -486,75 +434,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -562,16 +452,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -597,7 +486,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -635,9 +524,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 clean-checkPROGRAMS:
@@ -648,28 +537,28 @@
 	done
 kcustommenueditortest$(EXEEXT): $(kcustommenueditortest_OBJECTS) $(kcustommenueditortest_DEPENDENCIES) 
 	@rm -f kcustommenueditortest$(EXEEXT)
-	$(CXXLINK) $(kcustommenueditortest_LDFLAGS) $(kcustommenueditortest_OBJECTS) $(kcustommenueditortest_LDADD) $(LIBS)
+	$(CXXLINK) $(kcustommenueditortest_OBJECTS) $(kcustommenueditortest_LDADD) $(LIBS)
 kdirselectdialogtest$(EXEEXT): $(kdirselectdialogtest_OBJECTS) $(kdirselectdialogtest_DEPENDENCIES) 
 	@rm -f kdirselectdialogtest$(EXEEXT)
-	$(CXXLINK) $(kdirselectdialogtest_LDFLAGS) $(kdirselectdialogtest_OBJECTS) $(kdirselectdialogtest_LDADD) $(LIBS)
+	$(CXXLINK) $(kdirselectdialogtest_OBJECTS) $(kdirselectdialogtest_LDADD) $(LIBS)
 kfiletreeviewtest$(EXEEXT): $(kfiletreeviewtest_OBJECTS) $(kfiletreeviewtest_DEPENDENCIES) 
 	@rm -f kfiletreeviewtest$(EXEEXT)
-	$(CXXLINK) $(kfiletreeviewtest_LDFLAGS) $(kfiletreeviewtest_OBJECTS) $(kfiletreeviewtest_LDADD) $(LIBS)
+	$(CXXLINK) $(kfiletreeviewtest_OBJECTS) $(kfiletreeviewtest_LDADD) $(LIBS)
 kfstest$(EXEEXT): $(kfstest_OBJECTS) $(kfstest_DEPENDENCIES) 
 	@rm -f kfstest$(EXEEXT)
-	$(CXXLINK) $(kfstest_LDFLAGS) $(kfstest_OBJECTS) $(kfstest_LDADD) $(LIBS)
+	$(CXXLINK) $(kfstest_OBJECTS) $(kfstest_LDADD) $(LIBS)
 kicondialogtest$(EXEEXT): $(kicondialogtest_OBJECTS) $(kicondialogtest_DEPENDENCIES) 
 	@rm -f kicondialogtest$(EXEEXT)
-	$(CXXLINK) $(kicondialogtest_LDFLAGS) $(kicondialogtest_OBJECTS) $(kicondialogtest_LDADD) $(LIBS)
+	$(CXXLINK) $(kicondialogtest_OBJECTS) $(kicondialogtest_LDADD) $(LIBS)
 knotifytest$(EXEEXT): $(knotifytest_OBJECTS) $(knotifytest_DEPENDENCIES) 
 	@rm -f knotifytest$(EXEEXT)
-	$(CXXLINK) $(knotifytest_LDFLAGS) $(knotifytest_OBJECTS) $(knotifytest_LDADD) $(LIBS)
+	$(CXXLINK) $(knotifytest_OBJECTS) $(knotifytest_LDADD) $(LIBS)
 kopenwithtest$(EXEEXT): $(kopenwithtest_OBJECTS) $(kopenwithtest_DEPENDENCIES) 
 	@rm -f kopenwithtest$(EXEEXT)
-	$(CXXLINK) $(kopenwithtest_LDFLAGS) $(kopenwithtest_OBJECTS) $(kopenwithtest_LDADD) $(LIBS)
+	$(CXXLINK) $(kopenwithtest_OBJECTS) $(kopenwithtest_LDADD) $(LIBS)
 kurlrequestertest$(EXEEXT): $(kurlrequestertest_OBJECTS) $(kurlrequestertest_DEPENDENCIES) 
 	@rm -f kurlrequestertest$(EXEEXT)
-	$(CXXLINK) $(kurlrequestertest_LDFLAGS) $(kurlrequestertest_OBJECTS) $(kurlrequestertest_LDADD) $(LIBS)
+	$(CXXLINK) $(kurlrequestertest_OBJECTS) $(kurlrequestertest_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -688,22 +577,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kurlrequestertest.Po@am__quote@
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -714,10 +603,6 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -767,22 +652,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -836,7 +720,7 @@
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
@@ -850,12 +734,20 @@
 
 install-data-am:
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -876,19 +768,23 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am
+uninstall-am:
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean \
 	clean-checkPROGRAMS clean-generic clean-libtool ctags \
 	distclean distclean-compile distclean-generic \
 	distclean-libtool distclean-tags distdir dvi dvi-am html \
 	html-am info info-am install install-am install-data \
-	install-data-am install-exec install-exec-am install-info \
-	install-info-am install-man install-strip installcheck \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
 	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-info-am
+	tags uninstall uninstall-am
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- kdelibs-3.5.7.orig/kio/kfile/Makefile.in
+++ kdelibs-3.5.7/kio/kfile/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -35,15 +35,11 @@
 
 
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -105,7 +101,7 @@
 	kencodingfiledialog.lo kacleditwidget.lo knotifywidgetbase.lo kpropertiesdesktopbase.lo kpropertiesdesktopadvbase.lo kpropertiesmimetypebase.lo
 @KDE_USE_FINAL_FALSE@libkfile_la_OBJECTS = $(libkfile_la_nofinal_OBJECTS)
 @KDE_USE_FINAL_TRUE@libkfile_la_OBJECTS = $(libkfile_la_final_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -113,19 +109,21 @@
 #>+ 2
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
-#>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+#>+ 3
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
 CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 3
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(libkfile_la_SOURCES)
 DIST_SOURCES = $(libkfile_la_SOURCES)
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -148,8 +146,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -157,13 +153,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -177,8 +173,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -199,17 +193,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -278,7 +269,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -315,12 +305,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -365,87 +357,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -469,75 +417,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -545,16 +435,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -628,7 +517,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -666,9 +555,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 clean-noinstLTLIBRARIES:
@@ -680,7 +569,7 @@
 	  rm -f "$${dir}/so_locations"; \
 	done
 libkfile.la: $(libkfile_la_OBJECTS) $(libkfile_la_DEPENDENCIES) 
-	$(CXXLINK)  $(libkfile_la_LDFLAGS) $(libkfile_la_OBJECTS) $(libkfile_la_LIBADD) $(LIBS)
+	$(CXXLINK)  $(libkfile_la_OBJECTS) $(libkfile_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -726,22 +615,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kurlrequesterdlg.Plo@am__quote@
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -751,13 +640,9 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 install-servicetypeDATA: $(servicetype_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(servicetypedir)" || $(mkdir_p) "$(DESTDIR)$(servicetypedir)"
+	test -z "$(servicetypedir)" || $(MKDIR_P) "$(DESTDIR)$(servicetypedir)"
 	@list='$(servicetype_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -774,7 +659,7 @@
 	done
 install-includeHEADERS: $(include_HEADERS)
 	@$(NORMAL_INSTALL)
-	test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"
+	test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)"
 	@list='$(include_HEADERS)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -839,23 +724,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	$(mkdir_p) $(distdir)/../../admin
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -871,7 +754,7 @@
 all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS)
 installdirs:
 	for dir in "$(DESTDIR)$(servicetypedir)" "$(DESTDIR)$(includedir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -911,7 +794,7 @@
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
@@ -926,12 +809,20 @@
 install-data-am: install-data-local install-includeHEADERS \
 	install-servicetypeDATA
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -952,22 +843,26 @@
 
 ps-am:
 
-uninstall-am: uninstall-includeHEADERS uninstall-info-am \
-	uninstall-local uninstall-servicetypeDATA
+uninstall-am: uninstall-includeHEADERS uninstall-local \
+	uninstall-servicetypeDATA
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-libtool clean-noinstLTLIBRARIES ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
 	distclean-tags distdir dvi dvi-am html html-am info info-am \
 	install install-am install-data install-data-am \
-	install-data-local install-exec install-exec-am \
+	install-data-local install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am \
 	install-includeHEADERS install-info install-info-am \
-	install-man install-servicetypeDATA install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
+	install-man install-pdf install-pdf-am install-ps \
+	install-ps-am install-servicetypeDATA install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 	tags uninstall uninstall-am uninstall-includeHEADERS \
-	uninstall-info-am uninstall-local uninstall-servicetypeDATA
+	uninstall-local uninstall-servicetypeDATA
 
 apidox-am-yes:
 	@if test \! -d "$(top_srcdir)/doc/common/" && test -z "$$DOXDATA" ; then \
--- kdelibs-3.5.7.orig/kio/kssl/Makefile.in
+++ kdelibs-3.5.7/kio/kssl/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,15 +16,11 @@
 @SET_MAKE@
 
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -77,7 +73,7 @@
 	ksslcsessioncache.lo keygenwizard.lo keygenwizard2.lo
 @KDE_USE_FINAL_FALSE@libkssl_la_OBJECTS = $(libkssl_la_nofinal_OBJECTS)
 @KDE_USE_FINAL_TRUE@libkssl_la_OBJECTS = $(libkssl_la_final_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I. -I$(top_builddir)/kjs
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kjs@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -85,34 +81,38 @@
 #>+ 2
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 #>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
 CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 3
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(libkssl_la_SOURCES)
 DIST_SOURCES = $(libkssl_la_SOURCES)
 #>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 #>- 	html-recursive info-recursive install-data-recursive \
-#>- 	install-exec-recursive install-info-recursive \
-#>- 	install-recursive installcheck-recursive installdirs-recursive \
-#>- 	pdf-recursive ps-recursive uninstall-info-recursive \
-#>- 	uninstall-recursive
-#>+ 6
+#>- 	install-dvi-recursive install-exec-recursive \
+#>- 	install-html-recursive install-info-recursive \
+#>- 	install-pdf-recursive install-ps-recursive install-recursive \
+#>- 	installcheck-recursive installdirs-recursive pdf-recursive \
+#>- 	ps-recursive uninstall-recursive
+#>+ 7
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	html-recursive info-recursive install-data-recursive \
-	install-exec-recursive install-info-recursive \
-	install-recursive installcheck-recursive installdirs-recursive \
-	pdf-recursive ps-recursive uninstall-info-recursive \
-	uninstall-recursive nmcheck-recursive bcheck-recursive
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive nmcheck-recursive bcheck-recursive
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -122,6 +122,8 @@
 am__installdirs = "$(DESTDIR)$(includedir)"
 includeHEADERS_INSTALL = $(INSTALL_HEADER)
 HEADERS = $(include_HEADERS) $(noinst_HEADERS)
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
@@ -131,8 +133,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -140,13 +140,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -160,8 +160,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -182,17 +180,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -261,7 +256,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -298,12 +292,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -348,87 +344,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -452,75 +404,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -528,16 +422,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -643,7 +536,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cc .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -681,21 +574,21 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 ksslconfig.h: stamp-h4
 	@if test ! -f $@; then \
 	  rm -f stamp-h4; \
-	  $(MAKE) stamp-h4; \
+	  $(MAKE) $(AM_MAKEFLAGS) stamp-h4; \
 	else :; fi
 
 stamp-h4: $(srcdir)/ksslconfig.h.in $(top_builddir)/config.status
 	@rm -f stamp-h4
 	cd $(top_builddir) && $(SHELL) ./config.status kio/kssl/ksslconfig.h
-$(srcdir)/ksslconfig.h.in:  $(am__configure_deps) 
+$(srcdir)/ksslconfig.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) 
 	cd $(top_srcdir) && $(AUTOHEADER)
 	rm -f stamp-h4
 	touch $@
@@ -712,7 +605,7 @@
 	  rm -f "$${dir}/so_locations"; \
 	done
 libkssl.la: $(libkssl_la_OBJECTS) $(libkssl_la_DEPENDENCIES) 
-	$(CXXLINK)  $(libkssl_la_LDFLAGS) $(libkssl_la_OBJECTS) $(libkssl_la_LIBADD) $(LIBS)
+	$(CXXLINK)  $(libkssl_la_OBJECTS) $(libkssl_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -745,22 +638,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ksslx509v3.Plo@am__quote@
 
 .cc.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cc.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cc.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -770,13 +663,9 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 install-includeHEADERS: $(include_HEADERS)
 	@$(NORMAL_INSTALL)
-	test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"
+	test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)"
 	@list='$(include_HEADERS)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -823,8 +712,7 @@
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
+$(RECURSIVE_CLEAN_TARGETS):
 	@failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
@@ -925,23 +813,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	$(mkdir_p) $(distdir)/../../admin
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -955,7 +841,7 @@
 	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
-	    || $(mkdir_p) "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 	    || exit 1; \
 	    distdir=`$(am__cd) $(distdir) && pwd`; \
 	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
@@ -963,6 +849,8 @@
 	      $(MAKE) $(AM_MAKEFLAGS) \
 	        top_distdir="$$top_distdir" \
 	        distdir="$$distdir/$$subdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -973,7 +861,7 @@
 installdirs: installdirs-recursive
 installdirs-am:
 	for dir in "$(DESTDIR)$(includedir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-recursive
 install-exec: install-exec-recursive
@@ -1013,7 +901,7 @@
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-hdr distclean-libtool distclean-tags
+	distclean-hdr distclean-tags
 
 dvi: dvi-recursive
 
@@ -1027,12 +915,20 @@
 
 install-data-am: install-data-local install-includeHEADERS
 
+install-dvi: install-dvi-recursive
+
 install-exec-am:
 
+install-html: install-html-recursive
+
 install-info: install-info-recursive
 
 install-man:
 
+install-pdf: install-pdf-recursive
+
+install-ps: install-ps-recursive
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
@@ -1053,26 +949,27 @@
 
 ps-am:
 
-uninstall-am: uninstall-includeHEADERS uninstall-info-am \
-	uninstall-local
+uninstall-am: uninstall-includeHEADERS uninstall-local
 
-uninstall-info: uninstall-info-recursive
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+	install-strip
 
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-	clean clean-generic clean-libtool clean-noinstLTLIBRARIES \
-	clean-recursive ctags ctags-recursive distclean \
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+	all all-am check check-am clean clean-generic clean-libtool \
+	clean-noinstLTLIBRARIES ctags ctags-recursive distclean \
 	distclean-compile distclean-generic distclean-hdr \
-	distclean-libtool distclean-recursive distclean-tags distdir \
-	dvi dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-data-local install-exec \
-	install-exec-am install-includeHEADERS install-info \
-	install-info-am install-man install-strip installcheck \
-	installcheck-am installdirs installdirs-am maintainer-clean \
-	maintainer-clean-generic maintainer-clean-recursive \
-	mostlyclean mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-data-local install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-includeHEADERS install-info install-info-am \
+	install-man install-pdf install-pdf-am install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs installdirs-am maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 	tags tags-recursive uninstall uninstall-am \
-	uninstall-includeHEADERS uninstall-info-am uninstall-local
+	uninstall-includeHEADERS uninstall-local
 
 apidox-am-yes:
 	@if test \! -d "$(top_srcdir)/doc/common/" && test -z "$$DOXDATA" ; then \
--- kdelibs-3.5.7.orig/kio/kssl/kssl/caroot/Makefile.in
+++ kdelibs-3.5.7/kio/kssl/kssl/caroot/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -15,15 +15,11 @@
 
 @SET_MAKE@
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -69,8 +65,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -78,13 +72,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -98,8 +92,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -120,17 +112,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -199,7 +188,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -236,12 +224,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -286,87 +276,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -390,75 +336,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -466,16 +354,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -488,7 +375,7 @@
 all: docs-am  all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -526,9 +413,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 mostlyclean-libtool:
@@ -536,13 +423,9 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 install-kssldataDATA: $(kssldata_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(kssldatadir)" || $(mkdir_p) "$(DESTDIR)$(kssldatadir)"
+	test -z "$(kssldatadir)" || $(MKDIR_P) "$(DESTDIR)$(kssldatadir)"
 	@list='$(kssldata_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -565,22 +448,21 @@
 
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -596,7 +478,7 @@
 all-am: Makefile $(DATA)
 installdirs:
 	for dir in "$(DESTDIR)$(kssldatadir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -632,7 +514,7 @@
 
 distclean: distclean-am
 	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool
+distclean-am: clean-am distclean-generic
 
 dvi: dvi-am
 
@@ -646,12 +528,20 @@
 
 install-data-am: install-kssldataDATA
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -670,18 +560,21 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-kssldataDATA
+uninstall-am: uninstall-kssldataDATA
+
+.MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
 	distclean distclean-generic distclean-libtool distdir dvi \
 	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-exec install-exec-am \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
 	install-info install-info-am install-kssldataDATA install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
 	install-strip installcheck installcheck-am installdirs \
 	maintainer-clean maintainer-clean-generic mostlyclean \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	uninstall uninstall-am uninstall-info-am \
-	uninstall-kssldataDATA
+	uninstall uninstall-am uninstall-kssldataDATA
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- kdelibs-3.5.7.orig/kio/kssl/kssl/Makefile.in
+++ kdelibs-3.5.7/kio/kssl/kssl/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -15,15 +15,11 @@
 
 @SET_MAKE@
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -56,17 +52,19 @@
 DIST_SOURCES =
 #>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 #>- 	html-recursive info-recursive install-data-recursive \
-#>- 	install-exec-recursive install-info-recursive \
-#>- 	install-recursive installcheck-recursive installdirs-recursive \
-#>- 	pdf-recursive ps-recursive uninstall-info-recursive \
-#>- 	uninstall-recursive
-#>+ 6
+#>- 	install-dvi-recursive install-exec-recursive \
+#>- 	install-html-recursive install-info-recursive \
+#>- 	install-pdf-recursive install-ps-recursive install-recursive \
+#>- 	installcheck-recursive installdirs-recursive pdf-recursive \
+#>- 	ps-recursive uninstall-recursive
+#>+ 7
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	html-recursive info-recursive install-data-recursive \
-	install-exec-recursive install-info-recursive \
-	install-recursive installcheck-recursive installdirs-recursive \
-	pdf-recursive ps-recursive uninstall-info-recursive \
-	uninstall-recursive nmcheck-recursive bcheck-recursive
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive nmcheck-recursive bcheck-recursive
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -76,6 +74,8 @@
 am__installdirs = "$(DESTDIR)$(confdir)"
 confDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(conf_DATA)
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
@@ -85,8 +85,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -94,13 +92,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -114,8 +112,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -136,17 +132,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -215,7 +208,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -252,12 +244,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -302,87 +296,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -406,75 +356,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -482,16 +374,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -505,7 +396,7 @@
 all: docs-am  all-recursive
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -543,9 +434,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 mostlyclean-libtool:
@@ -553,13 +444,9 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 install-confDATA: $(conf_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(confdir)" || $(mkdir_p) "$(DESTDIR)$(confdir)"
+	test -z "$(confdir)" || $(MKDIR_P) "$(DESTDIR)$(confdir)"
 	@list='$(conf_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -606,8 +493,7 @@
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
+$(RECURSIVE_CLEAN_TARGETS):
 	@failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
@@ -708,22 +594,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -737,7 +622,7 @@
 	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
-	    || $(mkdir_p) "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 	    || exit 1; \
 	    distdir=`$(am__cd) $(distdir) && pwd`; \
 	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
@@ -745,6 +630,8 @@
 	      $(MAKE) $(AM_MAKEFLAGS) \
 	        top_distdir="$$top_distdir" \
 	        distdir="$$distdir/$$subdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -755,7 +642,7 @@
 installdirs: installdirs-recursive
 installdirs-am:
 	for dir in "$(DESTDIR)$(confdir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-recursive
 install-exec: install-exec-recursive
@@ -791,8 +678,7 @@
 
 distclean: distclean-recursive
 	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool \
-	distclean-tags
+distclean-am: clean-am distclean-generic distclean-tags
 
 dvi: dvi-recursive
 
@@ -806,12 +692,20 @@
 
 install-data-am: install-confDATA
 
+install-dvi: install-dvi-recursive
+
 install-exec-am:
 
+install-html: install-html-recursive
+
 install-info: install-info-recursive
 
 install-man:
 
+install-pdf: install-pdf-recursive
+
+install-ps: install-ps-recursive
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
@@ -830,23 +724,24 @@
 
 ps-am:
 
-uninstall-am: uninstall-confDATA uninstall-info-am
+uninstall-am: uninstall-confDATA
 
-uninstall-info: uninstall-info-recursive
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+	install-strip
 
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-	clean clean-generic clean-libtool clean-recursive ctags \
-	ctags-recursive distclean distclean-generic distclean-libtool \
-	distclean-recursive distclean-tags distdir dvi dvi-am html \
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+	all all-am check check-am clean clean-generic clean-libtool \
+	ctags ctags-recursive distclean distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
 	html-am info info-am install install-am install-confDATA \
-	install-data install-data-am install-exec install-exec-am \
-	install-info install-info-am install-man install-strip \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
 	installcheck installcheck-am installdirs installdirs-am \
-	maintainer-clean maintainer-clean-generic \
-	maintainer-clean-recursive mostlyclean mostlyclean-generic \
-	mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
-	tags tags-recursive uninstall uninstall-am uninstall-confDATA \
-	uninstall-info-am
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags tags-recursive uninstall uninstall-am uninstall-confDATA
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- kdelibs-3.5.7.orig/kresources/Makefile.in
+++ kdelibs-3.5.7/kresources/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -17,15 +17,11 @@
 
 
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -73,6 +69,13 @@
 #>- kcm_kresources_la_OBJECTS = $(am_kcm_kresources_la_OBJECTS)
 #>+ 1
 kcm_kresources_la_OBJECTS = kcmkresources.lo
+#>- kcm_kresources_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(kcm_kresources_la_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+kcm_kresources_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(kcm_kresources_la_LDFLAGS) $(LDFLAGS) -o $@
 am__DEPENDENCIES_1 =
 libkresources_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1)
@@ -85,12 +88,26 @@
 	configwidget.lo configdialog.lo selectdialog.lo configpage.lo manageriface_skel.lo manageriface_stub.lo
 @KDE_USE_FINAL_FALSE@libkresources_la_OBJECTS = $(libkresources_la_nofinal_OBJECTS)
 @KDE_USE_FINAL_TRUE@libkresources_la_OBJECTS = $(libkresources_la_final_OBJECTS)
+#>- libkresources_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(libkresources_la_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+libkresources_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(libkresources_la_LDFLAGS) $(LDFLAGS) -o $@
 am_testresources_OBJECTS = testresources.$(OBJEXT)
 #>- testresources_OBJECTS = $(am_testresources_OBJECTS)
 #>+ 1
 testresources_OBJECTS = testresources.$(OBJEXT)
 testresources_DEPENDENCIES = libkresources.la
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+#>- testresources_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(testresources_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+testresources_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(testresources_LDFLAGS) $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -98,19 +115,21 @@
 #>+ 2
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 #>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
 CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 3
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(kcm_kresources_la_SOURCES) $(libkresources_la_SOURCES) \
 	$(testresources_SOURCES)
 DIST_SOURCES = $(kcm_kresources_la_SOURCES) \
@@ -128,8 +147,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -137,13 +154,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -157,8 +174,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -179,17 +194,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -258,7 +270,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -295,12 +306,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -345,87 +358,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -449,75 +418,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -525,16 +436,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -563,9 +473,7 @@
   selectdialog.cpp \
   configpage.cpp manageriface_skel.cpp manageriface_stub.cpp
 
-#>- libkresources_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 3:0:2
-#>+ 1
-libkresources_la_LDFLAGS = $(all_libraries) -no-undefined $(KDE_NO_UNDEFINED) -version-info 3:0:2
+libkresources_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 3:0:2
 libkresources_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO)
 kresincludedir = $(includedir)/kresources
 kresinclude_HEADERS = resource.h \
@@ -580,9 +488,7 @@
 
 kde_module_LTLIBRARIES = kcm_kresources.la
 kcm_kresources_la_SOURCES = kcmkresources.cpp
-#>- kcm_kresources_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
-#>+ 1
-kcm_kresources_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined $(KDE_NO_UNDEFINED)
+kcm_kresources_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
 kcm_kresources_la_LIBADD = libkresources.la
 testresources_LDFLAGS = $(all_libraries) $(KDE_RPATH)
 testresources_LDADD = libkresources.la
@@ -596,7 +502,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(srcdir)/../admin/Doxyfile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../admin/Doxyfile.am $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -634,13 +540,13 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
+	test -z "$(kde_moduledir)" || $(MKDIR_P) "$(DESTDIR)$(kde_moduledir)"
 	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
@@ -651,7 +557,7 @@
 
 uninstall-kde_moduleLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
@@ -667,7 +573,7 @@
 	done
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
@@ -678,7 +584,7 @@
 
 uninstall-libLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
@@ -692,16 +598,10 @@
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
-#>- kcm_kresources.la: $(kcm_kresources_la_OBJECTS) $(kcm_kresources_la_DEPENDENCIES) 
-#>+ 2
-@KDE_USE_CLOSURE_TRUE@kcm_kresources.la: kcm_kresources.la.closure $(kcm_kresources_la_OBJECTS) $(kcm_kresources_la_DEPENDENCIES) 
-@KDE_USE_CLOSURE_FALSE@kcm_kresources.la: $(kcm_kresources_la_OBJECTS) $(kcm_kresources_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(kde_moduledir) $(kcm_kresources_la_LDFLAGS) $(kcm_kresources_la_OBJECTS) $(kcm_kresources_la_LIBADD) $(LIBS)
-#>- libkresources.la: $(libkresources_la_OBJECTS) $(libkresources_la_DEPENDENCIES) 
-#>+ 2
-@KDE_USE_CLOSURE_TRUE@libkresources.la: libkresources.la.closure $(libkresources_la_OBJECTS) $(libkresources_la_DEPENDENCIES) 
-@KDE_USE_CLOSURE_FALSE@libkresources.la: $(libkresources_la_OBJECTS) $(libkresources_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(libdir) $(libkresources_la_LDFLAGS) $(libkresources_la_OBJECTS) $(libkresources_la_LIBADD) $(LIBS)
+kcm_kresources.la: $(kcm_kresources_la_OBJECTS) $(kcm_kresources_la_DEPENDENCIES) 
+	$(kcm_kresources_la_LINK) -rpath $(kde_moduledir) $(kcm_kresources_la_OBJECTS) $(kcm_kresources_la_LIBADD) $(LIBS)
+libkresources.la: $(libkresources_la_OBJECTS) $(libkresources_la_DEPENDENCIES) 
+	$(libkresources_la_LINK) -rpath $(libdir) $(libkresources_la_OBJECTS) $(libkresources_la_LIBADD) $(LIBS)
 
 clean-checkPROGRAMS:
 	@list='$(check_PROGRAMS)'; for p in $$list; do \
@@ -711,7 +611,7 @@
 	done
 testresources$(EXEEXT): $(testresources_OBJECTS) $(testresources_DEPENDENCIES) 
 	@rm -f testresources$(EXEEXT)
-	$(CXXLINK) $(testresources_LDFLAGS) $(testresources_OBJECTS) $(testresources_LDADD) $(LIBS)
+	$(testresources_LINK) $(testresources_OBJECTS) $(testresources_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -730,22 +630,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testresources.Po@am__quote@
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -755,13 +655,9 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 install-servicetypeDATA: $(servicetype_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(servicetypedir)" || $(mkdir_p) "$(DESTDIR)$(servicetypedir)"
+	test -z "$(servicetypedir)" || $(MKDIR_P) "$(DESTDIR)$(servicetypedir)"
 	@list='$(servicetype_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -778,7 +674,7 @@
 	done
 install-xdg_appsDATA: $(xdg_apps_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(xdg_appsdir)" || $(mkdir_p) "$(DESTDIR)$(xdg_appsdir)"
+	test -z "$(xdg_appsdir)" || $(MKDIR_P) "$(DESTDIR)$(xdg_appsdir)"
 	@list='$(xdg_apps_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -795,7 +691,7 @@
 	done
 install-kresincludeHEADERS: $(kresinclude_HEADERS)
 	@$(NORMAL_INSTALL)
-	test -z "$(kresincludedir)" || $(mkdir_p) "$(DESTDIR)$(kresincludedir)"
+	test -z "$(kresincludedir)" || $(MKDIR_P) "$(DESTDIR)$(kresincludedir)"
 	@list='$(kresinclude_HEADERS)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -860,23 +756,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	$(mkdir_p) $(distdir)/../admin
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -893,7 +787,7 @@
 all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS)
 installdirs:
 	for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(servicetypedir)" "$(DESTDIR)$(xdg_appsdir)" "$(DESTDIR)$(kresincludedir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -927,7 +821,7 @@
 #>- 	clean-kde_moduleLTLIBRARIES clean-libLTLIBRARIES clean-libtool \
 #>- 	mostlyclean-am
 #>+ 3
-clean-am: clean-metasources clean-idl clean-closures clean-bcheck clean-final  clean-checkPROGRAMS clean-generic \
+clean-am: clean-metasources clean-idl clean-bcheck clean-final  clean-checkPROGRAMS clean-generic \
 	clean-kde_moduleLTLIBRARIES clean-libLTLIBRARIES clean-libtool \
 	mostlyclean-am
 
@@ -935,7 +829,7 @@
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
@@ -955,14 +849,22 @@
 	install-kresincludeHEADERS install-servicetypeDATA \
 	install-xdg_appsDATA
 
+install-dvi: install-dvi-am
+
 #>- install-exec-am: install-libLTLIBRARIES
 #>+ 1
 install-exec-am:  install-libLTLIBRARIES install-kde_moduleLTLIBRARIES
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -983,28 +885,32 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-kde_moduleLTLIBRARIES \
+uninstall-am: uninstall-kde_moduleLTLIBRARIES \
 	uninstall-kresincludeHEADERS uninstall-libLTLIBRARIES \
 	uninstall-local uninstall-servicetypeDATA \
 	uninstall-xdg_appsDATA
 
+.MAKE: install-am install-strip
+
 .PHONY: CTAGS GTAGS all all-am check check-am clean \
 	clean-checkPROGRAMS clean-generic clean-kde_moduleLTLIBRARIES \
 	clean-libLTLIBRARIES clean-libtool ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
 	distclean-tags distdir dvi dvi-am html html-am info info-am \
 	install install-am install-data install-data-am \
-	install-data-local install-exec install-exec-am install-info \
+	install-data-local install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
 	install-info-am install-kde_moduleLTLIBRARIES \
 	install-kresincludeHEADERS install-libLTLIBRARIES install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
 	install-servicetypeDATA install-strip install-xdg_appsDATA \
 	installcheck installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-info-am \
-	uninstall-kde_moduleLTLIBRARIES uninstall-kresincludeHEADERS \
-	uninstall-libLTLIBRARIES uninstall-local \
-	uninstall-servicetypeDATA uninstall-xdg_appsDATA
+	tags uninstall uninstall-am uninstall-kde_moduleLTLIBRARIES \
+	uninstall-kresincludeHEADERS uninstall-libLTLIBRARIES \
+	uninstall-local uninstall-servicetypeDATA \
+	uninstall-xdg_appsDATA
 
 apidox-am-yes:
 	@if test \! -d "$(top_srcdir)/doc/common/" && test -z "$$DOXDATA" ; then \
@@ -1102,15 +1008,6 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
-#>+ 8
-kcm_kresources.la.closure: $(kcm_kresources_la_OBJECTS) $(kcm_kresources_la_DEPENDENCIES)
-	@echo "int main() {return 0;}" > kcm_kresources_la_closure.cpp
-	@$(LTCXXCOMPILE) -c kcm_kresources_la_closure.cpp
-	$(CXXLINK) kcm_kresources_la_closure.lo $(kcm_kresources_la_LDFLAGS) $(kcm_kresources_la_OBJECTS) $(kcm_kresources_la_LIBADD) $(LIBS)
-	@rm -f kcm_kresources_la_closure.* kcm_kresources.la.closure
-	@echo "timestamp" > kcm_kresources.la.closure
-
-
 #>+ 3
 resource.moc: $(srcdir)/resource.h
 	$(MOC) $(srcdir)/resource.h -o resource.moc
@@ -1154,15 +1051,6 @@
 manageriface_stub.h: manageriface.kidl
 	$(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-skel manageriface.kidl
 
-#>+ 8
-libkresources.la.closure: $(libkresources_la_OBJECTS) $(libkresources_la_DEPENDENCIES)
-	@echo "int main() {return 0;}" > libkresources_la_closure.cpp
-	@$(LTCXXCOMPILE) -c libkresources_la_closure.cpp
-	$(CXXLINK) libkresources_la_closure.lo $(libkresources_la_LDFLAGS) $(libkresources_la_OBJECTS) $(libkresources_la_LIBADD) $(LIBS)
-	@rm -f libkresources_la_closure.* libkresources.la.closure
-	@echo "timestamp" > libkresources.la.closure
-
-
 #>+ 3
 clean-metasources:
 	-rm -f  resource.moc kcmkresources.moc configdialog.moc configwidget.moc configpage.moc
@@ -1176,10 +1064,6 @@
 	manageriface_skel.cpp manageriface_skel.h manageriface.kidl \
 	manageriface_stub.cpp manageriface_stub.h manageriface.kidl 
 
-#>+ 3
-clean-closures:
-	-rm -f  kcm_kresources.la.closure libkresources.la.closure
-
 #>+ 2
 docs-am:
 
--- kdelibs-3.5.7.orig/config.h.in
+++ kdelibs-3.5.7/config.h.in
@@ -3,6 +3,9 @@
 /* Define where aspell data dir is */
 #undef ASPELL_DATADIR
 
+/* Avahi API 0.6 */
+#undef AVAHI_API_0_6
+
 /* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
    systems. This function is required for `alloca.c' support on those systems.
    */
@@ -103,9 +106,6 @@
 /* Define if your system has Linux Directory Notification */
 #undef HAVE_DNOTIFY
 
-/* Define if dns-sd is available */
-#undef HAVE_DNSSD
-
 /* Define if you have OpenEXR */
 #undef HAVE_EXR
 
@@ -567,6 +567,9 @@
 /* Define to 1 if you have the <sys/param.h> header file. */
 #undef HAVE_SYS_PARAM_H
 
+/* Define to 1 if you have the <sys/prctl.h> header file. */
+#undef HAVE_SYS_PRCTL_H
+
 /* Define to 1 if you have the <sys/select.h> header file. */
 #undef HAVE_SYS_SELECT_H
 
@@ -594,6 +597,12 @@
 /* Define if sys/stat.h declares S_ISSOCK. */
 #undef HAVE_S_ISSOCK
 
+/* Define to 1 if you have the `tcgetattr' function. */
+#undef HAVE_TCGETATTR
+
+/* Define to 1 if you have the `tcsetattr' function. */
+#undef HAVE_TCSETATTR
+
 /* Define to 1 if you have the <termios.h> header file. */
 #undef HAVE_TERMIOS_H
 
--- kdelibs-3.5.7.orig/pics/emoticons/Makefile.in
+++ kdelibs-3.5.7/pics/emoticons/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -15,15 +15,11 @@
 
 @SET_MAKE@
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -69,8 +65,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -78,13 +72,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -98,8 +92,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -120,17 +112,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -199,7 +188,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -236,12 +224,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -286,87 +276,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -390,75 +336,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -466,16 +354,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -488,7 +375,7 @@
 all: docs-am  all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -526,9 +413,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 mostlyclean-libtool:
@@ -536,13 +423,9 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 install-iconDATA: $(icon_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(icondir)" || $(mkdir_p) "$(DESTDIR)$(icondir)"
+	test -z "$(icondir)" || $(MKDIR_P) "$(DESTDIR)$(icondir)"
 	@list='$(icon_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -565,22 +448,21 @@
 
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -596,7 +478,7 @@
 all-am: Makefile $(DATA)
 installdirs:
 	for dir in "$(DESTDIR)$(icondir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -632,7 +514,7 @@
 
 distclean: distclean-am
 	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool
+distclean-am: clean-am distclean-generic
 
 dvi: dvi-am
 
@@ -646,12 +528,20 @@
 
 install-data-am: install-iconDATA
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -670,17 +560,21 @@
 
 ps-am:
 
-uninstall-am: uninstall-iconDATA uninstall-info-am
+uninstall-am: uninstall-iconDATA
+
+.MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
 	distclean distclean-generic distclean-libtool distdir dvi \
 	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-exec install-exec-am \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
 	install-iconDATA install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
 	install-strip installcheck installcheck-am installdirs \
 	maintainer-clean maintainer-clean-generic mostlyclean \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	uninstall uninstall-am uninstall-iconDATA uninstall-info-am
+	uninstall uninstall-am uninstall-iconDATA
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- kdelibs-3.5.7.orig/pics/crystalsvg/Makefile.in
+++ kdelibs-3.5.7/pics/crystalsvg/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -15,15 +15,11 @@
 
 @SET_MAKE@
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -69,8 +65,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -78,13 +72,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -98,8 +92,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -120,17 +112,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -199,7 +188,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -236,12 +224,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -286,87 +276,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -390,75 +336,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -466,16 +354,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -489,7 +376,7 @@
 all: docs-am  all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -527,9 +414,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 mostlyclean-libtool:
@@ -537,13 +424,9 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 install-crystalDATA: $(crystal_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(crystaldir)" || $(mkdir_p) "$(DESTDIR)$(crystaldir)"
+	test -z "$(crystaldir)" || $(MKDIR_P) "$(DESTDIR)$(crystaldir)"
 	@list='$(crystal_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -566,22 +449,21 @@
 
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -597,7 +479,7 @@
 all-am: Makefile $(DATA)
 installdirs:
 	for dir in "$(DESTDIR)$(crystaldir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -633,7 +515,7 @@
 
 distclean: distclean-am
 	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool
+distclean-am: clean-am distclean-generic
 
 dvi: dvi-am
 
@@ -649,12 +531,20 @@
 #>+ 1
 install-data-am: install-kde-icons  install-crystalDATA
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -673,19 +563,23 @@
 
 ps-am:
 
-#>- uninstall-am: uninstall-crystalDATA uninstall-info-am
+#>- uninstall-am: uninstall-crystalDATA
 #>+ 1
-uninstall-am: uninstall-kde-icons  uninstall-crystalDATA uninstall-info-am
+uninstall-am: uninstall-kde-icons  uninstall-crystalDATA
+
+.MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
 	distclean distclean-generic distclean-libtool distdir dvi \
 	dvi-am html html-am info info-am install install-am \
-	install-crystalDATA install-data install-data-am install-exec \
-	install-exec-am install-info install-info-am install-man \
+	install-crystalDATA install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
 	install-strip installcheck installcheck-am installdirs \
 	maintainer-clean maintainer-clean-generic mostlyclean \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	uninstall uninstall-am uninstall-crystalDATA uninstall-info-am
+	uninstall uninstall-am uninstall-crystalDATA
 
 
 generate:
@@ -710,12 +604,12 @@
 .NOEXPORT:
 
 #>+ 2
-KDE_DIST=cr32-device-system.png cr32-device-usbpendrive_unmount.png crsc-device-ipod_unmount.svgz cr16-action-history.png cr16-action-math_lsub.png cr32-action-fileprint.png crsc-filesys-folder_favorite.svgz cr32-mime-template_source.png crsc-mime-zip.svgz cr16-action-about_kde.png cr32-action-mail_post_to.png cr48-action-rotate_ccw.png cr16-mime-tar.png cr64-mime-exec_wine.png cr16-device-hdd_mount.png cr64-mime-source_y.png cr48-device-cdrom_mount.png cr32-mime-exec_wine.png cr22-action-player_eject.png cr22-mime-tgz.png cr32-action-text_block.png crsc-device-zip_unmount.svgz cr32-action-messagebox_critical.png cr32-device-mo_unmount.png cr16-device-tv.png cr48-mime-info.png cr32-action-player_eject.png cr64-mime-shellscript.png cr22-mime-soffice.png cr16-device-printer1.png crsc-action-eraser.svgz cr22-action-math_brace.png cr32-filesys-file_broken.png crsc-mime-video.svgz cr16-action-move.png cr22-action-window_new.png cr128-mime-misc.png cr32-action-leftjust.png cr48-device-ipod_unmount.png cr16-action-music_32ndnote.png cr16-action-2rightarrow.png cr64-mime-html.png crsc-device-print_class.svgz cr48-mime-html.png cr16-action-help.png cr22-action-connect_creating.png cr64-filesys-network.png crsc-filesys-home_white.svgz cr16-action-editclear.png cr16-device-3floppy_mount.png cr16-filesys-folder_grey.png cr22-action-music_quarternote.png cr16-filesys-folder_important.png cr64-device-smart_media_mount.png cr32-device-cdwriter_unmount.png cr48-mime-source_o.png crsc-filesys-folder_locked.svgz cr64-mime-cdr.png cr48-action-frameprint.png cr48-mime-encrypted.png cr32-mime-make.png cr22-action-thumbnail.png cr128-filesys-folder_yellow.png crsc-mime-source.svgz cr16-action-news_subscribe.png cr22-device-memory_stick_unmount.png cr48-action-share.png crsc-mime-cdtrack.svgz cr22-filesys-folder_grey.png cr32-filesys-desktop.png cr16-mime-postscript.png cr32-mime-pdf.png cr16-action-text.png cr22-mime-source_o.png cr16-mime-news.png cr128-mime-source_h.png crsc-filesys-folder_green.svgz cr16-action-filefind.png crsc-action-fileprint.svgz cr22-action-mail_find.png cr32-action-next.png cr64-mime-video.png cr64-mime-gf.png cr16-action-save_all.png cr48-mime-txt.png cr128-mime-metafont.png cr48-device-3floppy_mount.png cr16-device-pda_black.png cr128-mime-source.png cr48-filesys-folder_violet.png cr22-device-cdaudio_unmount.png cr22-mime-empty.png crsc-action-back.svgz cr32-action-bookmark_folder.png cr22-mime-info.png cr22-action-mail_new3.png cr64-mime-cdtrack.png crsc-mime-image2.svgz cr128-mime-source_f.png cr48-action-reload_page.png cr16-mime-misc.png cr16-action-player_play.png cr128-filesys-link_overlay.png cr22-action-mail_delete.png cr32-action-view_top_bottom.png cr22-action-button_cancel.png cr22-mime-kformula_kfo.png cr32-action-share.png crsc-action-bottom.svgz cr32-mime-gf.png cr16-action-window_nofullscreen.png cr16-filesys-folder_html.png cr64-device-nfs_unmount.png cr16-action-player_end.png cr16-action-fileopen.png cr128-app-password.png cr64-mime-source_php.png cr48-mime-source_moc.png cr22-action-make_kdevelop.png cr22-action-encrypted.png cr48-device-tablet.png cr16-action-filesaveas.png cr48-device-mo_mount.png crsc-mime-source_o.svgz cr48-filesys-file_broken.png cr64-action-player_play.png cr48-action-back.png cr32-action-view_left_right.png cr32-device-memory_stick_unmount.png cr16-mime-pk.png cr128-mime-cdimage.png cr64-device-cdaudio_mount.png cr48-action-filequickprint.png cr16-action-text_center.png cr22-action-pencil.png cr128-mime-pdf.png cr32-mime-tar.png crsc-action-finish.svgz cr64-mime-misc.png crsc-device-hdd_unmount.svgz cr128-mime-font.png cr16-action-eraser.png cr22-action-filenew.png cr32-action-music_sixteenthnote.png cr16-action-view_remove.png cr16-action-fileprint.png cr22-mime-document2.png cr32-action-music_dottednote.png cr128-mime-make.png cr64-mime-source_pl.png crsc-action-down.svgz cr48-device-usbpendrive_mount.png cr32-action-music_fermatenote.png crsc-device-scanner.svgz cr16-action-flag.png cr22-filesys-zip_overlay.png cr22-action-rotate_ccw.png cr16-action-text_strike.png cr22-action-text_right.png cr32-mime-widget_doc.png cr22-action-blend.png crsc-mime-karbon_karbon.svgz cr22-action-lock.png cr22-mime-zip.png cr128-mime-source_cpp.png cr22-mime-bt.png cr22-action-music_halfnote.png cr64-mime-dvi.png cr16-action-lock.png cr32-mime-html.png crsc-device-nfs_mount.svgz cr22-action-view_choose.png cr16-action-remove.png cr22-action-translate.png cr64-mime-man.png cr32-action-down.png cr22-mime-source_j.png cr16-action-blend.png cr48-filesys-folder_print.png cr22-mime-krita_kra.png cr22-mime-image.png cr16-filesys-zip_overlay.png crsc-filesys-network_local.svgz cr16-action-tab_new_bg.png cr48-mime-gettext.png cr32-action-bookmark.png crsc-filesys-folder_blue.svgz crsc-action-text_bild.svgz cr16-action-music_eightnote.png cr22-action-edit.png cr22-action-project_open.png cr48-filesys-folder_yellow.png cr128-mime-wordprocessing.png cr16-filesys-folder_locked.png cr64-mime-txt2.png crsc-mime-ascii.svgz cr128-mime-readme.png cr22-action-music_dottednote.png cr48-device-sd_mmc_mount.png cr16-device-nfs_mount.png cr22-filesys-folder_orange_open.png cr22-mime-kword_kwd.png cr16-filesys-folder_yellow.png crsc-mime-source_s.svgz cr22-action-mail_reply.png cr32-mime-txt2.png cr32-device-usbpendrive_mount.png cr16-filesys-folder_orange_open.png cr16-mime-core.png cr32-action-stop.png cr128-mime-resource.png cr16-filesys-lock_overlay.png cr128-mime-pk.png cr16-mime-kword_kwd.png cr22-action-queue.png crsc-device-ipod_mount.svgz cr16-action-exit.png crsc-action-forward.svgz cr48-mime-man.png cr32-device-blockdevice.png cr16-action-viewmag+.png cr64-mime-source.png crsc-filesys-lock_overlay.svgz crsc-mime-dvi.svgz cr22-mime-kpresenter_kpr.png cr32-device-nfs_mount.png cr16-action-revert.png cr22-mime-source_l.png cr22-action-view_left_right.png cr32-action-exit.png crsc-mime-pk.svgz cr22-action-up.png cr16-action-share.png cr16-mime-source_php.png cr32-mime-font_type1.png cr16-action-translate.png cr16-device-memory_stick_unmount.png cr64-mime-deb.png cr32-action-music_cross.png cr16-action-finish.png cr128-device-compact_flash_unmount.png cr16-action-text_left.png cr64-mime-kmultiple.png cr64-filesys-desktop.png cr16-mime-rpm.png cr16-action-reload.png cr64-mime-readme.png cr22-mime-rpm.png cr16-filesys-folder.png cr64-device-zip_mount.png cr48-app-kmenu.png crsc-app-kttsd.svgz cr32-mime-document.png cr32-mime-video.png cr128-filesys-folder_home2.png cr16-device-cdwriter_unmount.png cr22-action-halfencrypted.png cr22-action-switchuser.png cr48-filesys-www.png cr16-mime-exec_wine.png crsc-device-pda_black.svgz cr128-mime-exec_wine.png cr32-action-bookmarks_list_add.png cr16-action-reload_page.png cr64-mime-kformula_kfo.png cr16-action-view_multicolumn.png cr32-action-centrejust.png cr16-action-spellcheck.png cr32-device-sd_mmc_unmount.png cr48-device-smart_media_mount.png crsc-action-text_super.svgz crsc-action-frameprint.svgz cr128-mime-bt.png cr16-mime-kformula_kfo.png cr48-mime-source_c.png cr22-mime-source_py.png cr32-device-cdrom_unmount.png cr22-mime-dvi.png cr16-action-emptytrash.png cr16-action-music_fermatenote.png cr32-action-fonts.png cr16-action-fill.png cr64-mime-unknown.png cr32-action-add.png cr22-action-viewmag1.png cr32-mime-kpresenter_kpr.png crsc-device-mouse.svgz cr16-mime-metafont.png cr32-action-blend.png cr16-action-music_sixteenthnote.png cr22-mime-source_p.png cr48-action-gear.png cr128-filesys-folder_red.png cr22-action-player_rew.png crsc-mime-vectorgfx.svgz cr64-app-password.png cr48-mime-ascii.png index.theme cr22-mime-kchart_chrt.png cr16-filesys-file_broken.png crsc-filesys-folder_yellow_open.svgz cr64-filesys-folder_important.png crsc-mime-shellscript.svgz cr22-filesys-folder_grey_open.png cr16-action-charset.png crsc-mime-source_php.svgz cr128-device-chardevice.png cr64-mime-source_c.png cr32-action-math_lsub.png cr16-action-music_quarternote.png crsc-mime-vcard.svgz cr64-mime-font_type1.png crsc-filesys-folder_violet_open.svgz crsc-mime-font_bitmap.svgz cr22-action-player_fwd.png cr16-action-edittrash.png cr16-device-memory_stick_mount.png cr16-action-rotate.png cr16-action-connect_no.png cr16-action-frame_query.png cr22-action-about_kde.png cr16-action-math_rsub.png cr16-mime-info.png cr48-action-unindent.png cr128-mime-tex.png cr48-action-fileclose.png cr22-action-music_sixteenthnote.png cr22-mime-gf.png cr16-filesys-folder_home2.png crsc-filesys-folder_html.svgz cr32-mime-source.png cr22-filesys-folder_green_open.png cr32-action-math_paren.png cr32-mime-kugar_kud.png cr32-action-math_rsub.png cr128-mime-source_j.png cr22-action-view_fit_width.png cr128-filesys-exec.png cr128-mime-source_y.png cr48-device-dvd_unmount.png cr16-mime-deb.png crsc-filesys-folder_txt.svgz cr32-filesys-folder_green.png crsc-filesys-file_important.svgz cr22-action-connect_established.png crsc-filesys-folder_red_open.svgz cr22-action-frame_text.png cr48-mime-karbon_karbon.png cr16-action-back.png crsc-mime-tgz.svgz cr128-filesys-folder_txt.png cr32-mime-kspread_ksp.png crsc-mime-log.svgz cr64-action-fileopen.png cr16-action-viewmag1.png cr22-action-decrypted.png crsc-action-text_strike.svgz cr22-mime-news.png cr22-action-wizard.png cr16-mime-tgz.png cr32-action-player_pause.png cr16-filesys-network.png cr32-action-mail_generic.png cr22-action-view_icon.png cr16-filesys-www.png cr22-filesys-folder_yellow.png cr16-action-math_sum.png crsc-action-info.svgz cr48-filesys-desktop.png cr48-mime-tex.png cr16-action-editcopy.png cr32-action-rotate_cw.png cr32-action-mail_replylist.png cr32-device-hdd_unmount.png cr22-action-music_eightnote.png cr64-mime-font_truetype.png crsc-mime-file_temporary.svgz cr22-mime-readme.png cr32-action-gohome.png cr16-mime-source_py.png cr48-mime-source_cpp.png cr128-app-kttsd.png cr22-action-view_top_bottom.png cr22-mime-cdimage.png cr16-mime-cdimage.png cr64-filesys-folder_home2.png cr16-action-previous.png cr16-device-cdwriter_mount.png cr32-device-scanner.png cr32-mime-kexi_kexi.png cr22-action-top.png cr16-action-view_icon.png cr32-action-emptytrash.png cr22-action-signature.png cr16-device-mo_unmount.png cr22-action-player_start.png cr32-device-3floppy_unmount.png cr32-action-filesaveas.png cr32-mime-gettext.png cr22-device-hdd_mount.png cr32-action-player_play.png cr16-device-nfs_unmount.png crsc-filesys-link_overlay.svgz cr16-action-color_fill.png cr32-device-cdrom_mount.png cr16-filesys-ftp.png cr22-action-frame_edit.png cr128-mime-txt.png cr64-mime-recycled.png crsc-device-usbpendrive_mount.svgz cr32-filesys-trashcan_full.png cr32-action-player_playlist.png cr22-mime-spreadsheet.png cr22-action-music_32ndnote.png cr48-filesys-folder_html.png cr22-action-centrejust.png cr32-filesys-link_overlay.png cr32-action-editcopy.png crsc-mime-font.svgz cr128-mime-tar.png cr16-action-rotate_cw.png cr48-action-eraser.png cr64-mime-pk.png crsc-device-memory.svgz cr16-filesys-folder_favorite.png cr22-action-reload_page.png cr22-action-window_fullscreen.png cr16-action-configure.png cr128-mime-vcalendar.png cr22-action-view_fit_height.png cr32-action-contexthelp.png crsc-action-reload_all_tabs.svgz cr22-action-configure.png cr22-mime-vcalendar.png cr16-action-math_brace.png cr16-filesys-folder_image.png crsc-mime-source_f.svgz cr128-mime-encrypted.png cr22-device-memory_stick_mount.png cr32-action-viewmag1.png cr16-action-view_sidetree.png crsc-action-filequickprint.svgz cr32-mime-spreadsheet.png cr16-device-chardevice.png cr16-mime-source_c.png cr32-action-viewmag-.png cr128-mime-cdtrack.png cr16-mime-txt2.png cr16-mime-kchart_chrt.png cr16-mime-binary.png crsc-filesys-folder_red.svgz cr64-mime-cdimage.png crsc-filesys-exec.svgz cr22-action-leftjust.png cr32-action-window_fullscreen.png cr48-mime-source_l.png cr16-filesys-folder_violet_open.png cr32-action-mail_new.png cr48-device-sd_mmc_unmount.png cr128-filesys-folder_orange.png cr64-device-cdwriter_mount.png cr48-mime-midi.png cr48-mime-font.png cr32-mime-kformula_kfo.png cr64-device-system.png cr16-mime-font.png cr22-action-add.png crsc-device-smartmedia_mount.svgz cr22-action-view_right.png cr64-mime-document.png cr22-mime-document.png cr128-mime-tgz.png cr128-filesys-folder_grey_open.png cr32-action-text_right.png cr32-action-music_cleficon.png cr16-action-reload_all_tabs.png cr48-device-usbpendrive_unmount.png cr64-filesys-folder_green_open.png cr48-mime-image.png cr32-action-connect_creating.png cr22-filesys-folder_red_open.png cr22-action-player_stop.png crsc-mime-koffice.svgz cr64-mime-colorscm.png cr48-filesys-folder_locked.png cr48-filesys-folder_image.png cr64-mime-koffice.png cr128-mime-kexi_kexi.png cr48-action-identity.png cr22-action-view_multicolumn.png cr64-filesys-link_overlay.png cr22-mime-log.png cr32-filesys-folder_home.png cr22-device-sd_mmc_unmount.png cr16-action-find.png cr22-mime-core.png cr16-action-math_prod.png crsc-action-start.svgz cr32-action-wizard.png cr32-action-mail_reply.png cr64-device-mouse.png cr16-mime-source_h.png cr128-filesys-folder_tar.png cr22-action-run.png cr48-filesys-link_overlay.png cr32-mime-wordprocessing.png crsc-device-mo_unmount.svgz cr48-app-kttsd.png cr16-app-kmenu.png cr32-action-kdevelop_down.png cr22-action-fontsizedown.png cr16-mime-video.png cr32-action-view_bottom.png crsc-mime-message.svgz cr128-filesys-network.png cr32-action-mail_find.png crsc-device-compact_flash_unmount.svgz cr16-action-math_brackets.png cr22-mime-file_temporary.png cr48-action-bookmark.png cr48-filesys-folder_green_open.png cr22-action-move.png cr48-mime-soffice.png cr22-device-sd_mmc_mount.png cr16-action-no.png cr16-action-frame_edit.png cr16-action-filenew.png cr22-action-contexthelp.png cr48-mime-video.png cr16-action-make_kdevelop.png cr16-action-fork.png cr22-action-message_reply.png cr128-mime-postscript.png cr22-mime-deb.png cr16-app-password.png crsc-action-reload_page.svgz cr32-action-about_kde.png cr16-action-connect_creating.png crsc-mime-man.svgz cr16-action-window_new.png crsc-action-about_kde.svgz crsc-action-add.svgz cr22-filesys-www.png cr32-action-text_strike.png cr22-device-printer1.png cr48-filesys-network_local.png cr48-filesys-folder_important.png cr128-mime-karbon_karbon.png cr64-mime-kivio_flw.png cr48-filesys-exec.png cr32-action-math_prod.png cr48-mime-kword_kwd.png cr16-device-ipod_unmount.png cr16-action-attach.png cr128-mime-netscape_doc.png cr22-action-text_italic.png crsc-mime-kmultiple.svgz cr32-action-math_int.png cr128-mime-empty.png cr128-mime-recycled.png cr64-device-dvd_mount.png crsc-action-player_fwd.svgz cr32-mime-cdr.png cr22-action-mail_new.png cr32-mime-krita_kra.png cr22-device-compact_flash_unmount.png cr128-device-memory_stick_mount.png cr16-filesys-folder_grey_open.png crsc-action-player_pause.svgz cr32-action-view_sidetree.png cr16-action-fileexport.png cr32-action-rotate.png crsc-action-player_next.svgz cr64-filesys-folder_grey.png cr64-filesys-folder_orange_open.png cr32-action-editpaste.png cr48-mime-kexi_kexi.png cr32-action-player_stop.png cr32-filesys-www.png crsc-filesys-folder_blue_open.svgz cr48-device-nfs_mount.png cr16-action-mail_replylist.png cr16-action-airbrush.png cr32-action-math_onetwomatrix.png cr32-action-view_fit_height.png cr22-action-colorpicker.png cr48-device-joystick.png crsc-filesys-file_broken.svgz cr16-mime-source_y.png cr22-action-math_rsup.png cr48-mime-source.png cr22-action-rotate_cw.png cr32-action-connect_no.png cr48-filesys-trashcan_empty.png cr16-action-text_block.png cr64-device-compact_flash_unmount.png crsc-mime-cdimage.svgz cr48-mime-document2.png cr22-action-math_abs.png cr32-action-launch.png cr32-device-camera_mount.png cr32-action-make_kdevelop.png cr128-filesys-network_local.png cr48-filesys-folder_tar.png cr16-mime-readme.png cr16-filesys-folder_video.png cr32-mime-source_s.png cr64-filesys-folder_txt.png crsc-mime-make.svgz cr22-action-filequickprint.png cr22-action-showmenu.png crsc-mime-empty.svgz cr32-filesys-folder_grey.png cr16-device-dvd_mount.png cr32-device-zip_unmount.png cr32-device-sd_mmc_mount.png cr64-mime-resource.png crsc-mime-applix.svgz cr16-action-text_sub.png cr16-action-window_suppressed.png cr64-mime-log.png cr22-action-color_fill.png cr48-filesys-folder_green.png cr48-filesys-folder_violet_open.png cr22-action-math_frac.png cr32-filesys-folder_favorite.png cr64-filesys-folder_print.png cr32-mime-source_o.png cr128-filesys-folder_video.png cr16-action-music_fullnote.png cr32-action-fileimport.png cr22-mime-midi.png cr64-mime-core.png cr32-action-colorize.png cr64-filesys-folder_locked.png cr22-action-filefind.png cr32-action-view_tree.png cr64-device-hdd_mount.png cr128-action-share.png cr32-action-today.png cr32-mime-file_temporary.png cr64-filesys-folder_video.png cr32-filesys-folder_grey_open.png cr128-mime-dvi.png cr48-device-scanner.png cr32-action-math_matrix.png cr16-device-compact_flash_unmount.png cr128-device-hdd_unmount.png cr64-filesys-exec.png cr16-action-math_int.png crsc-action-reload.svgz cr32-device-dvd_unmount.png cr16-action-math_sqrt.png crsc-action-configure.svgz cr48-mime-source_f.png crsc-filesys-desktop.svgz cr32-device-compact_flash_unmount.png cr32-action-indent.png cr128-mime-document2.png cr16-action-bookmark.png crsc-mime-recycled.svgz cr32-device-cdwriter_mount.png cr32-mime-source_l.png cr48-mime-zip.png cr22-filesys-desktop.png cr48-device-cdwriter_unmount.png cr32-action-top.png cr16-action-kde5.png cr32-filesys-folder_green_open.png cr48-action-exit.png cr22-action-frame_chart.png cr16-device-usbpendrive_unmount.png cr128-filesys-folder_favorite.png cr16-action-contents.png cr16-action-frame_spreadsheet.png cr22-mime-koffice.png cr128-mime-template_source.png cr32-mime-dvi.png cr128-filesys-www.png cr22-action-reload3.png crsc-device-blockdevice.svgz crsc-mime-image.svgz cr22-action-goto.png cr16-action-math_abs.png cr22-device-compact_flash_mount.png cr32-device-5floppy_mount.png cr48-device-blockdevice.png cr48-mime-kmultiple.png cr16-action-tab_remove.png crsc-filesys-folder_man2.svgz cr48-mime-kugar_kud.png cr22-action-mouse.png crsc-mime-source_java.svgz cr22-mime-source_java.png crsc-app-kmenu.svgz crsc-action-launch.svgz crsc-device-sd_mmc_mount.svgz cr32-filesys-folder_red_open.png cr22-mime-postscript.png cr32-action-switchuser.png cr16-device-tablet.png cr48-action-colorpicker.png cr48-mime-template_source.png crsc-action-view_fit_height.svgz crsc-action-text_bold.svgz cr32-action-player_end.png crsc-mime-source_p.svgz crsc-filesys-folder_orange_open.svgz cr32-action-text_left.png cr32-app-kmenu.png cr64-app-kmenu.png cr22-action-view_remove.png cr32-action-math_brackets.png cr22-action-spellcheck.png cr32-mime-binary.png cr32-mime-cdimage.png cr22-mime-video.png cr16-filesys-desktop.png cr22-device-system.png cr32-filesys-zip_overlay.png cr48-action-rotate.png cr16-action-tab_new.png crsc-action-mail_post_to.svgz cr64-filesys-folder_orange.png cr32-action-finish.png cr64-filesys-folder_yellow.png cr16-action-1uparrow.png cr32-mime-karbon_karbon.png cr32-filesys-folder_locked.png cr32-action-viewmagfit.png cr22-action-airbrush.png crsc-mime-sound.svgz crsc-filesys-folder_cyan.svgz cr16-mime-log.png cr32-device-printer1.png cr16-action-wizard.png cr128-filesys-file_broken.png crsc-filesys-folder_sound.svgz crsc-action-player_rew.svgz cr16-action-math_rsup.png cr48-mime-source_pl.png cr32-device-pda_black.png cr32-action-viewmag.png crsc-device-cdwriter_unmount.svgz crsc-mime-rpm.svgz cr48-device-chardevice.png cr22-filesys-folder_print.png cr32-mime-vcard.png cr48-mime-source_s.png crsc-action-exit.svgz cr64-device-nfs_mount.png crsc-device-dvd_unmount.svgz cr32-action-clear_left.png cr64-mime-source_moc.png cr22-action-text_block.png cr48-mime-krita_kra.png cr48-device-mouse.png crsc-mime-source_l.svgz cr128-mime-source_s.png cr16-mime-source_java.png cr16-action-services.png crsc-mime-txt2.svgz cr22-action-mail_replylist.png cr64-device-mo_mount.png cr64-filesys-folder_html.png crsc-action-text_sub.svgz cr22-mime-source_s.png cr64-mime-source_h.png cr32-action-player_fwd.png cr48-mime-log.png cr64-filesys-network_local.png cr22-action-rebuild.png cr32-device-print_class.png cr48-action-lock.png cr22-action-unlock.png cr32-action-edittrash.png cr22-action-save_all.png crsc-action-fileclose.svgz cr16-device-print_class.png cr32-action-view_fit_window.png crsc-mime-source_c.svgz crsc-action-rotate_cw.svgz cr22-filesys-folder.png crsc-device-dvd_mount.svgz cr16-filesys-folder_inbox.png cr48-mime-cdtrack.png cr16-action-view_right.png cr64-device-camera_unmount.png cr16-action-frame_image.png crsc-device-mo_umount.svgz cr32-filesys-folder.png cr16-action-redo.png cr16-filesys-folder_outbox.png cr22-action-fill.png cr16-action-cancel.png cr32-device-joystick.png cr22-action-key_enter.png cr32-device-3floppy_mount.png cr32-mime-source_j.png cr32-action-math_lsup.png cr64-mime-quicktime.png cr22-mime-wordprocessing.png cr16-mime-source_pl.png cr16-device-usbpendrive_mount.png cr32-action-view_icon.png cr128-device-compact_flash_mount.png cr48-filesys-folder.png crsc-device-cdaudio_mount.svgz cr22-action-math_rsub.png cr48-mime-txt2.png cr64-filesys-folder_yellow_open.png cr128-mime-widget_doc.png cr16-action-mail_replyall.png cr128-filesys-folder_yellow_open.png cr16-mime-font_type1.png cr22-device-print_class.png crsc-mime-wordprocessing.svgz cr32-action-connect_established.png cr16-action-fileimport.png cr128-filesys-folder_orange_open.png cr22-mime-file_locked.png cr16-mime-source_s.png cr16-mime-source_l.png cr22-action-bookmark_folder.png crsc-filesys-folder_important.svgz cr22-mime-kexi_kexi.png cr64-mime-source_j.png cr22-mime-source_c.png cr32-action-help.png cr16-filesys-folder_home.png crsc-filesys-file_locked.svgz crsc-device-joystick.svgz cr128-mime-ascii.png crsc-action-filenew.svgz cr22-app-password.png cr16-action-mail_send.png cr128-filesys-folder_important.png crsc-filesys-pipe.svgz cr48-mime-metafont.png cr48-action-filenew.png cr22-action-gear.png cr32-action-music_flat.png cr16-action-music_cross.png crsc-device-hdd_mount.svgz cr64-filesys-folder_tar.png cr64-mime-vcalendar.png cr128-device-sd_mmc_mount.png cr32-action-math_abs.png cr16-mime-vcard.png cr16-action-kde4.png cr64-device-3floppy_unmount.png cr32-action-view_right.png cr64-device-ipod_mount.png cr22-action-reload_all_tabs.png cr64-mime-vcard.png cr64-mime-widget_doc.png cr48-mime-resource.png cr32-action-contents2.png cr48-mime-pdf.png cr32-action-view_multicolumn.png cr16-action-window_fullscreen.png cr16-mime-shellscript.png cr48-device-hdd_unmount.png cr32-action-messagebox_info.png cr48-action-up.png cr32-action-math_brace.png cr22-mime-vectorgfx.png cr48-device-dvd_mount.png cr48-mime-kivio_flw.png cr16-action-2leftarrow.png cr32-action-revert.png cr22-action-player_play.png cr48-device-zip_mount.png crsc-filesys-folder_green_open.svgz cr32-mime-recycled.png cr16-filesys-folder_orange.png cr48-action-remove.png cr32-action-player_rew.png cr22-action-finish.png cr16-device-sd_mmc_unmount.png cr16-device-scanner.png cr22-action-bookmark.png cr32-mime-source_c.png crsc-mime-source_cpp.svgz cr22-action-exec.png cr64-device-camera_mount.png cr48-filesys-folder_home2.png cr16-action-player_volume.png cr64-device-5floppy_unmount.png crsc-action-previous.svgz cr64-mime-mozilla_doc.png cr16-action-history_clear.png cr22-device-camera_mount.png crsc-device-5floppy_unmount.svgz cr16-action-music_cleficon.png cr48-mime-source_php.png cr16-action-mail_generic.png cr64-mime-rpm.png cr16-action-info.png cr16-mime-midi.png crsc-device-camera_mount.svgz crsc-mime-source_y.svgz cr128-filesys-folder_print.png cr22-filesys-folder_green.png cr16-action-paintbrush.png crsc-action-mail_new.svgz cr22-mime-netscape_doc.png cr32-filesys-network_local.png cr64-mime-make.png cr16-action-goto.png cr32-action-filequickprint.png cr22-filesys-folder_yellow_open.png cr48-mime-source_p.png cr48-action-misc.png crsc-mime-source_h.svgz cr128-app-kmenu.png cr32-mime-zip.png cr48-device-camera_unmount.png cr16-action-editpaste.png cr16-mime-resource.png cr128-filesys-lock_overlay.png cr32-action-misc.png cr22-device-ipod_unmount.png cr16-mime-quicktime.png cr32-mime-deb.png cr22-action-fileexport.png cr64-mime-source_java.png cr48-filesys-folder_home.png cr48-filesys-folder_txt.png cr16-action-mail_get.png cr48-device-compact_flash_mount.png cr16-mime-encrypted.png cr16-mime-kmultiple.png cr48-mime-applix.png cr32-mime-file_locked.png cr48-filesys-folder_outbox.png cr16-action-color_line.png cr16-mime-cdtrack.png cr32-action-identity.png cr16-device-5floppy_unmount.png cr64-filesys-folder_grey_open.png cr48-filesys-folder_orange.png cr128-device-usbpendrive_mount.png crsc-device-memory_stick_mount.svgz cr16-mime-source.png cr16-action-idea.png cr22-action-text_bold.png cr16-device-pda_blue.png cr32-action-text_super.png cr64-mime-source_f.png cr128-mime-source_o.png cr32-device-compact_flash_mount.png cr22-action-remove.png crsc-mime-readme.svgz cr16-device-zip_unmount.png cr22-action-fork.png cr48-filesys-pipe.png cr48-action-forward.png cr22-filesys-folder_orange.png cr128-device-printer1.png cr22-action-emptytrash.png cr64-mime-sound.png cr48-mime-kchart_chrt.png cr32-action-colorpicker.png cr32-app-password.png cr128-device-smart_media_mount.png cr128-filesys-folder_violet_open.png cr64-device-printer1.png cr64-filesys-folder_sound.png cr22-action-mail_post_to3.png cr22-action-colorize.png cr16-mime-krita_kra.png cr16-mime-spreadsheet.png cr16-action-view_tree.png crsc-mime-source_py.svgz cr16-action-view_fit_height.png crsc-mime-deb.svgz cr22-action-contents.png cr128-filesys-folder_man.png cr32-action-view_detailed.png cr48-device-cdrom_unmount.png cr16-action-down.png cr32-filesys-trashcan_empty.png cr22-action-text_strike.png crsc-action-wizard.svgz cr16-action-gear.png cr48-mime-kformula_kfo.png crsc-filesys-trashcan_full.svgz cr32-device-5floppy_unmount.png cr48-filesys-folder_orange_open.png cr22-action-mail_replyall.png cr32-device-cdaudio_mount.png crsc-action-next.svgz cr22-action-music_flat.png cr128-filesys-folder_image.png cr22-mime-message.png cr64-device-cdrom_mount.png crsc-action-rotate.svgz cr64-mime-applix.png cr32-mime-source_java.png cr48-mime-deb.png cr16-mime-bt.png cr64-filesys-folder_favorite.png cr128-filesys-folder_locked.png cr22-action-music_natur.png cr22-mime-pdf.png cr128-mime-source_py.png cr32-action-window_new.png cr32-mime-source_pl.png cr64-device-print_class.png cr128-device-camera_unmount.png crsc-filesys-folder_print.svgz cr16-mime-sound.png cr128-device-ipod_mount.png cr16-action-view_fit_window.png cr48-action-player_playlist.png cr22-filesys-trashcan_full.png cr32-filesys-network.png cr22-action-2rightarrow.png cr22-action-cd.png cr22-action-fileprint.png cr22-mime-source_pl.png cr64-mime-document2.png cr22-action-music_fullnote.png crsc-action-share.svgz crsc-mime-cdr.svgz cr128-mime-krita_kra.png cr32-filesys-folder_important.png cr48-action-stop.png cr16-action-inline_image.png cr64-filesys-file_broken.png cr16-filesys-network_local.png cr128-mime-midi.png cr64-device-memory_stick_unmount.png cr22-action-previous.png cr16-action-colorpicker.png cr22-mime-kugar_kud.png cr16-mime-kpresenter_kpr.png cr16-mime-cdr.png cr32-device-memory_stick_mount.png crsc-filesys-folder_home.svgz cr32-action-view_text.png crsc-action-player_eject.svgz cr22-mime-txt.png cr16-filesys-folder_tar.png cr48-mime-colorscm.png cr16-device-5floppy_mount.png cr48-action-fileprint.png cr48-device-hdd_mount.png cr32-action-text_center.png cr16-action-tab_breakoff.png cr48-mime-kpresenter_kpr.png cr32-action-mail_send.png cr48-action-add.png cr16-action-kde.png cr32-action-mail_forward.png cr16-action-mail_forward.png cr22-action-help.png cr32-action-lock.png cr64-mime-midi.png cr16-mime-kspread_ksp.png cr16-action-folder_new.png cr22-action-exit.png cr64-device-sd_mmc_unmount.png cr16-device-joystick.png cr64-mime-source_s.png cr16-action-ok.png cr32-filesys-folder_open.png cr16-filesys-folder_txt.png cr22-action-apply.png cr48-action-mail_post_to.png cr48-filesys-folder_grey_open.png cr48-filesys-folder_favorite.png cr22-action-text_center.png cr64-mime-empty.png crsc-action-fileopen.svgz cr22-action-fontsizeup.png cr128-mime-vcard.png cr32-action-button_cancel.png cr32-action-frameprint.png cr16-action-frame_formula.png cr22-mime-karbon_karbon.png cr32-action-previous.png cr48-action-contents2.png cr22-mime-pk.png cr64-device-cdwriter_unmount.png cr48-mime-sound.png cr64-device-compact_flash_mount.png cr32-action-math_sum.png crsc-device-pda_blue.svgz cr64-filesys-trashcan_full.png cr22-device-hdd_unmount.png cr22-mime-quicktime.png crsc-mime-widget_doc.svgz crsc-mime-kexi_kexi.svgz cr64-filesys-folder_violet_open.png cr48-device-tv.png cr128-mime-font_type1.png cr22-action-inline_table.png cr16-action-encrypted.png cr22-action-editdelete.png cr16-action-editshred.png cr32-mime-source_f.png cr16-action-contexthelp.png cr32-device-cdaudio_unmount.png cr64-mime-template_source.png cr32-filesys-folder_html.png cr22-action-eraser.png crsc-device-3floppy_unmount.svgz cr48-device-5floppy_unmount.png cr128-mime-zip.png cr22-mime-vcard.png cr16-mime-widget_doc.png cr128-filesys-pipe.png cr48-app-password.png cr22-action-player_pause.png cr128-filesys-folder_html.png crsc-mime-font_type1.svgz cr22-action-contents2.png crsc-device-nfs_unmount.svgz crsc-mime-soffice.svgz cr48-mime-quicktime.png cr22-mime-source_h.png cr22-action-gohome.png cr16-mime-man.png cr22-action-forward.png cr48-device-cdaudio_unmount.png cr128-mime-applix.png cr22-mime-cdtrack.png cr32-action-forward.png cr22-mime-shellscript.png cr128-device-system.png cr22-action-crop.png cr22-app-kttsd.png cr64-filesys-pipe.png cr22-action-view_text.png cr48-mime-kspread_ksp.png cr16-mime-kivio_flw.png cr16-action-tab_new_raised.png cr16-mime-empty.png cr64-mime-image.png crsc-device-3floppy_mount.svgz cr64-mime-spreadsheet.png cr22-action-1rightarrow.png cr32-filesys-folder_video.png cr22-action-folder_new.png cr64-mime-encrypted.png cr22-filesys-link_overlay.png crsc-mime-tar.svgz cr48-mime-document.png cr22-action-bottom.png crsc-mime-metafont.svgz cr32-action-reload_all_tabs.png cr64-device-joystick.png cr48-filesys-folder_red_open.png crsc-mime-source_moc.svgz cr32-action-fileopen.png cr22-device-smart_media_mount.png cr16-mime-colorscm.png cr22-mime-font_bitmap.png cr16-mime-document2.png cr16-action-editdelete.png cr64-device-usbpendrive_unmount.png cr22-action-history.png cr64-device-memory_stick_mount.png cr32-device-chardevice.png cr64-filesys-folder_home.png cr16-mime-dvi.png cr16-action-view_bottom.png cr32-action-text_bold.png cr128-mime-koffice.png cr32-mime-bt.png cr16-action-news_unsubscribe.png cr22-action-fileimport.png cr32-action-toggle_log.png crsc-action-switchuser.svgz cr48-mime-make.png cr128-mime-unknown.png crsc-mime-spreadsheet.svgz cr16-action-player_time.png cr128-mime-quicktime.png cr48-mime-cdr.png cr22-mime-mozilla_doc.png crsc-device-chardevice.svgz cr128-filesys-folder_green_open.png cr32-action-show_side_panel.png cr32-mime-shellscript.png cr16-mime-vectorgfx.png crsc-filesys-folder.svgz cr16-action-text_super.png cr16-action-locationbar_erase.png cr64-filesys-folder_open.png crsc-device-5floppy_mount.svgz cr16-action-math_paren.png crsc-filesys-folder_grey.svgz cr16-action-fileclose.png cr48-device-ipod_mount.png crsc-action-lock.svgz cr128-device-mouse.png crsc-filesys-folder_orange.svgz cr32-action-music_fullnote.png cr32-device-ipod_unmount.png cr22-mime-applix.png cr22-action-math_lsub.png cr22-filesys-folder_red.png crsc-mime-unknown.svgz cr22-app-kmenu.png crsc-device-smartmedia_unmount.svgz cr32-filesys-folder_orange.png cr22-action-back.png cr48-mime-source_j.png cr32-filesys-pipe.png cr64-device-memory.png cr128-device-usbpendrive_unmount.png cr32-action-view_choose.png cr32-action-bottom.png cr32-action-rightjust.png cr22-action-view_bottom.png crsc-device-system.svgz cr48-mime-message.png cr32-action-reload.png cr48-mime-netscape_doc.png cr22-action-reload.png cr32-mime-font_bitmap.png cr16-filesys-exec.png cr64-filesys-folder.png cr48-mime-bt.png cr48-mime-font_truetype.png cr64-device-cdrom_unmount.png cr32-mime-source_p.png cr32-action-charset.png crsc-device-printer1.svgz crsc-device-mo_mount.svgz cr64-device-chardevice.png cr32-mime-source_php.png cr16-filesys-folder_sound.png cr48-mime-gf.png cr16-device-3floppy_unmount.png cr32-action-editdelete.png cr32-mime-misc.png cr48-mime-binary.png cr22-mime-kmultiple.png cr22-action-find.png cr16-action-filequickprint.png cr32-mime-empty.png cr16-filesys-trashcan_empty.png cr128-device-print_class.png cr32-action-locationbar_erase.png cr64-device-tv.png cr16-action-clear_left.png cr16-action-frame_text.png cr32-mime-tex.png cr32-action-filesave.png cr32-filesys-folder_home2.png cr64-app-kttsd.png cr48-mime-vcard.png cr48-mime-pk.png cr16-action-filter.png cr32-mime-font_truetype.png crsc-filesys-folder_violet.svgz cr128-mime-image.png cr32-mime-midi.png cr16-action-viewmag.png cr48-filesys-server.png cr64-mime-krita_kra.png crsc-device-tablet.svgz cr32-filesys-folder_violet_open.png cr32-action-configure.png cr32-action-edit.png cr128-mime-source_c.png cr22-action-music_fermatenote.png cr22-action-view_detailed.png cr32-action-decrypted.png cr128-mime-html.png cr22-action-frame_formula.png cr32-mime-resource.png cr16-action-music_natur.png cr32-action-text_sub.png cr16-mime-template_source.png cr32-device-mouse.png cr32-action-goto.png cr22-filesys-network.png cr16-device-cdaudio_mount.png cr22-action-text_left.png crsc-device-memory_stick_unmount.svgz cr48-action-previous.png cr48-action-reload.png cr22-mime-source_moc.png cr22-action-1downarrow.png cr16-mime-make.png cr48-device-mo_unmount.png cr22-action-player_playlist.png cr128-mime-cdr.png cr64-mime-wordprocessing.png cr22-action-launch.png cr128-mime-source_pl.png cr16-action-bookmarks_list_add.png cr32-action-run.png cr64-mime-tgz.png cr32-action-apply.png cr16-action-apply.png cr128-filesys-folder_open.png crsc-device-usbpendrive_unmount.svgz cr16-mime-kexi_kexi.png cr16-action-fontsizeup.png cr128-filesys-folder_grey.png cr32-action-eraser.png cr32-mime-ascii.png cr16-filesys-trashcan_full.png cr22-mime-widget_doc.png crsc-mime-encrypted.svgz cr22-action-text_under.png cr22-action-misc.png crsc-action-player_stop.svgz cr32-action-fileclose.png cr16-action-view_choose.png cr48-device-cdwriter_mount.png cr16-action-top.png cr48-mime-source_y.png cr32-device-mo_mount.png cr48-filesys-folder_video.png cr64-mime-zip.png crsc-mime-resource.svgz cr16-action-gohome.png cr22-filesys-folder_violet.png cr16-mime-txt.png crsc-filesys-folder_man.svgz cr16-action-player_stop.png cr16-action-player_pause.png cr22-device-smart_media_unmount.png cr128-mime-soffice.png cr22-action-rightjust.png cr128-mime-source_moc.png cr16-mime-karbon_karbon.png cr22-action-bookmark_add.png cr48-device-memory_stick_mount.png cr16-action-mail_reply.png cr64-mime-ascii.png crsc-mime-kugardata.svgz cr32-mime-tgz.png cr22-action-compfile.png cr22-action-inline_image.png cr64-action-share.png cr16-mime-gettext.png cr22-mime-unknown.png cr48-device-memory.png cr16-action-show_side_panel.png cr32-mime-metafont.png cr48-action-wizard.png cr22-mime-exec_wine.png cr16-action-exec.png cr16-action-forward.png cr32-action-window_nofullscreen.png cr32-action-text_under.png cr128-mime-source_php.png cr32-mime-rpm.png cr32-action-queue.png cr128-action-fileopen.png cr48-action-mail_new.png crsc-action-mail_get.svgz crsc-mime-quicktime.svgz cr48-filesys-folder_red.png cr48-action-rotate_cw.png cr16-action-player_start.png cr22-action-bookmarks_list_add.png cr16-action-misc.png cr22-mime-make.png cr64-device-blockdevice.png cr22-action-color_line.png crsc-device-camera_unmount.svgz cr16-mime-wordprocessing.png cr128-mime-font_truetype.png cr48-mime-shellscript.png cr128-filesys-trashcan_full.png cr22-device-camera_unmount.png cr64-device-sd_mmc_mount.png cr16-action-signature.png cr16-action-math_lsup.png cr32-action-redo.png cr32-action-filefind.png cr48-device-smart_media_unmount.png cr64-device-pda_black.png cr22-action-view_fit_window.png cr16-action-configure_shortcuts.png cr64-action-favorites.png cr16-action-kde6.png cr64-device-scanner.png cr48-mime-core.png cr32-action-rotate_ccw.png cr16-device-cdrom_unmount.png cr22-action-filesaveas.png cr64-filesys-folder_red_open.png cr16-action-halfencrypted.png cr128-device-ipod_unmount.png cr22-mime-source_y.png cr32-device-smart_media_unmount.png crsc-filesys-exec_wine.svgz cr32-action-mouse.png cr32-mime-postscript.png cr32-device-memory.png cr22-mime-kivio_flw.png cr16-app-kttsd.png cr22-action-math_matrix.png cr16-action-bookmark_toolbar.png cr48-mime-cdimage.png crsc-mime-exec_wine.svgz cr128-mime-deb.png cr16-mime-source_o.png cr32-action-save_all.png cr16-filesys-server.png cr48-action-reload_all_tabs.png cr22-action-mail_post_to.png cr16-filesys-folder_green_open.png cr48-mime-rpm.png cr16-action-music_halfnote.png cr22-action-start.png cr48-mime-source_h.png cr16-device-blockdevice.png cr32-device-pda_blue.png cr16-mime-source_cpp.png cr48-mime-spreadsheet.png cr32-action-contents.png cr32-filesys-folder_yellow.png cr48-device-print_class.png cr16-action-text_bold.png cr128-device-smart_media_unmount.png cr16-action-start.png cr22-action-2downarrow.png cr22-action-text.png cr22-action-editcopy.png cr16-action-1rightarrow.png cr48-mime-unknown.png cr128-mime-log.png cr32-action-music_eightnote.png cr64-filesys-folder_crystal.png cr128-mime-source_java.png crsc-mime-document2.svgz cr22-action-player_end.png cr16-device-mo_mount.png cr16-filesys-folder_crystal.png cr32-action-math_sqrt.png cr16-action-key_enter.png cr64-mime-bt.png cr32-action-bookmark_toolbar.png cr16-mime-message.png cr32-filesys-folder_yellow_open.png crsc-filesys-folder_yellow.svgz cr48-device-pda_blue.png cr64-device-cdaudio_unmount.png cr64-mime-pdf.png cr16-action-math_frac.png cr32-action-bookmark_add.png crsc-device-tv.svgz cr22-device-ipod_mount.png cr22-filesys-trashcan_empty.png cr64-mime-tar.png cr16-action-inline_table.png crsc-filesys-folder_image.svgz cr48-device-3floppy_unmount.png Makefile.am cr22-mime-source_f.png cr16-filesys-folder_sent_mail.png cr48-filesys-ftp.png cr128-mime-source_l.png cr16-action-up.png cr64-mime-soffice.png cr32-action-editcut.png cr32-mime-man.png cr16-filesys-folder_green.png cr22-action-math_sqrt.png cr16-action-undo.png cr22-action-news_unsubscribe.png cr22-action-editclear.png cr16-action-frameprint.png cr128-mime-shellscript.png crsc-filesys-trashcan_empty.svgz cr32-action-gear.png cr22-action-mail_send.png cr22-action-stop.png cr22-mime-recycled.png cr64-mime-vectorgfx.png cr22-action-viewmag-.png cr16-action-view_detailed.png cr16-device-camera_mount.png crsc-filesys-network.svgz cr32-action-music_natur.png cr48-action-kde.png cr48-filesys-lock_overlay.png cr32-action-remove.png cr22-action-frame_spreadsheet.png cr32-action-button_ok.png cr48-filesys-folder_open.png crsc-action-rotate_ccw.svgz cr32-action-attach.png cr32-action-exec.png crsc-mime-netscape_doc.svgz cr22-mime-txt2.png cr22-action-redo.png cr64-filesys-folder_violet.png cr64-mime-source_o.png cr16-filesys-folder_red_open.png cr22-action-filesave.png cr16-action-view_text.png cr48-mime-misc.png cr22-action-mail_forward.png cr64-mime-binary.png cr48-filesys-zip_overlay.png cr16-action-kde3.png crsc-mime-html.svgz cr16-device-compact_flash_mount.png cr128-filesys-folder_home.png cr32-action-compfile.png cr22-action-revert.png cr128-mime-info.png crsc-action-text_italic.svgz cr48-mime-exec_wine.png cr32-mime-source_y.png cr16-action-identity.png cr16-action-rotate_ccw.png cr32-device-nfs_unmount.png cr22-action-connect_no.png cr32-app-kttsd.png cr32-filesys-ftp.png cr32-action-encrypted.png cr32-action-mail_delete.png cr48-filesys-network.png cr22-device-usbpendrive_unmount.png cr32-action-player_start.png cr16-filesys-folder_violet.png cr22-action-toggle_log.png cr22-action-math_onetwomatrix.png crsc-mime-document.svgz cr22-action-identity.png cr16-action-decrypted.png cr64-mime-message.png cr22-action-viewmagfit.png cr22-mime-sound.png cr48-filesys-folder_inbox.png crsc-filesys-temporary.svgz cr16-action-crop.png cr32-mime-kword_kwd.png cr16-mime-ascii.png cr22-action-math_brackets.png cr22-action-math_sum.png crsc-action-colorpicker.svgz cr32-device-tv.png cr32-action-start.png cr128-mime-font_bitmap.png cr16-action-edit.png cr16-action-2uparrow.png cr16-filesys-folder_red.png cr16-mime-netscape_doc.png cr32-action-music_halfnote.png cr32-action-mail_get.png crsc-filesys-folder_tar.svgz cr128-mime-document.png cr64-device-3floppy_mount.png cr16-action-view_top_bottom.png crsc-mime-source_j.svgz cr22-mime-ascii.png Makefile.in crsc-mime-file_locked.svgz cr64-filesys-folder_red.png cr22-mime-html.png cr22-filesys-folder_open.png cr64-filesys-www.png crsc-mime-source_pl.svgz crsc-mime-vcalendar.svgz cr22-device-joystick.png cr128-mime-colorscm.png cr16-action-run.png cr48-action-gohome.png cr32-action-filter.png crsc-device-cdrom_unmount.svgz cr22-action-rotate.png cr16-action-queue.png cr128-device-sd_mmc_unmount.png cr32-filesys-exec.png cr48-mime-tar.png cr16-filesys-folder_yellow_open.png cr22-action-2leftarrow.png cr22-action-mail_get.png cr48-mime-vcalendar.png cr22-device-usbpendrive_mount.png cr48-mime-widget_doc.png cr16-action-unlock.png cr32-mime-log.png crsc-filesys-home_blue.svgz cr16-mime-vcalendar.png cr16-action-1downarrow.png cr128-mime-rpm.png cr22-action-filter.png cr128-filesys-folder_green.png cr128-filesys-zip_overlay.png cr32-filesys-folder_orange_open.png cr128-mime-binary.png cr22-action-charset.png cr16-action-stamp.png cr16-filesys-folder_man.png cr32-action-folder_new.png cr22-action-text_super.png cr16-action-mail_find.png cr16-action-bottom.png cr128-mime-message.png cr22-action-today.png cr22-action-button_ok.png cr64-mime-kugar_kud.png cr32-filesys-folder_tar.png cr64-mime-font.png cr32-action-project_open.png cr16-action-2downarrow.png cr22-mime-man.png cr16-mime-source_moc.png cr16-device-cdrom_mount.png cr48-mime-readme.png cr22-action-window_nofullscreen.png cr16-device-cdaudio_unmount.png cr64-mime-postscript.png cr16-device-smart_media_mount.png crsc-action-stop.svgz crsc-action-remove.svgz cr16-action-pencil.png cr16-action-launch.png crsc-mime-txt.svgz cr48-device-memory_stick_unmount.png crsc-action-contents2.svgz cr32-filesys-folder_sound.png cr128-filesys-folder_violet.png cr22-action-math_int.png cr64-mime-source_l.png cr32-filesys-lock_overlay.png cr64-device-hdd_unmount.png cr32-mime-readme.png cr48-action-launch.png crsc-mime-binary.svgz cr32-action-editshred.png crsc-mime-colorscm.svgz cr64-mime-tex.png cr48-mime-vectorgfx.png cr22-action-viewmag.png cr16-mime-font_truetype.png cr128-mime-gf.png cr128-mime-source_p.png cr16-filesys-folder_print.png crsc-device-zip_mount.svgz cr16-action-mail_post_to.png cr32-mime-pk.png cr16-device-system.png cr64-mime-source_p.png crsc-mime-pdf.svgz cr16-mime-source_f.png cr16-action-add.png cr32-mime-kivio_flw.png cr22-filesys-folder_violet_open.png cr22-action-editshred.png cr32-device-tablet.png cr16-action-1leftarrow.png crsc-filesys-folder_cyan_open.svgz cr22-action-math_lsup.png cr16-action-filesave.png cr16-device-zip_mount.png cr22-action-edittrash.png cr128-mime-spreadsheet.png cr32-action-unindent.png cr16-device-ipod_mount.png cr128-filesys-folder_sound.png cr32-mime-source_moc.png cr64-mime-kword_kwd.png cr16-action-text_under.png cr16-mime-font_bitmap.png cr32-action-music_32ndnote.png cr16-mime-pdf.png cr16-device-mouse.png cr22-mime-encrypted.png cr22-action-paintbrush.png cr16-action-rebuild.png cr16-action-kde1.png cr32-mime-unknown.png cr22-action-fileclose.png cr22-action-next.png cr22-mime-tar.png cr16-action-player_eject.png cr48-mime-postscript.png cr48-mime-koffice.png cr16-action-stop.png cr16-action-fontsizedown.png cr16-action-player_rew.png cr32-action-filenew.png cr48-action-indent.png cr16-action-math_onetwomatrix.png cr16-action-connect_established.png cr16-action-editcut.png cr32-mime-font.png cr64-mime-karbon_karbon.png cr48-action-down.png cr32-action-unlock.png cr16-device-sd_mmc_mount.png cr48-filesys-folder_sound.png cr32-mime-vcalendar.png cr32-action-back.png cr48-filesys-folder_crystal.png cr16-action-view_left_right.png cr16-mime-document.png cr32-action-view_remove.png cr16-action-text_italic.png cr64-filesys-folder_green.png cr128-filesys-desktop.png cr128-mime-video.png cr48-device-pda_black.png cr22-action-frameprint.png cr22-mime-font_type1.png crsc-device-compact_flash_mount.svgz cr22-action-viewmag+.png cr16-mime-html.png cr32-mime-txt.png cr32-filesys-folder_violet.png cr32-action-mail_replyall.png cr32-filesys-folder_image.png cr22-device-3floppy_mount.png cr48-filesys-folder_grey.png cr32-device-hdd_mount.png cr32-mime-kchart_chrt.png crsc-device-cdrom_mount.svgz cr16-action-tab_duplicate.png cr32-mime-message.png cr22-action-frame_query.png crsc-action-mail_generic.svgz cr22-action-clear_left.png cr22-mime-font_truetype.png cr16-action-music_flat.png cr48-device-camera_mount.png cr22-action-frame_image.png crsc-action-view_fit_width.svgz cr16-action-thumbnail.png cr32-mime-soffice.png crsc-action-up.svgz cr48-device-system.png cr22-action-idea.png cr48-mime-font_bitmap.png cr48-filesys-trashcan_full.png cr32-mime-vectorgfx.png cr32-action-halfencrypted.png cr48-mime-dvi.png cr48-mime-mozilla_doc.png cr16-action-player_playlist.png cr32-mime-core.png cr32-mime-source_cpp.png cr16-filesys-folder_open.png cr64-filesys-zip_overlay.png cr32-mime-colorscm.png crsc-device-cdaudio_unmount.svgz cr16-action-music_dottednote.png cr64-mime-source_py.png cr16-action-next.png cr16-mime-image.png cr48-mime-recycled.png cr16-action-mail_new.png cr32-action-view_fit_width.png cr16-action-openterm.png cr64-mime-kpresenter_kpr.png cr64-device-usbpendrive_mount.png cr32-mime-document2.png cr48-action-switchuser.png cr22-mime-binary.png cr32-filesys-folder_man.png cr16-action-tab_remove_other.png cr16-action-colorize.png crsc-mime-tex.svgz cr22-mime-tex.png cr16-action-bookmark_add.png cr16-mime-recycled.png cr128-mime-kmultiple.png cr32-action-find.png cr22-mime-font.png crsc-mime-postscript.svgz crsc-mime-core.svgz cr64-mime-kspread_ksp.png cr16-action-viewmagfit.png crsc-device-sd_mmc_unmount.svgz cr64-device-pda_blue.png cr16-device-camera_unmount.png cr22-mime-kspread_ksp.png cr32-action-spellcheck.png cr22-action-fileopen.png cr128-filesys-trashcan_empty.png cr32-action-music_quarternote.png cr22-action-text_sub.png cr64-mime-source_cpp.png cr32-filesys-folder_crystal.png cr64-device-ipod_unmount.png cr32-action-signature.png cr128-mime-core.png cr128-device-hdd_mount.png cr22-action-mail_generic.png cr64-device-5floppy_mount.png cr64-filesys-trashcan_empty.png cr64-mime-info.png cr64-device-mo_unmount.png cr64-filesys-lock_overlay.png cr32-action-text_italic.png cr22-action-folder.png cr22-action-editpaste.png cr64-device-smart_media_unmount.png cr22-action-locationbar_erase.png cr16-action-bookmark_folder.png cr16-action-project_open.png cr128-filesys-folder_red_open.png crsc-mime-mozilla_doc.svgz cr32-mime-image.png cr32-device-camera_unmount.png cr16-action-view_fit_width.png cr32-mime-netscape_doc.png cr22-action-1uparrow.png crsc-filesys-zip_overlay.svgz cr32-mime-cdtrack.png cr22-action-undo.png cr32-action-rebuild.png cr48-filesys-folder_yellow_open.png cr22-action-down.png cr22-action-news_subscribe.png cr32-filesys-folder_red.png cr32-mime-source_h.png cr48-mime-source_java.png cr64-mime-netscape_doc.png cr128-filesys-folder_crystal.png cr16-action-transform.png cr128-mime-txt2.png cr16-action-viewmag-.png cr16-device-dvd_unmount.png cr32-mime-applix.png cr32-action-reload_page.png cr32-mime-info.png cr32-device-zip_mount.png cr64-device-zip_unmount.png cr16-action-today.png crsc-mime-gf.svgz cr16-action-completion.png cr64-device-tablet.png cr22-device-3floppy_unmount.png cr32-device-ipod_mount.png cr64-mime-txt.png cr16-device-memory.png cr32-action-viewmag+.png cr48-mime-font_type1.png cr16-mime-kugar_kud.png cr48-device-printer1.png crsc-action-text_under.svgz cr32-action-undo.png cr16-filesys-pipe.png cr48-action-next.png cr32-filesys-folder_print.png cr16-mime-zip.png cr48-mime-empty.png cr22-action-view_sidetree.png cr22-mime-metafont.png cr32-action-messagebox_warning.png cr22-action-2uparrow.png cr16-action-player_fwd.png cr32-action-openterm.png cr22-action-openterm.png crsc-mime-font_truetype.svgz cr128-mime-man.png crsc-action-view_fit_window.svgz cr16-action-configure_toolbars.png cr22-action-show_side_panel.png cr32-device-dvd_mount.png cr32-mime-sound.png cr22-action-kde.png cr64-mime-metafont.png crsc-action-player_play.svgz crsc-action-top.svgz cr48-filesys-folder_man.png cr128-filesys-folder.png cr32-action-up.png cr128-device-memory_stick_unmount.png cr128-mime-sound.png cr22-action-math_prod.png crsc-filesys-folder_open.svgz cr22-action-editcut.png cr48-mime-tgz.png cr22-action-music_cleficon.png cr22-mime-source_cpp.png crsc-filesys-www.svgz cr32-action-editclear.png cr48-mime-wordprocessing.png cr64-mime-font_bitmap.png cr22-action-view_tree.png cr22-action-share.png cr48-mime-source_py.png cr64-filesys-folder_man.png cr22-action-1leftarrow.png cr128-device-camera_mount.png cr32-filesys-folder_txt.png cr48-device-zip_unmount.png cr22-action-music_cross.png cr32-action-math_rsup.png cr128-action-launch.png cr16-mime-tex.png cr48-device-nfs_unmount.png cr22-mime-colorscm.png cr32-mime-quicktime.png cr64-filesys-folder_image.png cr16-mime-unknown.png cr32-device-smart_media_mount.png crsc-action-player_start.svgz cr16-mime-applix.png cr128-mime-mozilla_doc.png cr32-mime-source_py.png crsc-action-gohome.svgz cr128-mime-vectorgfx.png cr16-mime-gf.png cr32-action-kde.png crsc-device-cdwriter_mount.svgz cr22-action-attach.png cr16-action-text_right.png cr16-action-contents2.png cr16-device-smart_media_unmount.png cr22-filesys-folder_home.png cr16-filesys-link_overlay.png cr22-mime-source.png cr48-device-5floppy_mount.png cr64-device-dvd_unmount.png cr22-action-math_paren.png crsc-filesys-services.svgz cr64-mime-kchart_chrt.png cr16-action-math_matrix.png cr48-device-cdaudio_mount.png cr16-device-hdd_unmount.png cr32-action-math_frac.png cr16-action-switchuser.png cr16-action-compfile.png cr32-mime-kmultiple.png cr128-device-blockdevice.png cr48-device-compact_flash_unmount.png 
+KDE_DIST=cr32-device-system.png cr32-device-usbpendrive_unmount.png crsc-device-ipod_unmount.svgz cr16-action-history.png cr16-action-math_lsub.png cr32-action-fileprint.png crsc-filesys-folder_favorite.svgz cr32-mime-template_source.png crsc-mime-zip.svgz cr16-action-about_kde.png cr32-action-mail_post_to.png cr48-action-rotate_ccw.png cr16-mime-tar.png cr64-mime-exec_wine.png cr16-device-hdd_mount.png cr64-mime-source_y.png cr48-device-cdrom_mount.png cr32-mime-exec_wine.png cr22-action-player_eject.png cr22-mime-tgz.png cr32-action-text_block.png crsc-device-zip_unmount.svgz cr32-action-messagebox_critical.png cr32-device-mo_unmount.png cr16-device-tv.png cr48-mime-info.png cr32-action-player_eject.png cr64-mime-shellscript.png cr22-mime-soffice.png cr16-device-printer1.png crsc-action-eraser.svgz cr22-action-math_brace.png cr32-filesys-file_broken.png crsc-mime-video.svgz cr16-action-move.png cr22-action-window_new.png cr128-mime-misc.png cr32-action-leftjust.png cr48-device-ipod_unmount.png cr16-action-music_32ndnote.png cr16-action-2rightarrow.png cr64-mime-html.png crsc-device-print_class.svgz cr48-mime-html.png cr16-action-help.png cr22-action-connect_creating.png cr64-filesys-network.png crsc-filesys-home_white.svgz cr16-action-editclear.png cr16-device-3floppy_mount.png cr16-filesys-folder_grey.png cr22-action-music_quarternote.png cr16-filesys-folder_important.png cr64-device-smart_media_mount.png cr32-device-cdwriter_unmount.png cr48-mime-source_o.png crsc-filesys-folder_locked.svgz cr64-mime-cdr.png cr48-action-frameprint.png cr48-mime-encrypted.png cr32-mime-make.png cr22-action-thumbnail.png cr128-filesys-folder_yellow.png crsc-mime-source.svgz cr16-action-news_subscribe.png cr22-device-memory_stick_unmount.png cr48-action-share.png crsc-mime-cdtrack.svgz cr22-filesys-folder_grey.png cr32-filesys-desktop.png cr16-mime-postscript.png cr32-mime-pdf.png cr16-action-text.png cr22-mime-source_o.png cr16-mime-news.png cr128-mime-source_h.png crsc-filesys-folder_green.svgz cr16-action-filefind.png crsc-action-fileprint.svgz cr22-action-mail_find.png cr32-action-next.png cr64-mime-video.png cr64-mime-gf.png cr16-action-save_all.png cr48-mime-txt.png cr128-mime-metafont.png cr48-device-3floppy_mount.png cr16-device-pda_black.png cr128-mime-source.png cr48-filesys-folder_violet.png cr22-device-cdaudio_unmount.png cr22-mime-empty.png crsc-action-back.svgz cr32-action-bookmark_folder.png cr22-mime-info.png cr22-action-mail_new3.png cr64-mime-cdtrack.png crsc-mime-image2.svgz cr128-mime-source_f.png cr48-action-reload_page.png cr16-mime-misc.png cr16-action-player_play.png cr128-filesys-link_overlay.png cr22-action-mail_delete.png cr32-action-view_top_bottom.png cr22-action-button_cancel.png cr22-mime-kformula_kfo.png cr32-action-share.png crsc-action-bottom.svgz cr32-mime-gf.png cr16-action-window_nofullscreen.png cr16-filesys-folder_html.png cr64-device-nfs_unmount.png cr16-action-player_end.png cr16-action-fileopen.png cr128-app-password.png cr64-mime-source_php.png cr48-mime-source_moc.png cr22-action-make_kdevelop.png cr22-action-encrypted.png cr48-device-tablet.png cr16-action-filesaveas.png cr48-device-mo_mount.png crsc-mime-source_o.svgz cr48-filesys-file_broken.png cr64-action-player_play.png cr48-action-back.png cr32-action-view_left_right.png cr32-device-memory_stick_unmount.png cr16-mime-pk.png cr128-mime-cdimage.png cr64-device-cdaudio_mount.png cr48-action-filequickprint.png cr16-action-text_center.png cr22-action-pencil.png cr128-mime-pdf.png cr32-mime-tar.png crsc-action-finish.svgz cr64-mime-misc.png crsc-device-hdd_unmount.svgz cr128-mime-font.png cr16-action-eraser.png cr22-action-filenew.png cr32-action-music_sixteenthnote.png cr16-action-view_remove.png cr16-action-fileprint.png cr22-mime-document2.png cr32-action-music_dottednote.png cr128-mime-make.png cr64-mime-source_pl.png crsc-action-down.svgz cr48-device-usbpendrive_mount.png cr32-action-music_fermatenote.png crsc-device-scanner.svgz cr16-action-flag.png cr22-filesys-zip_overlay.png cr22-action-rotate_ccw.png cr16-action-text_strike.png cr22-action-text_right.png cr32-mime-widget_doc.png cr22-action-blend.png crsc-mime-karbon_karbon.svgz cr22-action-lock.png cr22-mime-zip.png cr128-mime-source_cpp.png cr22-mime-bt.png cr22-action-music_halfnote.png cr64-mime-dvi.png cr16-action-lock.png cr32-mime-html.png crsc-device-nfs_mount.svgz cr22-action-view_choose.png cr16-action-remove.png cr22-action-translate.png cr64-mime-man.png cr32-action-down.png cr22-mime-source_j.png cr16-action-blend.png cr48-filesys-folder_print.png cr22-mime-krita_kra.png cr22-mime-image.png cr16-filesys-zip_overlay.png crsc-filesys-network_local.svgz cr16-action-tab_new_bg.png cr48-mime-gettext.png cr32-action-bookmark.png crsc-filesys-folder_blue.svgz crsc-action-text_bild.svgz cr16-action-music_eightnote.png cr22-action-edit.png cr22-action-project_open.png cr48-filesys-folder_yellow.png cr128-mime-wordprocessing.png cr16-filesys-folder_locked.png cr64-mime-txt2.png crsc-mime-ascii.svgz cr128-mime-readme.png cr22-action-music_dottednote.png cr48-device-sd_mmc_mount.png cr16-device-nfs_mount.png cr22-filesys-folder_orange_open.png cr22-mime-kword_kwd.png cr16-filesys-folder_yellow.png crsc-mime-source_s.svgz cr22-action-mail_reply.png cr32-mime-txt2.png cr32-device-usbpendrive_mount.png cr16-filesys-folder_orange_open.png cr16-mime-core.png cr32-action-stop.png cr128-mime-resource.png cr16-filesys-lock_overlay.png cr128-mime-pk.png cr16-mime-kword_kwd.png cr22-action-queue.png crsc-device-ipod_mount.svgz cr16-action-exit.png crsc-action-forward.svgz cr48-mime-man.png cr32-device-blockdevice.png cr16-action-viewmag+.png cr64-mime-source.png crsc-filesys-lock_overlay.svgz crsc-mime-dvi.svgz cr22-mime-kpresenter_kpr.png cr32-device-nfs_mount.png cr16-action-revert.png cr32-action-hibernate.png cr22-mime-source_l.png cr22-action-view_left_right.png cr32-action-exit.png crsc-mime-pk.svgz cr22-action-up.png cr16-action-share.png cr16-mime-source_php.png cr32-mime-font_type1.png cr16-action-translate.png cr16-device-memory_stick_unmount.png cr64-mime-deb.png cr32-action-music_cross.png cr16-action-finish.png cr128-device-compact_flash_unmount.png cr16-action-text_left.png cr64-mime-kmultiple.png cr64-filesys-desktop.png cr16-mime-rpm.png cr16-action-reload.png cr64-mime-readme.png cr22-mime-rpm.png cr16-filesys-folder.png cr64-device-zip_mount.png cr48-app-kmenu.png crsc-app-kttsd.svgz cr32-mime-document.png cr32-mime-video.png cr128-filesys-folder_home2.png cr16-device-cdwriter_unmount.png cr22-action-halfencrypted.png cr22-action-switchuser.png cr48-filesys-www.png cr16-mime-exec_wine.png crsc-device-pda_black.svgz cr128-mime-exec_wine.png cr32-action-bookmarks_list_add.png cr16-action-reload_page.png cr64-mime-kformula_kfo.png cr16-action-view_multicolumn.png cr32-action-centrejust.png cr16-action-spellcheck.png cr32-device-sd_mmc_unmount.png cr48-device-smart_media_mount.png crsc-action-text_super.svgz crsc-action-frameprint.svgz cr128-mime-bt.png cr16-mime-kformula_kfo.png cr48-mime-source_c.png cr22-mime-source_py.png cr22-action-hibernate.png cr32-device-cdrom_unmount.png cr22-mime-dvi.png cr16-action-emptytrash.png cr16-action-music_fermatenote.png cr32-action-fonts.png cr16-action-fill.png cr64-mime-unknown.png cr32-action-add.png cr22-action-viewmag1.png cr32-mime-kpresenter_kpr.png crsc-device-mouse.svgz cr16-mime-metafont.png cr32-action-blend.png cr16-action-music_sixteenthnote.png cr22-mime-source_p.png cr48-action-gear.png cr128-filesys-folder_red.png cr22-action-player_rew.png crsc-mime-vectorgfx.svgz cr64-app-password.png cr48-mime-ascii.png index.theme cr22-mime-kchart_chrt.png cr16-filesys-file_broken.png crsc-filesys-folder_yellow_open.svgz cr64-filesys-folder_important.png crsc-mime-shellscript.svgz cr22-filesys-folder_grey_open.png cr16-action-charset.png crsc-mime-source_php.svgz cr128-device-chardevice.png cr64-mime-source_c.png cr32-action-math_lsub.png cr16-action-music_quarternote.png crsc-mime-vcard.svgz cr64-mime-font_type1.png crsc-filesys-folder_violet_open.svgz crsc-mime-font_bitmap.svgz cr22-action-player_fwd.png cr16-action-edittrash.png cr16-device-memory_stick_mount.png cr16-action-rotate.png cr16-action-connect_no.png cr16-action-frame_query.png cr22-action-about_kde.png cr16-action-math_rsub.png cr16-mime-info.png cr48-action-unindent.png cr128-mime-tex.png cr48-action-fileclose.png cr22-action-music_sixteenthnote.png cr22-mime-gf.png cr16-filesys-folder_home2.png crsc-filesys-folder_html.svgz cr32-mime-source.png cr22-filesys-folder_green_open.png cr32-action-math_paren.png cr32-mime-kugar_kud.png cr32-action-math_rsub.png cr128-mime-source_j.png cr22-action-view_fit_width.png cr128-filesys-exec.png cr128-mime-source_y.png cr48-device-dvd_unmount.png cr16-mime-deb.png crsc-filesys-folder_txt.svgz cr32-filesys-folder_green.png crsc-filesys-file_important.svgz cr22-action-connect_established.png crsc-filesys-folder_red_open.svgz cr22-action-frame_text.png cr48-mime-karbon_karbon.png cr16-action-back.png crsc-mime-tgz.svgz cr128-filesys-folder_txt.png cr32-mime-kspread_ksp.png crsc-mime-log.svgz cr64-action-fileopen.png cr16-action-viewmag1.png cr22-action-decrypted.png crsc-action-text_strike.svgz cr22-mime-news.png cr22-action-wizard.png cr16-mime-tgz.png cr32-action-player_pause.png cr16-filesys-network.png cr32-action-mail_generic.png cr22-action-view_icon.png cr16-filesys-www.png cr22-filesys-folder_yellow.png cr16-action-math_sum.png crsc-action-info.svgz cr48-filesys-desktop.png cr48-mime-tex.png cr16-action-editcopy.png cr32-action-rotate_cw.png cr32-action-mail_replylist.png cr32-device-hdd_unmount.png cr22-action-music_eightnote.png cr64-mime-font_truetype.png crsc-mime-file_temporary.svgz cr22-mime-readme.png cr32-action-gohome.png cr16-mime-source_py.png cr48-mime-source_cpp.png cr128-app-kttsd.png cr22-action-view_top_bottom.png cr22-mime-cdimage.png cr16-mime-cdimage.png cr64-filesys-folder_home2.png cr16-action-previous.png cr16-device-cdwriter_mount.png cr32-device-scanner.png cr32-mime-kexi_kexi.png cr22-action-top.png cr16-action-view_icon.png cr32-action-emptytrash.png cr22-action-signature.png cr16-device-mo_unmount.png cr22-action-player_start.png cr32-device-3floppy_unmount.png cr32-action-filesaveas.png cr32-mime-gettext.png cr22-device-hdd_mount.png cr32-action-player_play.png cr16-device-nfs_unmount.png crsc-filesys-link_overlay.svgz cr16-action-color_fill.png cr32-device-cdrom_mount.png cr16-filesys-ftp.png cr22-action-frame_edit.png cr128-mime-txt.png cr64-mime-recycled.png crsc-device-usbpendrive_mount.svgz cr32-filesys-trashcan_full.png cr32-action-player_playlist.png cr22-mime-spreadsheet.png cr22-action-music_32ndnote.png cr48-filesys-folder_html.png cr22-action-centrejust.png cr32-filesys-link_overlay.png cr32-action-editcopy.png crsc-mime-font.svgz cr128-mime-tar.png cr16-action-rotate_cw.png cr48-action-eraser.png cr64-mime-pk.png crsc-device-memory.svgz cr16-filesys-folder_favorite.png cr22-action-reload_page.png cr22-action-window_fullscreen.png cr16-action-configure.png cr128-mime-vcalendar.png cr22-action-view_fit_height.png cr32-action-contexthelp.png crsc-action-reload_all_tabs.svgz cr22-action-configure.png cr22-mime-vcalendar.png cr16-action-math_brace.png cr16-filesys-folder_image.png crsc-mime-source_f.svgz cr128-mime-encrypted.png cr22-device-memory_stick_mount.png cr32-action-viewmag1.png cr16-action-view_sidetree.png crsc-action-filequickprint.svgz cr32-mime-spreadsheet.png cr16-device-chardevice.png cr16-mime-source_c.png cr32-action-viewmag-.png cr128-mime-cdtrack.png cr16-mime-txt2.png cr16-mime-kchart_chrt.png cr16-mime-binary.png crsc-filesys-folder_red.svgz cr64-mime-cdimage.png crsc-filesys-exec.svgz cr22-action-leftjust.png cr32-action-window_fullscreen.png cr48-mime-source_l.png cr16-filesys-folder_violet_open.png cr32-action-mail_new.png cr48-device-sd_mmc_unmount.png cr128-filesys-folder_orange.png cr64-device-cdwriter_mount.png cr48-mime-midi.png cr48-mime-font.png cr32-mime-kformula_kfo.png cr64-device-system.png cr16-mime-font.png cr22-action-add.png crsc-device-smartmedia_mount.svgz cr22-action-view_right.png cr64-mime-document.png cr22-mime-document.png cr128-mime-tgz.png cr128-filesys-folder_grey_open.png cr32-action-text_right.png cr32-action-music_cleficon.png cr16-action-reload_all_tabs.png cr48-device-usbpendrive_unmount.png cr64-filesys-folder_green_open.png cr48-mime-image.png cr32-action-connect_creating.png cr22-filesys-folder_red_open.png cr22-action-player_stop.png crsc-mime-koffice.svgz cr64-mime-colorscm.png cr48-filesys-folder_locked.png cr48-filesys-folder_image.png cr64-mime-koffice.png cr128-mime-kexi_kexi.png cr48-action-identity.png cr22-action-view_multicolumn.png cr64-filesys-link_overlay.png cr22-mime-log.png cr32-filesys-folder_home.png cr22-device-sd_mmc_unmount.png cr16-action-find.png cr22-mime-core.png cr16-action-math_prod.png crsc-action-start.svgz cr32-action-wizard.png cr32-action-mail_reply.png cr64-device-mouse.png cr16-mime-source_h.png cr128-filesys-folder_tar.png cr22-action-run.png cr48-filesys-link_overlay.png cr32-mime-wordprocessing.png crsc-device-mo_unmount.svgz cr48-app-kttsd.png cr16-app-kmenu.png cr32-action-kdevelop_down.png cr22-action-fontsizedown.png cr16-mime-video.png cr32-action-view_bottom.png crsc-mime-message.svgz cr128-filesys-network.png cr32-action-mail_find.png crsc-device-compact_flash_unmount.svgz cr16-action-math_brackets.png cr22-mime-file_temporary.png cr48-action-bookmark.png cr48-filesys-folder_green_open.png cr22-action-move.png cr48-mime-soffice.png cr22-device-sd_mmc_mount.png cr16-action-no.png cr16-action-frame_edit.png cr16-action-filenew.png cr22-action-contexthelp.png cr48-mime-video.png cr16-action-make_kdevelop.png cr16-action-fork.png cr22-action-message_reply.png cr128-mime-postscript.png cr22-mime-deb.png cr16-app-password.png crsc-action-reload_page.svgz cr32-action-about_kde.png cr16-action-connect_creating.png crsc-mime-man.svgz cr16-action-window_new.png crsc-action-about_kde.svgz crsc-action-add.svgz cr22-filesys-www.png cr32-action-text_strike.png cr22-device-printer1.png cr48-filesys-network_local.png cr48-filesys-folder_important.png cr128-mime-karbon_karbon.png cr64-mime-kivio_flw.png cr48-filesys-exec.png cr32-action-math_prod.png cr48-mime-kword_kwd.png cr16-device-ipod_unmount.png cr16-action-attach.png cr128-mime-netscape_doc.png cr22-action-text_italic.png crsc-mime-kmultiple.svgz cr32-action-math_int.png cr128-mime-empty.png cr128-mime-recycled.png cr64-device-dvd_mount.png crsc-action-player_fwd.svgz cr32-mime-cdr.png cr22-action-mail_new.png cr32-mime-krita_kra.png cr22-device-compact_flash_unmount.png cr128-device-memory_stick_mount.png cr16-filesys-folder_grey_open.png crsc-action-player_pause.svgz cr32-action-view_sidetree.png cr16-action-fileexport.png cr32-action-rotate.png crsc-action-player_next.svgz cr64-filesys-folder_grey.png cr64-filesys-folder_orange_open.png cr32-action-editpaste.png cr48-mime-kexi_kexi.png cr32-action-player_stop.png cr32-filesys-www.png crsc-filesys-folder_blue_open.svgz cr48-device-nfs_mount.png cr16-action-mail_replylist.png cr16-action-airbrush.png cr32-action-math_onetwomatrix.png cr32-action-view_fit_height.png cr22-action-colorpicker.png cr48-device-joystick.png crsc-filesys-file_broken.svgz cr16-mime-source_y.png cr22-action-math_rsup.png cr48-mime-source.png cr22-action-rotate_cw.png cr32-action-connect_no.png cr48-filesys-trashcan_empty.png cr16-action-text_block.png cr64-device-compact_flash_unmount.png crsc-mime-cdimage.svgz cr48-mime-document2.png cr22-action-math_abs.png cr32-action-launch.png cr32-device-camera_mount.png cr32-action-make_kdevelop.png cr128-filesys-network_local.png cr48-filesys-folder_tar.png cr16-mime-readme.png cr16-filesys-folder_video.png cr32-mime-source_s.png cr64-filesys-folder_txt.png crsc-mime-make.svgz cr22-action-filequickprint.png cr22-action-showmenu.png crsc-mime-empty.svgz cr32-filesys-folder_grey.png cr16-device-dvd_mount.png cr32-device-zip_unmount.png cr32-device-sd_mmc_mount.png cr64-mime-resource.png crsc-mime-applix.svgz cr16-action-text_sub.png cr16-action-window_suppressed.png cr64-mime-log.png cr22-action-color_fill.png cr48-filesys-folder_green.png cr48-filesys-folder_violet_open.png cr22-action-math_frac.png cr32-filesys-folder_favorite.png cr64-filesys-folder_print.png cr32-mime-source_o.png cr128-filesys-folder_video.png cr16-action-music_fullnote.png cr32-action-fileimport.png cr22-mime-midi.png cr64-mime-core.png cr32-action-colorize.png cr64-filesys-folder_locked.png cr22-action-filefind.png cr32-action-view_tree.png cr64-device-hdd_mount.png cr128-action-share.png cr32-action-today.png cr32-mime-file_temporary.png cr64-filesys-folder_video.png cr32-filesys-folder_grey_open.png cr128-mime-dvi.png cr48-device-scanner.png cr32-action-math_matrix.png cr16-device-compact_flash_unmount.png cr128-device-hdd_unmount.png cr64-filesys-exec.png cr16-action-math_int.png crsc-action-reload.svgz cr32-device-dvd_unmount.png cr16-action-math_sqrt.png crsc-action-configure.svgz cr48-mime-source_f.png crsc-filesys-desktop.svgz cr32-device-compact_flash_unmount.png cr32-action-indent.png cr128-mime-document2.png cr16-action-bookmark.png crsc-mime-recycled.svgz cr32-device-cdwriter_mount.png cr32-mime-source_l.png cr48-mime-zip.png cr22-filesys-desktop.png cr48-device-cdwriter_unmount.png cr32-action-top.png cr16-action-kde5.png cr32-filesys-folder_green_open.png cr48-action-exit.png cr22-action-frame_chart.png cr16-device-usbpendrive_unmount.png cr128-filesys-folder_favorite.png cr16-action-contents.png cr16-action-frame_spreadsheet.png cr22-mime-koffice.png cr128-mime-template_source.png cr32-mime-dvi.png cr128-filesys-www.png cr22-action-reload3.png crsc-device-blockdevice.svgz crsc-mime-image.svgz cr22-action-goto.png cr48-action-hibernate.png cr16-action-math_abs.png cr22-device-compact_flash_mount.png cr32-device-5floppy_mount.png cr48-device-blockdevice.png cr48-mime-kmultiple.png cr16-action-tab_remove.png crsc-filesys-folder_man2.svgz cr48-mime-kugar_kud.png cr22-action-mouse.png crsc-mime-source_java.svgz cr22-mime-source_java.png crsc-app-kmenu.svgz crsc-action-launch.svgz crsc-device-sd_mmc_mount.svgz cr32-filesys-folder_red_open.png cr22-mime-postscript.png cr32-action-switchuser.png cr16-device-tablet.png cr48-action-colorpicker.png cr48-mime-template_source.png crsc-action-view_fit_height.svgz crsc-action-text_bold.svgz cr32-action-player_end.png crsc-mime-source_p.svgz crsc-filesys-folder_orange_open.svgz cr32-action-text_left.png cr32-app-kmenu.png cr64-app-kmenu.png cr22-action-view_remove.png cr32-action-math_brackets.png cr22-action-spellcheck.png cr32-mime-binary.png cr32-mime-cdimage.png cr22-mime-video.png cr16-filesys-desktop.png cr22-device-system.png cr32-filesys-zip_overlay.png cr48-action-rotate.png cr16-action-tab_new.png crsc-action-mail_post_to.svgz cr64-filesys-folder_orange.png cr32-action-finish.png cr64-filesys-folder_yellow.png cr16-action-1uparrow.png cr32-mime-karbon_karbon.png cr32-filesys-folder_locked.png cr32-action-viewmagfit.png cr22-action-airbrush.png crsc-mime-sound.svgz crsc-filesys-folder_cyan.svgz cr16-mime-log.png cr32-device-printer1.png cr16-action-wizard.png cr128-filesys-file_broken.png crsc-filesys-folder_sound.svgz crsc-action-player_rew.svgz cr16-action-math_rsup.png cr48-mime-source_pl.png cr32-device-pda_black.png cr32-action-viewmag.png crsc-device-cdwriter_unmount.svgz crsc-mime-rpm.svgz cr48-device-chardevice.png cr22-filesys-folder_print.png cr32-mime-vcard.png cr48-mime-source_s.png crsc-action-exit.svgz cr64-device-nfs_mount.png crsc-device-dvd_unmount.svgz cr32-action-clear_left.png cr64-mime-source_moc.png cr22-action-text_block.png cr48-mime-krita_kra.png cr48-device-mouse.png crsc-mime-source_l.svgz cr128-mime-source_s.png cr16-mime-source_java.png cr16-action-services.png crsc-mime-txt2.svgz cr22-action-mail_replylist.png cr64-device-mo_mount.png cr64-filesys-folder_html.png crsc-action-text_sub.svgz cr22-mime-source_s.png cr64-mime-source_h.png cr32-action-player_fwd.png cr48-mime-log.png cr64-filesys-network_local.png cr22-action-rebuild.png cr32-device-print_class.png cr48-action-lock.png cr22-action-unlock.png cr32-action-edittrash.png cr22-action-save_all.png crsc-action-fileclose.svgz cr16-device-print_class.png cr32-action-view_fit_window.png crsc-mime-source_c.svgz crsc-action-rotate_cw.svgz cr22-filesys-folder.png crsc-device-dvd_mount.svgz cr16-filesys-folder_inbox.png cr48-mime-cdtrack.png cr16-action-view_right.png cr64-device-camera_unmount.png cr16-action-frame_image.png crsc-device-mo_umount.svgz cr32-filesys-folder.png cr16-action-redo.png cr16-filesys-folder_outbox.png cr22-action-fill.png cr16-action-cancel.png cr32-device-joystick.png cr22-action-key_enter.png cr32-device-3floppy_mount.png cr32-mime-source_j.png cr32-action-math_lsup.png cr64-mime-quicktime.png cr22-mime-wordprocessing.png cr16-mime-source_pl.png cr16-device-usbpendrive_mount.png cr32-action-view_icon.png cr128-device-compact_flash_mount.png cr48-filesys-folder.png crsc-device-cdaudio_mount.svgz cr22-action-math_rsub.png cr48-mime-txt2.png cr64-filesys-folder_yellow_open.png cr128-mime-widget_doc.png cr16-action-mail_replyall.png cr128-filesys-folder_yellow_open.png cr16-mime-font_type1.png cr22-device-print_class.png crsc-mime-wordprocessing.svgz cr32-action-connect_established.png cr16-action-fileimport.png cr128-filesys-folder_orange_open.png cr22-mime-file_locked.png cr16-mime-source_s.png cr16-mime-source_l.png cr22-action-bookmark_folder.png crsc-filesys-folder_important.svgz cr22-mime-kexi_kexi.png cr64-mime-source_j.png cr22-mime-source_c.png cr32-action-help.png cr16-filesys-folder_home.png crsc-filesys-file_locked.svgz crsc-device-joystick.svgz cr128-mime-ascii.png crsc-action-filenew.svgz cr22-app-password.png cr16-action-mail_send.png cr128-filesys-folder_important.png crsc-filesys-pipe.svgz cr48-mime-metafont.png cr48-action-filenew.png cr22-action-gear.png cr32-action-music_flat.png cr16-action-music_cross.png crsc-device-hdd_mount.svgz cr64-filesys-folder_tar.png cr64-mime-vcalendar.png cr128-device-sd_mmc_mount.png cr32-action-math_abs.png cr16-mime-vcard.png cr16-action-kde4.png cr64-device-3floppy_unmount.png cr32-action-view_right.png cr64-device-ipod_mount.png cr22-action-reload_all_tabs.png cr64-mime-vcard.png cr64-mime-widget_doc.png cr48-mime-resource.png cr32-action-contents2.png cr48-mime-pdf.png cr32-action-view_multicolumn.png cr16-action-window_fullscreen.png cr16-mime-shellscript.png cr48-device-hdd_unmount.png cr32-action-messagebox_info.png cr48-action-up.png cr32-action-math_brace.png cr22-mime-vectorgfx.png cr48-device-dvd_mount.png cr48-mime-kivio_flw.png cr16-action-2leftarrow.png cr32-action-revert.png cr22-action-player_play.png cr48-device-zip_mount.png crsc-filesys-folder_green_open.svgz cr32-mime-recycled.png cr16-filesys-folder_orange.png cr48-action-remove.png cr32-action-player_rew.png cr22-action-finish.png cr16-device-sd_mmc_unmount.png cr16-device-scanner.png cr22-action-bookmark.png cr32-mime-source_c.png crsc-mime-source_cpp.svgz cr22-action-exec.png cr64-device-camera_mount.png cr48-filesys-folder_home2.png cr16-action-player_volume.png cr64-device-5floppy_unmount.png crsc-action-previous.svgz cr64-mime-mozilla_doc.png cr16-action-history_clear.png cr22-device-camera_mount.png crsc-device-5floppy_unmount.svgz cr16-action-music_cleficon.png cr48-mime-source_php.png cr16-action-mail_generic.png cr64-mime-rpm.png cr16-action-info.png cr16-mime-midi.png crsc-device-camera_mount.svgz crsc-mime-source_y.svgz cr128-filesys-folder_print.png cr22-filesys-folder_green.png cr16-action-paintbrush.png crsc-action-mail_new.svgz cr22-mime-netscape_doc.png cr32-filesys-network_local.png cr64-mime-make.png cr16-action-goto.png cr32-action-filequickprint.png cr22-filesys-folder_yellow_open.png cr48-mime-source_p.png cr48-action-misc.png crsc-mime-source_h.svgz cr128-app-kmenu.png cr32-mime-zip.png cr48-device-camera_unmount.png cr16-action-editpaste.png cr16-mime-resource.png cr128-filesys-lock_overlay.png cr32-action-misc.png cr22-device-ipod_unmount.png cr16-mime-quicktime.png cr32-mime-deb.png cr22-action-fileexport.png cr64-mime-source_java.png cr48-filesys-folder_home.png cr48-filesys-folder_txt.png cr16-action-mail_get.png cr48-device-compact_flash_mount.png cr16-mime-encrypted.png cr16-mime-kmultiple.png cr48-mime-applix.png cr32-mime-file_locked.png cr48-filesys-folder_outbox.png cr16-action-color_line.png cr16-mime-cdtrack.png cr32-action-identity.png cr16-device-5floppy_unmount.png cr64-filesys-folder_grey_open.png cr48-filesys-folder_orange.png cr128-device-usbpendrive_mount.png crsc-device-memory_stick_mount.svgz cr16-mime-source.png cr16-action-idea.png cr22-action-text_bold.png cr16-device-pda_blue.png cr32-action-text_super.png cr64-mime-source_f.png cr128-mime-source_o.png cr32-device-compact_flash_mount.png cr22-action-remove.png crsc-mime-readme.svgz cr16-device-zip_unmount.png cr22-action-fork.png cr48-filesys-pipe.png cr48-action-forward.png cr22-filesys-folder_orange.png cr128-device-printer1.png cr22-action-emptytrash.png cr64-mime-sound.png cr48-mime-kchart_chrt.png cr32-action-colorpicker.png cr32-app-password.png cr128-device-smart_media_mount.png cr128-filesys-folder_violet_open.png cr64-device-printer1.png cr32-action-suspend.png cr64-filesys-folder_sound.png cr22-action-mail_post_to3.png cr22-action-colorize.png cr16-mime-krita_kra.png cr16-mime-spreadsheet.png cr16-action-view_tree.png crsc-mime-source_py.svgz cr16-action-view_fit_height.png crsc-mime-deb.svgz cr22-action-contents.png cr128-filesys-folder_man.png cr32-action-view_detailed.png cr48-device-cdrom_unmount.png cr16-action-down.png cr32-filesys-trashcan_empty.png cr22-action-text_strike.png crsc-action-wizard.svgz cr16-action-gear.png cr48-mime-kformula_kfo.png crsc-filesys-trashcan_full.svgz cr32-device-5floppy_unmount.png cr48-filesys-folder_orange_open.png cr22-action-mail_replyall.png cr32-device-cdaudio_mount.png crsc-action-next.svgz cr22-action-music_flat.png cr128-filesys-folder_image.png cr22-mime-message.png cr64-device-cdrom_mount.png crsc-action-rotate.svgz cr64-mime-applix.png cr32-mime-source_java.png cr48-mime-deb.png cr16-mime-bt.png cr64-filesys-folder_favorite.png cr128-filesys-folder_locked.png cr22-action-music_natur.png cr22-mime-pdf.png cr128-mime-source_py.png cr32-action-window_new.png cr32-mime-source_pl.png cr64-device-print_class.png cr128-device-camera_unmount.png crsc-filesys-folder_print.svgz cr16-mime-sound.png cr128-device-ipod_mount.png cr16-action-view_fit_window.png cr48-action-player_playlist.png cr22-filesys-trashcan_full.png cr32-filesys-network.png cr22-action-2rightarrow.png cr22-action-cd.png cr22-action-fileprint.png cr22-mime-source_pl.png cr64-mime-document2.png cr22-action-music_fullnote.png crsc-action-share.svgz crsc-mime-cdr.svgz cr128-mime-krita_kra.png cr32-filesys-folder_important.png cr48-action-stop.png cr16-action-inline_image.png cr64-filesys-file_broken.png cr16-filesys-network_local.png cr128-mime-midi.png cr64-device-memory_stick_unmount.png cr22-action-previous.png cr16-action-colorpicker.png cr22-mime-kugar_kud.png cr16-mime-kpresenter_kpr.png cr48-action-suspend.png cr16-mime-cdr.png cr32-device-memory_stick_mount.png crsc-filesys-folder_home.svgz cr32-action-view_text.png crsc-action-player_eject.svgz cr22-mime-txt.png cr16-filesys-folder_tar.png cr48-mime-colorscm.png cr16-device-5floppy_mount.png cr48-action-fileprint.png cr48-device-hdd_mount.png cr32-action-text_center.png cr16-action-tab_breakoff.png cr48-mime-kpresenter_kpr.png cr32-action-mail_send.png cr48-action-add.png cr16-action-kde.png cr32-action-mail_forward.png cr16-action-mail_forward.png cr22-action-help.png cr32-action-lock.png cr64-mime-midi.png cr16-mime-kspread_ksp.png cr16-action-folder_new.png cr22-action-exit.png cr64-device-sd_mmc_unmount.png cr16-device-joystick.png cr64-mime-source_s.png cr16-action-ok.png cr32-filesys-folder_open.png cr16-filesys-folder_txt.png cr22-action-apply.png cr48-action-mail_post_to.png cr48-filesys-folder_grey_open.png cr48-filesys-folder_favorite.png cr22-action-text_center.png cr64-mime-empty.png crsc-action-fileopen.svgz cr22-action-fontsizeup.png cr128-mime-vcard.png cr32-action-button_cancel.png cr32-action-frameprint.png cr16-action-hibernate.png cr16-action-frame_formula.png cr22-mime-karbon_karbon.png cr32-action-previous.png cr48-action-contents2.png cr22-mime-pk.png cr64-device-cdwriter_unmount.png cr48-mime-sound.png cr64-device-compact_flash_mount.png cr32-action-math_sum.png crsc-device-pda_blue.svgz cr64-filesys-trashcan_full.png cr22-device-hdd_unmount.png cr22-mime-quicktime.png crsc-mime-widget_doc.svgz crsc-mime-kexi_kexi.svgz cr64-filesys-folder_violet_open.png cr48-device-tv.png cr128-mime-font_type1.png cr22-action-inline_table.png cr16-action-encrypted.png cr22-action-editdelete.png cr16-action-editshred.png cr32-mime-source_f.png cr16-action-contexthelp.png cr32-device-cdaudio_unmount.png cr64-mime-template_source.png cr32-filesys-folder_html.png cr22-action-eraser.png crsc-device-3floppy_unmount.svgz cr48-device-5floppy_unmount.png cr128-mime-zip.png cr22-mime-vcard.png cr16-mime-widget_doc.png cr128-filesys-pipe.png cr48-app-password.png cr22-action-player_pause.png cr128-filesys-folder_html.png crsc-mime-font_type1.svgz cr22-action-contents2.png crsc-device-nfs_unmount.svgz crsc-mime-soffice.svgz cr48-mime-quicktime.png cr22-mime-source_h.png cr22-action-gohome.png cr16-mime-man.png cr22-action-forward.png cr48-device-cdaudio_unmount.png cr128-mime-applix.png cr22-mime-cdtrack.png cr32-action-forward.png cr22-mime-shellscript.png cr128-device-system.png cr22-action-crop.png cr22-app-kttsd.png cr64-filesys-pipe.png cr22-action-view_text.png cr48-mime-kspread_ksp.png cr16-mime-kivio_flw.png cr16-action-tab_new_raised.png cr16-mime-empty.png cr64-mime-image.png crsc-device-3floppy_mount.svgz cr64-mime-spreadsheet.png cr22-action-1rightarrow.png cr32-filesys-folder_video.png cr22-action-folder_new.png cr64-mime-encrypted.png cr22-filesys-link_overlay.png crsc-mime-tar.svgz cr48-mime-document.png cr22-action-bottom.png crsc-mime-metafont.svgz cr32-action-reload_all_tabs.png cr64-device-joystick.png cr48-filesys-folder_red_open.png crsc-mime-source_moc.svgz cr32-action-fileopen.png cr22-device-smart_media_mount.png cr16-mime-colorscm.png cr22-mime-font_bitmap.png cr16-mime-document2.png cr16-action-editdelete.png cr64-device-usbpendrive_unmount.png cr22-action-history.png cr64-device-memory_stick_mount.png cr32-device-chardevice.png cr64-filesys-folder_home.png cr16-mime-dvi.png cr16-action-view_bottom.png cr32-action-text_bold.png cr128-mime-koffice.png cr32-mime-bt.png cr16-action-news_unsubscribe.png cr22-action-fileimport.png cr32-action-toggle_log.png crsc-action-switchuser.svgz cr48-mime-make.png cr128-mime-unknown.png crsc-mime-spreadsheet.svgz cr16-action-suspend.png cr16-action-player_time.png cr128-mime-quicktime.png cr48-mime-cdr.png cr22-mime-mozilla_doc.png crsc-device-chardevice.svgz cr128-filesys-folder_green_open.png cr32-action-show_side_panel.png cr32-mime-shellscript.png cr16-mime-vectorgfx.png crsc-filesys-folder.svgz cr16-action-text_super.png cr16-action-locationbar_erase.png cr64-filesys-folder_open.png crsc-device-5floppy_mount.svgz cr16-action-math_paren.png crsc-filesys-folder_grey.svgz cr16-action-fileclose.png cr48-device-ipod_mount.png crsc-action-lock.svgz cr128-device-mouse.png crsc-filesys-folder_orange.svgz cr32-action-music_fullnote.png cr32-device-ipod_unmount.png cr22-mime-applix.png cr22-action-math_lsub.png cr22-filesys-folder_red.png crsc-mime-unknown.svgz cr22-app-kmenu.png crsc-device-smartmedia_unmount.svgz cr32-filesys-folder_orange.png cr22-action-back.png cr48-mime-source_j.png cr32-filesys-pipe.png cr64-device-memory.png cr128-device-usbpendrive_unmount.png cr32-action-view_choose.png cr32-action-bottom.png cr32-action-rightjust.png cr22-action-view_bottom.png crsc-device-system.svgz cr48-mime-message.png cr32-action-reload.png cr48-mime-netscape_doc.png cr22-action-reload.png cr32-mime-font_bitmap.png cr16-filesys-exec.png cr64-filesys-folder.png cr48-mime-bt.png cr48-mime-font_truetype.png cr64-device-cdrom_unmount.png cr32-mime-source_p.png cr32-action-charset.png crsc-device-printer1.svgz crsc-device-mo_mount.svgz cr64-device-chardevice.png cr32-mime-source_php.png cr16-filesys-folder_sound.png cr48-mime-gf.png cr16-device-3floppy_unmount.png cr32-action-editdelete.png cr32-mime-misc.png cr48-mime-binary.png cr22-mime-kmultiple.png cr22-action-find.png cr16-action-filequickprint.png cr32-mime-empty.png cr16-filesys-trashcan_empty.png cr128-device-print_class.png cr32-action-locationbar_erase.png cr64-device-tv.png cr16-action-clear_left.png cr16-action-frame_text.png cr32-mime-tex.png cr32-action-filesave.png cr32-filesys-folder_home2.png cr64-app-kttsd.png cr48-mime-vcard.png cr48-mime-pk.png cr16-action-filter.png cr32-mime-font_truetype.png crsc-filesys-folder_violet.svgz cr128-mime-image.png cr32-mime-midi.png cr16-action-viewmag.png cr48-filesys-server.png cr64-mime-krita_kra.png crsc-device-tablet.svgz cr32-filesys-folder_violet_open.png cr32-action-configure.png cr32-action-edit.png cr128-mime-source_c.png cr22-action-music_fermatenote.png cr22-action-view_detailed.png cr32-action-decrypted.png cr128-mime-html.png cr22-action-frame_formula.png cr32-mime-resource.png cr16-action-music_natur.png cr32-action-text_sub.png cr16-mime-template_source.png cr32-device-mouse.png cr32-action-goto.png cr22-filesys-network.png cr16-device-cdaudio_mount.png cr22-action-text_left.png crsc-device-memory_stick_unmount.svgz cr48-action-previous.png cr48-action-reload.png cr22-mime-source_moc.png cr22-action-1downarrow.png cr16-mime-make.png cr48-device-mo_unmount.png cr22-action-player_playlist.png cr128-mime-cdr.png cr64-mime-wordprocessing.png cr22-action-launch.png cr128-mime-source_pl.png cr16-action-bookmarks_list_add.png cr32-action-run.png cr64-mime-tgz.png cr32-action-apply.png cr16-action-apply.png cr128-filesys-folder_open.png crsc-device-usbpendrive_unmount.svgz cr16-mime-kexi_kexi.png cr16-action-fontsizeup.png cr128-filesys-folder_grey.png cr32-action-eraser.png cr32-mime-ascii.png cr16-filesys-trashcan_full.png cr22-mime-widget_doc.png crsc-mime-encrypted.svgz cr22-action-text_under.png cr22-action-misc.png crsc-action-player_stop.svgz cr32-action-fileclose.png cr16-action-view_choose.png cr48-device-cdwriter_mount.png cr16-action-top.png cr48-mime-source_y.png cr32-device-mo_mount.png cr48-filesys-folder_video.png cr64-mime-zip.png crsc-mime-resource.svgz cr16-action-gohome.png cr22-filesys-folder_violet.png cr16-mime-txt.png crsc-filesys-folder_man.svgz cr16-action-player_stop.png cr16-action-player_pause.png cr22-device-smart_media_unmount.png cr128-mime-soffice.png cr22-action-rightjust.png cr128-mime-source_moc.png cr16-mime-karbon_karbon.png cr22-action-bookmark_add.png cr48-device-memory_stick_mount.png cr16-action-mail_reply.png cr64-mime-ascii.png crsc-mime-kugardata.svgz cr32-mime-tgz.png cr22-action-compfile.png cr22-action-inline_image.png cr64-action-share.png cr16-mime-gettext.png cr22-mime-unknown.png cr48-device-memory.png cr16-action-show_side_panel.png cr32-mime-metafont.png cr48-action-wizard.png cr22-mime-exec_wine.png cr16-action-exec.png cr16-action-forward.png cr32-action-window_nofullscreen.png cr32-action-text_under.png cr128-mime-source_php.png cr32-mime-rpm.png cr32-action-queue.png cr128-action-fileopen.png cr48-action-mail_new.png crsc-action-mail_get.svgz crsc-mime-quicktime.svgz cr48-filesys-folder_red.png cr48-action-rotate_cw.png cr16-action-player_start.png cr22-action-bookmarks_list_add.png cr16-action-misc.png cr22-mime-make.png cr64-device-blockdevice.png cr22-action-color_line.png crsc-device-camera_unmount.svgz cr16-mime-wordprocessing.png cr128-mime-font_truetype.png cr48-mime-shellscript.png cr128-filesys-trashcan_full.png cr22-device-camera_unmount.png cr64-device-sd_mmc_mount.png cr16-action-signature.png cr16-action-math_lsup.png cr32-action-redo.png cr32-action-filefind.png cr48-device-smart_media_unmount.png cr64-device-pda_black.png cr22-action-view_fit_window.png cr16-action-configure_shortcuts.png cr64-action-favorites.png cr16-action-kde6.png cr64-device-scanner.png cr48-mime-core.png cr32-action-rotate_ccw.png cr16-device-cdrom_unmount.png cr22-action-filesaveas.png cr64-filesys-folder_red_open.png cr16-action-halfencrypted.png cr128-device-ipod_unmount.png cr22-mime-source_y.png cr32-device-smart_media_unmount.png crsc-filesys-exec_wine.svgz cr32-action-mouse.png cr32-mime-postscript.png cr32-device-memory.png cr22-mime-kivio_flw.png cr16-app-kttsd.png cr22-action-math_matrix.png cr16-action-bookmark_toolbar.png cr48-mime-cdimage.png crsc-mime-exec_wine.svgz cr128-mime-deb.png cr16-mime-source_o.png cr32-action-save_all.png cr16-filesys-server.png cr48-action-reload_all_tabs.png cr22-action-mail_post_to.png cr16-filesys-folder_green_open.png cr48-mime-rpm.png cr16-action-music_halfnote.png cr22-action-start.png cr48-mime-source_h.png cr16-device-blockdevice.png cr32-device-pda_blue.png cr16-mime-source_cpp.png cr48-mime-spreadsheet.png cr32-action-contents.png cr32-filesys-folder_yellow.png cr48-device-print_class.png cr16-action-text_bold.png cr128-device-smart_media_unmount.png cr16-action-start.png cr22-action-2downarrow.png cr22-action-text.png cr22-action-editcopy.png cr16-action-1rightarrow.png cr48-mime-unknown.png cr128-mime-log.png cr32-action-music_eightnote.png cr64-filesys-folder_crystal.png cr128-mime-source_java.png crsc-mime-document2.svgz cr22-action-player_end.png cr16-device-mo_mount.png cr16-filesys-folder_crystal.png cr32-action-math_sqrt.png cr16-action-key_enter.png cr64-mime-bt.png cr32-action-bookmark_toolbar.png cr16-mime-message.png cr32-filesys-folder_yellow_open.png crsc-filesys-folder_yellow.svgz cr48-device-pda_blue.png cr64-device-cdaudio_unmount.png cr64-mime-pdf.png cr16-action-math_frac.png cr32-action-bookmark_add.png crsc-device-tv.svgz cr22-device-ipod_mount.png cr22-filesys-trashcan_empty.png cr64-mime-tar.png cr16-action-inline_table.png crsc-filesys-folder_image.svgz cr48-device-3floppy_unmount.png Makefile.am cr22-mime-source_f.png cr16-filesys-folder_sent_mail.png cr48-filesys-ftp.png cr128-mime-source_l.png cr16-action-up.png cr64-mime-soffice.png cr32-action-editcut.png cr32-mime-man.png cr16-filesys-folder_green.png cr22-action-math_sqrt.png cr16-action-undo.png cr22-action-news_unsubscribe.png cr22-action-editclear.png cr16-action-frameprint.png cr128-mime-shellscript.png crsc-filesys-trashcan_empty.svgz cr32-action-gear.png cr22-action-mail_send.png cr22-action-stop.png cr22-mime-recycled.png cr64-mime-vectorgfx.png cr22-action-viewmag-.png cr16-action-view_detailed.png cr16-device-camera_mount.png crsc-filesys-network.svgz cr32-action-music_natur.png cr48-action-kde.png cr48-filesys-lock_overlay.png cr32-action-remove.png cr22-action-frame_spreadsheet.png cr32-action-button_ok.png cr48-filesys-folder_open.png crsc-action-rotate_ccw.svgz cr32-action-attach.png cr32-action-exec.png crsc-mime-netscape_doc.svgz cr22-mime-txt2.png cr22-action-redo.png cr64-filesys-folder_violet.png cr64-mime-source_o.png cr16-filesys-folder_red_open.png cr22-action-filesave.png cr16-action-view_text.png cr48-mime-misc.png cr22-action-mail_forward.png cr64-mime-binary.png cr48-filesys-zip_overlay.png cr16-action-kde3.png crsc-mime-html.svgz cr16-device-compact_flash_mount.png cr128-filesys-folder_home.png cr32-action-compfile.png cr22-action-revert.png cr128-mime-info.png crsc-action-text_italic.svgz cr48-mime-exec_wine.png cr32-mime-source_y.png cr16-action-identity.png cr16-action-rotate_ccw.png cr32-device-nfs_unmount.png cr22-action-connect_no.png cr32-app-kttsd.png cr32-filesys-ftp.png cr32-action-encrypted.png cr32-action-mail_delete.png cr48-filesys-network.png cr22-device-usbpendrive_unmount.png cr32-action-player_start.png cr16-filesys-folder_violet.png cr22-action-toggle_log.png cr22-action-math_onetwomatrix.png crsc-mime-document.svgz cr22-action-identity.png cr16-action-decrypted.png cr64-mime-message.png cr22-action-viewmagfit.png cr22-mime-sound.png cr48-filesys-folder_inbox.png crsc-filesys-temporary.svgz cr16-action-crop.png cr32-mime-kword_kwd.png cr16-mime-ascii.png cr22-action-math_brackets.png cr22-action-math_sum.png crsc-action-colorpicker.svgz cr32-device-tv.png cr32-action-start.png cr128-mime-font_bitmap.png cr16-action-edit.png cr16-action-2uparrow.png cr16-filesys-folder_red.png cr16-mime-netscape_doc.png cr32-action-music_halfnote.png cr32-action-mail_get.png crsc-filesys-folder_tar.svgz cr128-mime-document.png cr64-device-3floppy_mount.png cr16-action-view_top_bottom.png crsc-mime-source_j.svgz cr22-mime-ascii.png Makefile.in crsc-mime-file_locked.svgz cr64-filesys-folder_red.png cr22-mime-html.png cr22-filesys-folder_open.png cr64-filesys-www.png crsc-mime-source_pl.svgz crsc-mime-vcalendar.svgz cr22-device-joystick.png cr128-mime-colorscm.png cr16-action-run.png cr48-action-gohome.png cr32-action-filter.png crsc-device-cdrom_unmount.svgz cr22-action-rotate.png cr16-action-queue.png cr128-device-sd_mmc_unmount.png cr32-filesys-exec.png cr48-mime-tar.png cr16-filesys-folder_yellow_open.png cr22-action-2leftarrow.png cr22-action-mail_get.png cr48-mime-vcalendar.png cr22-device-usbpendrive_mount.png cr48-mime-widget_doc.png cr16-action-unlock.png cr32-mime-log.png crsc-filesys-home_blue.svgz cr16-mime-vcalendar.png cr16-action-1downarrow.png cr128-mime-rpm.png cr22-action-filter.png cr128-filesys-folder_green.png cr128-filesys-zip_overlay.png cr32-filesys-folder_orange_open.png cr128-mime-binary.png cr22-action-charset.png cr16-action-stamp.png cr16-filesys-folder_man.png cr32-action-folder_new.png cr22-action-text_super.png cr16-action-mail_find.png cr16-action-bottom.png cr128-mime-message.png cr22-action-today.png cr22-action-button_ok.png cr64-mime-kugar_kud.png cr32-filesys-folder_tar.png cr64-mime-font.png cr32-action-project_open.png cr16-action-2downarrow.png cr22-mime-man.png cr16-mime-source_moc.png cr16-device-cdrom_mount.png cr48-mime-readme.png cr22-action-window_nofullscreen.png cr16-device-cdaudio_unmount.png cr64-mime-postscript.png cr16-device-smart_media_mount.png crsc-action-stop.svgz crsc-action-remove.svgz cr16-action-pencil.png cr16-action-launch.png crsc-mime-txt.svgz cr48-device-memory_stick_unmount.png crsc-action-contents2.svgz cr32-filesys-folder_sound.png cr128-filesys-folder_violet.png cr22-action-math_int.png cr64-mime-source_l.png cr32-filesys-lock_overlay.png cr64-device-hdd_unmount.png cr32-mime-readme.png cr48-action-launch.png crsc-mime-binary.svgz cr32-action-editshred.png crsc-mime-colorscm.svgz cr64-mime-tex.png cr48-mime-vectorgfx.png cr22-action-viewmag.png cr16-mime-font_truetype.png cr128-mime-gf.png cr128-mime-source_p.png cr16-filesys-folder_print.png crsc-device-zip_mount.svgz cr16-action-mail_post_to.png cr32-mime-pk.png cr16-device-system.png cr64-mime-source_p.png crsc-mime-pdf.svgz cr16-mime-source_f.png cr16-action-add.png cr32-mime-kivio_flw.png cr22-filesys-folder_violet_open.png cr22-action-editshred.png cr32-device-tablet.png cr16-action-1leftarrow.png crsc-filesys-folder_cyan_open.svgz cr22-action-math_lsup.png cr16-action-filesave.png cr16-device-zip_mount.png cr22-action-edittrash.png cr128-mime-spreadsheet.png cr32-action-unindent.png cr16-device-ipod_mount.png cr128-filesys-folder_sound.png cr32-mime-source_moc.png cr64-mime-kword_kwd.png cr16-action-text_under.png cr16-mime-font_bitmap.png cr32-action-music_32ndnote.png cr16-mime-pdf.png cr16-device-mouse.png cr22-mime-encrypted.png cr22-action-paintbrush.png cr16-action-rebuild.png cr16-action-kde1.png cr32-mime-unknown.png cr22-action-fileclose.png cr22-action-next.png cr22-mime-tar.png cr16-action-player_eject.png cr48-mime-postscript.png cr48-mime-koffice.png cr16-action-stop.png cr16-action-fontsizedown.png cr16-action-player_rew.png cr32-action-filenew.png cr48-action-indent.png cr16-action-math_onetwomatrix.png cr16-action-connect_established.png cr16-action-editcut.png cr32-mime-font.png cr64-mime-karbon_karbon.png cr48-action-down.png cr32-action-unlock.png cr16-device-sd_mmc_mount.png cr48-filesys-folder_sound.png cr32-mime-vcalendar.png cr32-action-back.png cr48-filesys-folder_crystal.png cr16-action-view_left_right.png cr16-mime-document.png cr32-action-view_remove.png cr16-action-text_italic.png cr64-filesys-folder_green.png cr128-filesys-desktop.png cr128-mime-video.png cr48-device-pda_black.png cr22-action-frameprint.png cr22-mime-font_type1.png crsc-device-compact_flash_mount.svgz cr22-action-viewmag+.png cr16-mime-html.png cr32-mime-txt.png cr32-filesys-folder_violet.png cr32-action-mail_replyall.png cr32-filesys-folder_image.png cr22-device-3floppy_mount.png cr48-filesys-folder_grey.png cr32-device-hdd_mount.png cr32-mime-kchart_chrt.png crsc-device-cdrom_mount.svgz cr16-action-tab_duplicate.png cr32-mime-message.png cr22-action-frame_query.png crsc-action-mail_generic.svgz cr22-action-clear_left.png cr22-mime-font_truetype.png cr16-action-music_flat.png cr48-device-camera_mount.png cr22-action-frame_image.png crsc-action-view_fit_width.svgz cr16-action-thumbnail.png cr32-mime-soffice.png crsc-action-up.svgz cr48-device-system.png cr22-action-idea.png cr48-mime-font_bitmap.png cr48-filesys-trashcan_full.png cr32-mime-vectorgfx.png cr32-action-halfencrypted.png cr48-mime-dvi.png cr48-mime-mozilla_doc.png cr16-action-player_playlist.png cr32-mime-core.png cr32-mime-source_cpp.png cr16-filesys-folder_open.png cr64-filesys-zip_overlay.png cr32-mime-colorscm.png crsc-device-cdaudio_unmount.svgz cr16-action-music_dottednote.png cr64-mime-source_py.png cr16-action-next.png cr16-mime-image.png cr48-mime-recycled.png cr16-action-mail_new.png cr22-action-suspend.png cr32-action-view_fit_width.png cr16-action-openterm.png cr64-mime-kpresenter_kpr.png cr64-device-usbpendrive_mount.png cr32-mime-document2.png cr48-action-switchuser.png cr22-mime-binary.png cr32-filesys-folder_man.png cr16-action-tab_remove_other.png cr16-action-colorize.png crsc-mime-tex.svgz cr22-mime-tex.png cr16-action-bookmark_add.png cr16-mime-recycled.png cr128-mime-kmultiple.png cr32-action-find.png cr22-mime-font.png crsc-mime-postscript.svgz crsc-mime-core.svgz cr64-mime-kspread_ksp.png cr16-action-viewmagfit.png crsc-device-sd_mmc_unmount.svgz cr64-device-pda_blue.png cr16-device-camera_unmount.png cr22-mime-kspread_ksp.png cr32-action-spellcheck.png cr22-action-fileopen.png cr128-filesys-trashcan_empty.png cr32-action-music_quarternote.png cr22-action-text_sub.png cr64-mime-source_cpp.png cr32-filesys-folder_crystal.png cr64-device-ipod_unmount.png cr32-action-signature.png cr128-mime-core.png cr128-device-hdd_mount.png cr22-action-mail_generic.png cr64-device-5floppy_mount.png cr64-filesys-trashcan_empty.png cr64-mime-info.png cr64-device-mo_unmount.png cr64-filesys-lock_overlay.png cr32-action-text_italic.png cr22-action-folder.png cr22-action-editpaste.png cr64-device-smart_media_unmount.png cr22-action-locationbar_erase.png cr16-action-bookmark_folder.png cr16-action-project_open.png cr128-filesys-folder_red_open.png crsc-mime-mozilla_doc.svgz cr32-mime-image.png cr32-device-camera_unmount.png cr16-action-view_fit_width.png cr32-mime-netscape_doc.png cr22-action-1uparrow.png crsc-filesys-zip_overlay.svgz cr32-mime-cdtrack.png cr22-action-undo.png cr32-action-rebuild.png cr48-filesys-folder_yellow_open.png cr22-action-down.png cr22-action-news_subscribe.png cr32-filesys-folder_red.png cr32-mime-source_h.png cr48-mime-source_java.png cr64-mime-netscape_doc.png cr128-filesys-folder_crystal.png cr16-action-transform.png cr128-mime-txt2.png cr16-action-viewmag-.png cr16-device-dvd_unmount.png cr32-mime-applix.png cr32-action-reload_page.png cr32-mime-info.png cr32-device-zip_mount.png cr64-device-zip_unmount.png cr16-action-today.png crsc-mime-gf.svgz cr16-action-completion.png cr64-device-tablet.png cr22-device-3floppy_unmount.png cr32-device-ipod_mount.png cr64-mime-txt.png cr16-device-memory.png cr32-action-viewmag+.png cr48-mime-font_type1.png cr16-mime-kugar_kud.png cr48-device-printer1.png crsc-action-text_under.svgz cr32-action-undo.png cr16-filesys-pipe.png cr48-action-next.png cr32-filesys-folder_print.png cr16-mime-zip.png cr48-mime-empty.png cr22-action-view_sidetree.png cr22-mime-metafont.png cr32-action-messagebox_warning.png cr22-action-2uparrow.png cr16-action-player_fwd.png cr32-action-openterm.png cr22-action-openterm.png crsc-mime-font_truetype.svgz cr128-mime-man.png crsc-action-view_fit_window.svgz cr16-action-configure_toolbars.png cr22-action-show_side_panel.png cr32-device-dvd_mount.png cr32-mime-sound.png cr22-action-kde.png cr64-mime-metafont.png crsc-action-player_play.svgz crsc-action-top.svgz cr48-filesys-folder_man.png cr128-filesys-folder.png cr32-action-up.png cr128-device-memory_stick_unmount.png cr128-mime-sound.png cr22-action-math_prod.png crsc-filesys-folder_open.svgz cr22-action-editcut.png cr48-mime-tgz.png cr22-action-music_cleficon.png cr22-mime-source_cpp.png crsc-filesys-www.svgz cr32-action-editclear.png cr48-mime-wordprocessing.png cr64-mime-font_bitmap.png cr22-action-view_tree.png cr22-action-share.png cr48-mime-source_py.png cr64-filesys-folder_man.png cr22-action-1leftarrow.png cr128-device-camera_mount.png cr32-filesys-folder_txt.png cr48-device-zip_unmount.png cr22-action-music_cross.png cr32-action-math_rsup.png cr128-action-launch.png cr16-mime-tex.png cr48-device-nfs_unmount.png cr22-mime-colorscm.png cr32-mime-quicktime.png cr64-filesys-folder_image.png cr16-mime-unknown.png cr32-device-smart_media_mount.png crsc-action-player_start.svgz cr16-mime-applix.png cr128-mime-mozilla_doc.png cr32-mime-source_py.png crsc-action-gohome.svgz cr128-mime-vectorgfx.png cr16-mime-gf.png cr32-action-kde.png crsc-device-cdwriter_mount.svgz cr22-action-attach.png cr16-action-text_right.png cr16-action-contents2.png cr16-device-smart_media_unmount.png cr22-filesys-folder_home.png cr16-filesys-link_overlay.png cr22-mime-source.png cr48-device-5floppy_mount.png cr64-device-dvd_unmount.png cr22-action-math_paren.png crsc-filesys-services.svgz cr64-mime-kchart_chrt.png cr16-action-math_matrix.png cr48-device-cdaudio_mount.png cr16-device-hdd_unmount.png cr32-action-math_frac.png cr16-action-switchuser.png cr16-action-compfile.png cr32-mime-kmultiple.png cr128-device-blockdevice.png cr48-device-compact_flash_unmount.png 
 
 #>+ 2
 docs-am:
 
-#>+ 3901
+#>+ 3917
 install-kde-icons:
 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions
 	$(INSTALL_DATA) $(srcdir)/cr16-action-view_fit_window.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/view_fit_window.png
@@ -862,6 +756,7 @@
 	$(INSTALL_DATA) $(srcdir)/cr16-action-frameprint.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/frameprint.png
 	$(INSTALL_DATA) $(srcdir)/cr16-action-start.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/start.png
 	$(INSTALL_DATA) $(srcdir)/cr48-action-previous.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/previous.png
+	$(INSTALL_DATA) $(srcdir)/cr32-mime-pk.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/pk.png
 	$(INSTALL_DATA) $(srcdir)/cr32-action-player_stop.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/player_stop.png
 	$(INSTALL_DATA) $(srcdir)/cr64-filesys-folder_yellow.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_yellow.png
 	$(INSTALL_DATA) $(srcdir)/cr16-action-edit.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/edit.png
@@ -918,7 +813,6 @@
 	$(INSTALL_DATA) $(srcdir)/cr48-filesys-ftp.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/ftp.png
 	$(INSTALL_DATA) $(srcdir)/cr22-action-revert.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/revert.png
 	$(INSTALL_DATA) $(srcdir)/cr16-action-viewmag-.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/viewmag-.png
-	$(INSTALL_DATA) $(srcdir)/cr32-mime-pk.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/pk.png
 	$(INSTALL_DATA) $(srcdir)/cr128-mime-bt.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/bt.png
 	$(INSTALL_DATA) $(srcdir)/cr64-filesys-folder.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder.png
 	$(INSTALL_DATA) $(srcdir)/cr48-action-fileprint.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/fileprint.png
@@ -984,11 +878,11 @@
 	$(INSTALL_DATA) $(srcdir)/crsc-action-view_fit_width.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/view_fit_width.svgz
 	$(INSTALL_DATA) $(srcdir)/cr32-action-player_eject.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/player_eject.png
 	$(INSTALL_DATA) $(srcdir)/cr64-mime-vectorgfx.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/vectorgfx.png
+	$(INSTALL_DATA) $(srcdir)/cr32-mime-sound.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/sound.png
 	$(INSTALL_DATA) $(srcdir)/cr22-device-memory_stick_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/memory_stick_mount.png
 	$(INSTALL_DATA) $(srcdir)/cr32-action-spellcheck.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/spellcheck.png
 	$(INSTALL_DATA) $(srcdir)/cr48-device-memory_stick_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/memory_stick_mount.png
 	$(INSTALL_DATA) $(srcdir)/cr128-mime-font_truetype.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/font_truetype.png
-	$(INSTALL_DATA) $(srcdir)/cr32-mime-sound.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/sound.png
 	$(INSTALL_DATA) $(srcdir)/cr16-action-player_stop.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/player_stop.png
 	$(INSTALL_DATA) $(srcdir)/crsc-action-colorpicker.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/colorpicker.svgz
 	$(INSTALL_DATA) $(srcdir)/cr22-action-editcopy.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/editcopy.png
@@ -1103,6 +997,7 @@
 	$(INSTALL_DATA) $(srcdir)/cr48-device-compact_flash_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/compact_flash_unmount.png
 	$(INSTALL_DATA) $(srcdir)/cr22-action-queue.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/queue.png
 	$(INSTALL_DATA) $(srcdir)/cr32-action-today.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/today.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-next.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/next.png
 	$(INSTALL_DATA) $(srcdir)/cr32-mime-source_f.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/source_f.png
 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
 	$(INSTALL_DATA) $(srcdir)/cr48-app-password.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/password.png
@@ -1124,7 +1019,6 @@
 	$(INSTALL_DATA) $(srcdir)/cr16-action-view_text.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/view_text.png
 	$(INSTALL_DATA) $(srcdir)/crsc-device-ipod_mount.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/ipod_mount.svgz
 	$(INSTALL_DATA) $(srcdir)/cr64-filesys-folder_violet_open.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_violet_open.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-next.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/next.png
 	$(INSTALL_DATA) $(srcdir)/cr32-mime-source_pl.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/source_pl.png
 	$(INSTALL_DATA) $(srcdir)/cr64-device-cdwriter_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/cdwriter_unmount.png
 	$(INSTALL_DATA) $(srcdir)/cr22-action-mouse.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/mouse.png
@@ -1339,9 +1233,9 @@
 	$(INSTALL_DATA) $(srcdir)/cr32-mime-ascii.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/ascii.png
 	$(INSTALL_DATA) $(srcdir)/cr32-device-cdaudio_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/cdaudio_unmount.png
 	$(INSTALL_DATA) $(srcdir)/cr16-mime-message.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/message.png
+	$(INSTALL_DATA) $(srcdir)/cr22-mime-cdtrack.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/cdtrack.png
 	$(INSTALL_DATA) $(srcdir)/crsc-mime-shellscript.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/shellscript.svgz
 	$(INSTALL_DATA) $(srcdir)/cr16-action-configure.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/configure.png
-	$(INSTALL_DATA) $(srcdir)/cr22-mime-cdtrack.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/cdtrack.png
 	$(INSTALL_DATA) $(srcdir)/cr16-action-encrypted.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/encrypted.png
 	$(INSTALL_DATA) $(srcdir)/cr16-action-remove.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/remove.png
 	$(INSTALL_DATA) $(srcdir)/cr16-filesys-network_local.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/network_local.png
@@ -1457,6 +1351,7 @@
 	$(INSTALL_DATA) $(srcdir)/crsc-mime-make.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/make.svgz
 	$(INSTALL_DATA) $(srcdir)/cr16-action-mail_new.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/mail_new.png
 	$(INSTALL_DATA) $(srcdir)/cr22-action-redo.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/redo.png
+	$(INSTALL_DATA) $(srcdir)/cr22-mime-gf.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/gf.png
 	$(INSTALL_DATA) $(srcdir)/cr16-action-viewmag.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/viewmag.png
 	$(INSTALL_DATA) $(srcdir)/cr48-mime-source_y.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/source_y.png
 	$(INSTALL_DATA) $(srcdir)/cr16-action-fontsizeup.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/fontsizeup.png
@@ -1576,12 +1471,12 @@
 	$(INSTALL_DATA) $(srcdir)/cr128-mime-source.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/source.png
 	$(INSTALL_DATA) $(srcdir)/cr128-filesys-folder_image.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_image.png
 	$(INSTALL_DATA) $(srcdir)/cr32-device-zip_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/zip_unmount.png
+	$(INSTALL_DATA) $(srcdir)/cr128-mime-tgz.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/tgz.png
 	$(INSTALL_DATA) $(srcdir)/cr32-action-viewmag.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/viewmag.png
 	$(INSTALL_DATA) $(srcdir)/cr48-filesys-folder_grey_open.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_grey_open.png
 	$(INSTALL_DATA) $(srcdir)/cr64-filesys-zip_overlay.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/zip_overlay.png
 	$(INSTALL_DATA) $(srcdir)/cr16-filesys-file_broken.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/file_broken.png
 	$(INSTALL_DATA) $(srcdir)/cr22-action-attach.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/attach.png
-	$(INSTALL_DATA) $(srcdir)/cr128-mime-tgz.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/tgz.png
 	$(INSTALL_DATA) $(srcdir)/cr32-mime-kivio_flw.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/kivio_flw.png
 	$(INSTALL_DATA) $(srcdir)/cr128-mime-cdr.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/cdr.png
 	$(INSTALL_DATA) $(srcdir)/cr22-action-charset.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/charset.png
@@ -1685,7 +1580,6 @@
 	$(INSTALL_DATA) $(srcdir)/cr16-device-nfs_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/nfs_unmount.png
 	$(INSTALL_DATA) $(srcdir)/cr32-action-editcut.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/editcut.png
 	$(INSTALL_DATA) $(srcdir)/cr32-action-save_all.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/save_all.png
-	$(INSTALL_DATA) $(srcdir)/cr22-mime-gf.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/gf.png
 	$(INSTALL_DATA) $(srcdir)/cr22-action-math_onetwomatrix.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/math_onetwomatrix.png
 	$(INSTALL_DATA) $(srcdir)/cr32-device-5floppy_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/5floppy_mount.png
 	$(INSTALL_DATA) $(srcdir)/cr22-action-mail_send.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/mail_send.png
@@ -1928,9 +1822,9 @@
 	$(INSTALL_DATA) $(srcdir)/cr22-action-run.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/run.png
 	$(INSTALL_DATA) $(srcdir)/crsc-mime-exec_wine.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/exec_wine.svgz
 	$(INSTALL_DATA) $(srcdir)/cr16-action-connect_no.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/connect_no.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-kde1.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/kde1.png
 	$(INSTALL_DATA) $(srcdir)/cr64-mime-font_bitmap.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/font_bitmap.png
 	$(INSTALL_DATA) $(srcdir)/cr48-filesys-trashcan_empty.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/trashcan_empty.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-kde1.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/kde1.png
 	$(INSTALL_DATA) $(srcdir)/cr64-mime-font.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/font.png
 	$(INSTALL_DATA) $(srcdir)/cr128-filesys-folder_tar.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_tar.png
 	$(INSTALL_DATA) $(srcdir)/cr22-action-math_brace.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/math_brace.png
@@ -2047,9 +1941,9 @@
 	$(INSTALL_DATA) $(srcdir)/cr32-filesys-folder_yellow.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_yellow.png
 	$(INSTALL_DATA) $(srcdir)/crsc-filesys-pipe.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/pipe.svgz
 	$(INSTALL_DATA) $(srcdir)/cr32-mime-netscape_doc.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/netscape_doc.png
+	$(INSTALL_DATA) $(srcdir)/cr22-app-kmenu.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kmenu.png
 	$(INSTALL_DATA) $(srcdir)/cr48-action-wizard.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/wizard.png
 	$(INSTALL_DATA) $(srcdir)/cr64-filesys-network.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/network.png
-	$(INSTALL_DATA) $(srcdir)/cr22-app-kmenu.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kmenu.png
 	$(INSTALL_DATA) $(srcdir)/cr128-mime-log.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/log.png
 	$(INSTALL_DATA) $(srcdir)/cr48-device-tablet.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/tablet.png
 	$(INSTALL_DATA) $(srcdir)/cr32-action-filenew.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/filenew.png
@@ -2402,6 +2296,7 @@
 	$(INSTALL_DATA) $(srcdir)/cr48-mime-font_truetype.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/font_truetype.png
 	$(INSTALL_DATA) $(srcdir)/cr16-action-view_left_right.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/view_left_right.png
 	$(INSTALL_DATA) $(srcdir)/cr32-action-connect_creating.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/connect_creating.png
+	$(INSTALL_DATA) $(srcdir)/cr48-mime-bt.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/bt.png
 	$(INSTALL_DATA) $(srcdir)/cr16-mime-kformula_kfo.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/kformula_kfo.png
 	$(INSTALL_DATA) $(srcdir)/cr128-device-chardevice.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/chardevice.png
 	$(INSTALL_DATA) $(srcdir)/cr32-device-smart_media_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/smart_media_unmount.png
@@ -2412,7 +2307,6 @@
 	$(INSTALL_DATA) $(srcdir)/cr32-mime-source_java.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/source_java.png
 	$(INSTALL_DATA) $(srcdir)/cr32-device-compact_flash_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/compact_flash_unmount.png
 	$(INSTALL_DATA) $(srcdir)/crsc-filesys-folder_blue.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_blue.svgz
-	$(INSTALL_DATA) $(srcdir)/cr48-mime-bt.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/bt.png
 	$(INSTALL_DATA) $(srcdir)/cr64-mime-source_s.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/source_s.png
 	$(INSTALL_DATA) $(srcdir)/cr128-mime-core.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/core.png
 	$(INSTALL_DATA) $(srcdir)/cr32-mime-make.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/make.png
@@ -2521,8 +2415,8 @@
 	$(INSTALL_DATA) $(srcdir)/crsc-action-start.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/start.svgz
 	$(INSTALL_DATA) $(srcdir)/cr128-mime-video.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/video.png
 	$(INSTALL_DATA) $(srcdir)/cr22-filesys-folder_open.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems/folder_open.png
-	$(INSTALL_DATA) $(srcdir)/crsc-device-smartmedia_mount.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/smartmedia_mount.svgz
 	$(INSTALL_DATA) $(srcdir)/cr128-mime-tex.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/tex.png
+	$(INSTALL_DATA) $(srcdir)/crsc-device-smartmedia_mount.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/smartmedia_mount.svgz
 	$(INSTALL_DATA) $(srcdir)/cr32-device-mo_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/mo_unmount.png
 	$(INSTALL_DATA) $(srcdir)/cr128-device-blockdevice.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/blockdevice.png
 	$(INSTALL_DATA) $(srcdir)/cr32-filesys-link_overlay.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/link_overlay.png
@@ -2683,6 +2577,14 @@
 	$(INSTALL_DATA) $(srcdir)/crsc-action-player_start.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/player_start.svgz
 	$(INSTALL_DATA) $(srcdir)/cr128-filesys-folder_violet_open.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_violet_open.png
 	$(INSTALL_DATA) $(srcdir)/crsc-device-mo_umount.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/mo_umount.svgz
+	$(INSTALL_DATA) $(srcdir)/cr16-action-hibernate.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/hibernate.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-suspend.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/suspend.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-hibernate.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/hibernate.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-suspend.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/suspend.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-hibernate.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/hibernate.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-suspend.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/suspend.png
+	$(INSTALL_DATA) $(srcdir)/cr48-action-hibernate.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/hibernate.png
+	$(INSTALL_DATA) $(srcdir)/cr48-action-suspend.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/suspend.png
 
 uninstall-kde-icons:
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/view_fit_window.png
@@ -2802,6 +2704,7 @@
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/frameprint.png
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/start.png
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/previous.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/pk.png
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/player_stop.png
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_yellow.png
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/edit.png
@@ -2856,7 +2759,6 @@
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/ftp.png
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/revert.png
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/viewmag-.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/pk.png
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/bt.png
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder.png
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/fileprint.png
@@ -2921,11 +2823,11 @@
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/view_fit_width.svgz
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/player_eject.png
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/vectorgfx.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/sound.png
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/memory_stick_mount.png
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/spellcheck.png
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/memory_stick_mount.png
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/font_truetype.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/sound.png
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/player_stop.png
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/colorpicker.svgz
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/editcopy.png
@@ -3039,6 +2941,7 @@
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/compact_flash_unmount.png
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/queue.png
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/today.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/next.png
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/source_f.png
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/password.png
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/decrypted.png
@@ -3059,7 +2962,6 @@
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/view_text.png
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/ipod_mount.svgz
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_violet_open.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/next.png
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/source_pl.png
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/cdwriter_unmount.png
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/mouse.png
@@ -3274,9 +3176,9 @@
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/ascii.png
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/cdaudio_unmount.png
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/message.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/cdtrack.png
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/shellscript.svgz
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/configure.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/cdtrack.png
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/encrypted.png
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/remove.png
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/network_local.png
@@ -3392,6 +3294,7 @@
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/make.svgz
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/mail_new.png
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/redo.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/gf.png
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/viewmag.png
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/source_y.png
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/fontsizeup.png
@@ -3510,12 +3413,12 @@
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/source.png
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_image.png
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/zip_unmount.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/tgz.png
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/viewmag.png
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_grey_open.png
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/zip_overlay.png
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/file_broken.png
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/attach.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/tgz.png
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/kivio_flw.png
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/cdr.png
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/charset.png
@@ -3619,7 +3522,6 @@
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/nfs_unmount.png
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/editcut.png
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/save_all.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/gf.png
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/math_onetwomatrix.png
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/5floppy_mount.png
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/mail_send.png
@@ -3862,9 +3764,9 @@
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/run.png
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/exec_wine.svgz
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/connect_no.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/kde1.png
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/font_bitmap.png
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/trashcan_empty.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/kde1.png
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/font.png
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_tar.png
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/math_brace.png
@@ -3980,9 +3882,9 @@
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_yellow.png
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/pipe.svgz
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/netscape_doc.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kmenu.png
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/wizard.png
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/network.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kmenu.png
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/log.png
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/tablet.png
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/filenew.png
@@ -4335,6 +4237,7 @@
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/font_truetype.png
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/view_left_right.png
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/connect_creating.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/bt.png
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/kformula_kfo.png
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/chardevice.png
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/smart_media_unmount.png
@@ -4345,7 +4248,6 @@
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/source_java.png
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/compact_flash_unmount.png
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_blue.svgz
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/bt.png
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/source_s.png
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/core.png
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/make.png
@@ -4454,8 +4356,8 @@
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/start.svgz
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/video.png
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems/folder_open.png
-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/smartmedia_mount.svgz
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/tex.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/smartmedia_mount.svgz
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/mo_unmount.png
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/blockdevice.png
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/link_overlay.png
@@ -4616,6 +4518,14 @@
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/player_start.svgz
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_violet_open.png
 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/mo_umount.svgz
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/hibernate.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/suspend.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/hibernate.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/suspend.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/hibernate.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/suspend.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/hibernate.png
+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/suspend.png
 
 #>+ 15
 force-reedit:
--- kdelibs-3.5.7.orig/pics/hicolor/Makefile.in
+++ kdelibs-3.5.7/pics/hicolor/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -15,15 +15,11 @@
 
 @SET_MAKE@
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -69,8 +65,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -78,13 +72,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -98,8 +92,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -120,17 +112,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -199,7 +188,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -236,12 +224,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -286,87 +276,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -390,75 +336,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -466,16 +354,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -488,7 +375,7 @@
 all: docs-am  all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -526,9 +413,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 mostlyclean-libtool:
@@ -536,13 +423,9 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 install-hicolorDATA: $(hicolor_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(hicolordir)" || $(mkdir_p) "$(DESTDIR)$(hicolordir)"
+	test -z "$(hicolordir)" || $(MKDIR_P) "$(DESTDIR)$(hicolordir)"
 	@list='$(hicolor_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -565,22 +448,21 @@
 
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -596,7 +478,7 @@
 all-am: Makefile $(DATA)
 installdirs:
 	for dir in "$(DESTDIR)$(hicolordir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -632,7 +514,7 @@
 
 distclean: distclean-am
 	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool
+distclean-am: clean-am distclean-generic
 
 dvi: dvi-am
 
@@ -646,12 +528,20 @@
 
 install-data-am: install-hicolorDATA
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -670,17 +560,21 @@
 
 ps-am:
 
-uninstall-am: uninstall-hicolorDATA uninstall-info-am
+uninstall-am: uninstall-hicolorDATA
+
+.MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
 	distclean distclean-generic distclean-libtool distdir dvi \
 	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-exec install-exec-am \
-	install-hicolorDATA install-info install-info-am install-man \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-hicolorDATA install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
 	install-strip installcheck installcheck-am installdirs \
 	maintainer-clean maintainer-clean-generic mostlyclean \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	uninstall uninstall-am uninstall-hicolorDATA uninstall-info-am
+	uninstall uninstall-am uninstall-hicolorDATA
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- kdelibs-3.5.7.orig/pics/Makefile.in
+++ kdelibs-3.5.7/pics/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -15,15 +15,11 @@
 
 @SET_MAKE@
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -64,7 +60,14 @@
 am__DEPENDENCIES_1 =
 ksvgtopng_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(top_builddir)/kdecore/svgicons/libkdesvgicons.la
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+#>- ksvgtopng_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(ksvgtopng_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+ksvgtopng_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(ksvgtopng_LDFLAGS) $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -72,34 +75,40 @@
 #>+ 2
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 #>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
 CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 3
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(ksvgtopng_SOURCES)
 DIST_SOURCES = $(ksvgtopng_SOURCES)
 #>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 #>- 	html-recursive info-recursive install-data-recursive \
-#>- 	install-exec-recursive install-info-recursive \
-#>- 	install-recursive installcheck-recursive installdirs-recursive \
-#>- 	pdf-recursive ps-recursive uninstall-info-recursive \
-#>- 	uninstall-recursive
-#>+ 6
+#>- 	install-dvi-recursive install-exec-recursive \
+#>- 	install-html-recursive install-info-recursive \
+#>- 	install-pdf-recursive install-ps-recursive install-recursive \
+#>- 	installcheck-recursive installdirs-recursive pdf-recursive \
+#>- 	ps-recursive uninstall-recursive
+#>+ 7
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	html-recursive info-recursive install-data-recursive \
-	install-exec-recursive install-info-recursive \
-	install-recursive installcheck-recursive installdirs-recursive \
-	pdf-recursive ps-recursive uninstall-info-recursive \
-	uninstall-recursive nmcheck-recursive bcheck-recursive
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive nmcheck-recursive bcheck-recursive
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
@@ -109,8 +118,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -118,13 +125,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -138,8 +145,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -160,17 +165,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -239,7 +241,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -276,12 +277,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -326,87 +329,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -430,75 +389,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -506,16 +407,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -533,7 +433,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -571,13 +471,13 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
+	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
 	  if test -f $$p \
@@ -605,7 +505,7 @@
 	done
 ksvgtopng$(EXEEXT): $(ksvgtopng_OBJECTS) $(ksvgtopng_DEPENDENCIES) 
 	@rm -f ksvgtopng$(EXEEXT)
-	$(CXXLINK) $(ksvgtopng_LDFLAGS) $(ksvgtopng_OBJECTS) $(ksvgtopng_LDADD) $(LIBS)
+	$(ksvgtopng_LINK) $(ksvgtopng_OBJECTS) $(ksvgtopng_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -616,22 +516,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ksvgtopng.Po@am__quote@
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -642,10 +542,6 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
 # To change the values of `make' variables: instead of editing Makefiles,
@@ -677,8 +573,7 @@
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
+$(RECURSIVE_CLEAN_TARGETS):
 	@failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
@@ -779,22 +674,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -808,7 +702,7 @@
 	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
-	    || $(mkdir_p) "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 	    || exit 1; \
 	    distdir=`$(am__cd) $(distdir) && pwd`; \
 	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
@@ -816,6 +710,8 @@
 	      $(MAKE) $(AM_MAKEFLAGS) \
 	        top_distdir="$$top_distdir" \
 	        distdir="$$distdir/$$subdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -826,7 +722,7 @@
 installdirs: installdirs-recursive
 installdirs-am:
 	for dir in "$(DESTDIR)$(bindir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-recursive
 install-exec: install-exec-recursive
@@ -864,7 +760,7 @@
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-recursive
 
@@ -878,12 +774,20 @@
 
 install-data-am: install-data-local
 
+install-dvi: install-dvi-recursive
+
 install-exec-am: install-binPROGRAMS
 
+install-html: install-html-recursive
+
 install-info: install-info-recursive
 
 install-man:
 
+install-pdf: install-pdf-recursive
+
+install-ps: install-ps-recursive
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
@@ -904,24 +808,26 @@
 
 ps-am:
 
-uninstall-am: uninstall-binPROGRAMS uninstall-info-am
+uninstall-am: uninstall-binPROGRAMS
 
-uninstall-info: uninstall-info-recursive
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+	install-strip
 
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-	clean clean-binPROGRAMS clean-generic clean-libtool \
-	clean-recursive ctags ctags-recursive distclean \
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+	all all-am check check-am clean clean-binPROGRAMS \
+	clean-generic clean-libtool ctags ctags-recursive distclean \
 	distclean-compile distclean-generic distclean-libtool \
-	distclean-recursive distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-binPROGRAMS \
-	install-data install-data-am install-data-local install-exec \
-	install-exec-am install-info install-info-am install-man \
-	install-strip installcheck installcheck-am installdirs \
-	installdirs-am maintainer-clean maintainer-clean-generic \
-	maintainer-clean-recursive mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-binPROGRAMS install-data \
+	install-data-am install-data-local install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs installdirs-am \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
 	pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
-	uninstall-binPROGRAMS uninstall-info-am
+	uninstall-binPROGRAMS
 
 
 install-data-local:
--- kdelibs-3.5.7.orig/libkscreensaver/Makefile.in
+++ kdelibs-3.5.7/libkscreensaver/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,15 +16,11 @@
 @SET_MAKE@
 
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -72,7 +68,14 @@
 libkscreensaver_la_nofinal_OBJECTS = main.lo kscreensaver.lo
 @KDE_USE_FINAL_FALSE@libkscreensaver_la_OBJECTS = $(libkscreensaver_la_nofinal_OBJECTS)
 @KDE_USE_FINAL_TRUE@libkscreensaver_la_OBJECTS = $(libkscreensaver_la_final_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+#>- libkscreensaver_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(libkscreensaver_la_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+libkscreensaver_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(libkscreensaver_la_LDFLAGS) $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -80,19 +83,21 @@
 #>+ 2
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 #>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
 CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 3
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(libkscreensaver_la_SOURCES)
 DIST_SOURCES = $(libkscreensaver_la_SOURCES)
 includeHEADERS_INSTALL = $(INSTALL_HEADER)
@@ -105,8 +110,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -114,13 +117,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -134,8 +137,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -156,17 +157,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -235,7 +233,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -272,12 +269,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -322,87 +321,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -426,75 +381,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -502,16 +399,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -531,7 +427,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -569,13 +465,13 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
@@ -586,7 +482,7 @@
 
 uninstall-libLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
@@ -601,7 +497,7 @@
 	  rm -f "$${dir}/so_locations"; \
 	done
 libkscreensaver.la: $(libkscreensaver_la_OBJECTS) $(libkscreensaver_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(libdir) $(libkscreensaver_la_LDFLAGS) $(libkscreensaver_la_OBJECTS) $(libkscreensaver_la_LIBADD) $(LIBS)
+	$(libkscreensaver_la_LINK) -rpath $(libdir) $(libkscreensaver_la_OBJECTS) $(libkscreensaver_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -613,22 +509,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Plo@am__quote@
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -638,13 +534,9 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 install-includeHEADERS: $(include_HEADERS)
 	@$(NORMAL_INSTALL)
-	test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"
+	test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)"
 	@list='$(include_HEADERS)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -709,23 +601,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	$(mkdir_p) $(distdir)/../admin
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -741,7 +631,7 @@
 all-am: Makefile $(LTLIBRARIES) $(HEADERS)
 installdirs:
 	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -781,7 +671,7 @@
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
@@ -795,12 +685,20 @@
 
 install-data-am: install-data-local install-includeHEADERS
 
+install-dvi: install-dvi-am
+
 install-exec-am: install-libLTLIBRARIES
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -821,22 +719,26 @@
 
 ps-am:
 
-uninstall-am: uninstall-includeHEADERS uninstall-info-am \
-	uninstall-libLTLIBRARIES uninstall-local
+uninstall-am: uninstall-includeHEADERS uninstall-libLTLIBRARIES \
+	uninstall-local
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-libLTLIBRARIES clean-libtool ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
 	distclean-tags distdir dvi dvi-am html html-am info info-am \
 	install install-am install-data install-data-am \
-	install-data-local install-exec install-exec-am \
+	install-data-local install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am \
 	install-includeHEADERS install-info install-info-am \
-	install-libLTLIBRARIES install-man install-strip installcheck \
+	install-libLTLIBRARIES install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
 	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 	tags uninstall uninstall-am uninstall-includeHEADERS \
-	uninstall-info-am uninstall-libLTLIBRARIES uninstall-local
+	uninstall-libLTLIBRARIES uninstall-local
 
 
 messages:
--- kdelibs-3.5.7.orig/licenses/Makefile.in
+++ kdelibs-3.5.7/licenses/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -15,15 +15,11 @@
 
 @SET_MAKE@
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -69,8 +65,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -78,13 +72,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -98,8 +92,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -120,17 +112,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -199,7 +188,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -236,12 +224,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -286,87 +276,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -390,75 +336,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -466,16 +354,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -488,7 +375,7 @@
 all: docs-am  all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -526,9 +413,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 mostlyclean-libtool:
@@ -536,13 +423,9 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 install-licensesdataDATA: $(licensesdata_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(licensesdatadir)" || $(mkdir_p) "$(DESTDIR)$(licensesdatadir)"
+	test -z "$(licensesdatadir)" || $(MKDIR_P) "$(DESTDIR)$(licensesdatadir)"
 	@list='$(licensesdata_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -565,22 +448,21 @@
 
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -596,7 +478,7 @@
 all-am: Makefile $(DATA)
 installdirs:
 	for dir in "$(DESTDIR)$(licensesdatadir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -632,7 +514,7 @@
 
 distclean: distclean-am
 	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool
+distclean-am: clean-am distclean-generic
 
 dvi: dvi-am
 
@@ -646,12 +528,20 @@
 
 install-data-am: install-licensesdataDATA
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -670,18 +560,21 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-licensesdataDATA
+uninstall-am: uninstall-licensesdataDATA
+
+.MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
 	distclean distclean-generic distclean-libtool distdir dvi \
 	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-exec install-exec-am \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
 	install-info install-info-am install-licensesdataDATA \
-	install-man install-strip installcheck installcheck-am \
+	install-man install-pdf install-pdf-am install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
 	installdirs maintainer-clean maintainer-clean-generic \
 	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
-	ps ps-am uninstall uninstall-am uninstall-info-am \
-	uninstall-licensesdataDATA
+	ps ps-am uninstall uninstall-am uninstall-licensesdataDATA
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- kdelibs-3.5.7.orig/kdefx/Makefile.in
+++ kdelibs-3.5.7/kdefx/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -37,15 +37,11 @@
 #SUBDIRS = . tests
 
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -97,7 +93,14 @@
 	kcpuinfo.lo
 @KDE_USE_FINAL_FALSE@libkdefx_la_OBJECTS = $(libkdefx_la_nofinal_OBJECTS)
 @KDE_USE_FINAL_TRUE@libkdefx_la_OBJECTS = $(libkdefx_la_final_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+#>- libkdefx_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(libkdefx_la_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+libkdefx_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(libkdefx_la_LDFLAGS) $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -105,19 +108,21 @@
 #>+ 2
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 #>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
 CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 3
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(libkdefx_la_SOURCES)
 DIST_SOURCES = $(libkdefx_la_SOURCES)
 includeHEADERS_INSTALL = $(INSTALL_HEADER)
@@ -130,8 +135,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -139,13 +142,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -159,8 +162,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -181,17 +182,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -260,7 +258,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -297,12 +294,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -347,87 +346,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -451,75 +406,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -527,16 +424,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -544,9 +440,7 @@
 xdg_menudir = @xdg_menudir@
 INCLUDES = $(all_includes)
 lib_LTLIBRARIES = libkdefx.la
-#>- libkdefx_la_LDFLAGS = $(KDE_RPATH) $(KDE_MT_LDFLAGS) $(all_libraries) -no-undefined -version-info 6:0:2
-#>+ 1
-libkdefx_la_LDFLAGS = $(KDE_RPATH) $(KDE_MT_LDFLAGS) $(all_libraries) -no-undefined $(KDE_NO_UNDEFINED) -version-info 6:0:2
+libkdefx_la_LDFLAGS = $(KDE_RPATH) $(KDE_MT_LDFLAGS) $(all_libraries) -no-undefined -version-info 6:0:2
 libkdefx_la_LIBADD = $(LIB_QT) $(LIB_XRENDER)
 libkdefx_la_NMCHECK = $(srcdir)/libkdefx.nmcheck
 libkdefx_la_NMCHECKWEAK = $(srcdir)/libkdefx_weak.nmcheck $(top_srcdir)/kdecore/libqt-mt_weak.nmcheck \
@@ -568,7 +462,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(srcdir)/../admin/Doxyfile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../admin/Doxyfile.am $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -606,13 +500,13 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
@@ -623,7 +517,7 @@
 
 uninstall-libLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
@@ -637,14 +531,8 @@
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
-#>- libkdefx.la: $(libkdefx_la_OBJECTS) $(libkdefx_la_DEPENDENCIES) 
-#>+ 2
-@KDE_USE_CLOSURE_TRUE@libkdefx.la: libkdefx.la.closure $(libkdefx_la_OBJECTS) $(libkdefx_la_DEPENDENCIES) 
-@KDE_USE_CLOSURE_FALSE@libkdefx.la: $(libkdefx_la_OBJECTS) $(libkdefx_la_DEPENDENCIES) 
-#>- 	$(CXXLINK) -rpath $(libdir) $(libkdefx_la_LDFLAGS) $(libkdefx_la_OBJECTS) $(libkdefx_la_LIBADD) $(LIBS)
-#>+ 2
-	$(CXXLINK) -rpath $(libdir) $(libkdefx_la_LDFLAGS) $(libkdefx_la_OBJECTS) $(libkdefx_la_LIBADD) $(LIBS)
-@KDE_USE_NMCHECK_TRUE@	@$(MAKE) $(AM_MAKEFLAGS) nmcheck_libkdefx.la || ( rm -f libkdefx.la; exit 1 )
+libkdefx.la: $(libkdefx_la_OBJECTS) $(libkdefx_la_DEPENDENCIES) 
+	$(libkdefx_la_LINK) -rpath $(libdir) $(libkdefx_la_OBJECTS) $(libkdefx_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -661,22 +549,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kstyle.Plo@am__quote@
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -686,13 +574,9 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 install-includeHEADERS: $(include_HEADERS)
 	@$(NORMAL_INSTALL)
-	test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"
+	test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)"
 	@list='$(include_HEADERS)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -757,23 +641,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	$(mkdir_p) $(distdir)/../admin
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -789,7 +671,7 @@
 all-am: Makefile $(LTLIBRARIES) $(HEADERS)
 installdirs:
 	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -822,14 +704,14 @@
 #>- clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
 #>- 	mostlyclean-am
 #>+ 2
-clean-am: clean-metasources clean-closures clean-bcheck clean-final  clean-generic clean-libLTLIBRARIES clean-libtool \
+clean-am: clean-metasources clean-bcheck clean-final  clean-generic clean-libLTLIBRARIES clean-libtool \
 	mostlyclean-am
 
 distclean: distclean-am
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
@@ -843,12 +725,20 @@
 
 install-data-am: install-data-local install-includeHEADERS
 
+install-dvi: install-dvi-am
+
 install-exec-am: install-libLTLIBRARIES
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -869,22 +759,26 @@
 
 ps-am:
 
-uninstall-am: uninstall-includeHEADERS uninstall-info-am \
-	uninstall-libLTLIBRARIES uninstall-local
+uninstall-am: uninstall-includeHEADERS uninstall-libLTLIBRARIES \
+	uninstall-local
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-libLTLIBRARIES clean-libtool ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
 	distclean-tags distdir dvi dvi-am html html-am info info-am \
 	install install-am install-data install-data-am \
-	install-data-local install-exec install-exec-am \
+	install-data-local install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am \
 	install-includeHEADERS install-info install-info-am \
-	install-libLTLIBRARIES install-man install-strip installcheck \
+	install-libLTLIBRARIES install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
 	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 	tags uninstall uninstall-am uninstall-includeHEADERS \
-	uninstall-info-am uninstall-libLTLIBRARIES uninstall-local
+	uninstall-libLTLIBRARIES uninstall-local
 
 apidox-am-yes:
 	@if test \! -d "$(top_srcdir)/doc/common/" && test -z "$$DOXDATA" ; then \
@@ -982,15 +876,6 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
-#>+ 8
-libkdefx.la.closure: $(libkdefx_la_OBJECTS) $(libkdefx_la_DEPENDENCIES)
-	@echo "int main() {return 0;}" > libkdefx_la_closure.cpp
-	@$(LTCXXCOMPILE) -c libkdefx_la_closure.cpp
-	$(CXXLINK) libkdefx_la_closure.lo $(libkdefx_la_LDFLAGS) $(libkdefx_la_OBJECTS) $(libkdefx_la_LIBADD) $(LIBS)
-	@rm -f libkdefx_la_closure.* libkdefx.la.closure
-	@echo "timestamp" > libkdefx.la.closure
-
-
 #>+ 5
 
 nmcheck_libkdefx.la: libkdefx.la 
@@ -1011,10 +896,6 @@
 #>+ 2
 KDE_DIST=libkdefx_weak.nmcheck Makefile.in configure.in.in libkdefx.nmcheck Makefile.am 
 
-#>+ 3
-clean-closures:
-	-rm -f  libkdefx.la.closure
-
 #>+ 2
 docs-am:
 
--- kdelibs-3.5.7.orig/interfaces/kio/Makefile.in
+++ kdelibs-3.5.7/interfaces/kio/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -15,15 +15,11 @@
 
 @SET_MAKE@
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -72,8 +68,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -81,13 +75,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -101,8 +95,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -123,17 +115,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -202,7 +191,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -239,12 +227,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -289,87 +279,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -393,75 +339,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -469,16 +357,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -491,7 +378,7 @@
 all: docs-am  all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -529,9 +416,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 mostlyclean-libtool:
@@ -539,13 +426,9 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 install-kioincludeHEADERS: $(kioinclude_HEADERS)
 	@$(NORMAL_INSTALL)
-	test -z "$(kioincludedir)" || $(mkdir_p) "$(DESTDIR)$(kioincludedir)"
+	test -z "$(kioincludedir)" || $(MKDIR_P) "$(DESTDIR)$(kioincludedir)"
 	@list='$(kioinclude_HEADERS)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -610,22 +493,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -641,7 +523,7 @@
 all-am: Makefile $(HEADERS)
 installdirs:
 	for dir in "$(DESTDIR)$(kioincludedir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -677,8 +559,7 @@
 
 distclean: distclean-am
 	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool \
-	distclean-tags
+distclean-am: clean-am distclean-generic distclean-tags
 
 dvi: dvi-am
 
@@ -692,12 +573,20 @@
 
 install-data-am: install-kioincludeHEADERS
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -716,19 +605,22 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-kioincludeHEADERS
+uninstall-am: uninstall-kioincludeHEADERS
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-libtool ctags distclean distclean-generic \
 	distclean-libtool distclean-tags distdir dvi dvi-am html \
 	html-am info info-am install install-am install-data \
-	install-data-am install-exec install-exec-am install-info \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
 	install-info-am install-kioincludeHEADERS install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
 	install-strip installcheck installcheck-am installdirs \
 	maintainer-clean maintainer-clean-generic mostlyclean \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-info-am \
-	uninstall-kioincludeHEADERS
+	tags uninstall uninstall-am uninstall-kioincludeHEADERS
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- kdelibs-3.5.7.orig/interfaces/ktexteditor/Makefile.in
+++ kdelibs-3.5.7/interfaces/ktexteditor/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -17,15 +17,11 @@
 
 
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -113,7 +109,14 @@
 	editinterfaceext.lo variableinterface.lo templateinterface.lo editdcopinterface_skel.lo clipboarddcopinterface_skel.lo selectiondcopinterface_skel.lo searchdcopinterface_skel.lo blockselectiondcopinterface_skel.lo documentdcopinfo_skel.lo encodingdcopinterface_skel.lo printdcopinterface_skel.lo undodcopinterface_skel.lo viewcursordcopinterface_skel.lo viewstatusmsgdcopinterface_skel.lo selectionextdcopinterface_skel.lo editorchooser_ui.lo
 @KDE_USE_FINAL_FALSE@libktexteditor_la_OBJECTS = $(libktexteditor_la_nofinal_OBJECTS)
 @KDE_USE_FINAL_TRUE@libktexteditor_la_OBJECTS = $(libktexteditor_la_final_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+#>- libktexteditor_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(libktexteditor_la_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+libktexteditor_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(libktexteditor_la_LDFLAGS) $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -121,19 +124,21 @@
 #>+ 2
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 #>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
 CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 3
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(libktexteditor_la_SOURCES)
 DIST_SOURCES = $(libktexteditor_la_SOURCES)
 kcm_ktexteditorDATA_INSTALL = $(INSTALL_DATA)
@@ -149,8 +154,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -158,13 +161,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -178,8 +181,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -200,17 +201,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -279,7 +277,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -316,12 +313,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -366,87 +365,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -470,75 +425,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -546,16 +443,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -626,7 +522,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(srcdir)/../../admin/Doxyfile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../admin/Doxyfile.am $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -664,13 +560,13 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
@@ -681,7 +577,7 @@
 
 uninstall-libLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
@@ -696,7 +592,7 @@
 	  rm -f "$${dir}/so_locations"; \
 	done
 libktexteditor.la: $(libktexteditor_la_OBJECTS) $(libktexteditor_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(libdir) $(libktexteditor_la_LDFLAGS) $(libktexteditor_la_OBJECTS) $(libktexteditor_la_LIBADD) $(LIBS)
+	$(libktexteditor_la_LINK) -rpath $(libdir) $(libktexteditor_la_OBJECTS) $(libktexteditor_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -746,22 +642,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wordwrapinterface.Plo@am__quote@
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -771,13 +667,9 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 install-kcm_ktexteditorDATA: $(kcm_ktexteditor_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(kcm_ktexteditordir)" || $(mkdir_p) "$(DESTDIR)$(kcm_ktexteditordir)"
+	test -z "$(kcm_ktexteditordir)" || $(MKDIR_P) "$(DESTDIR)$(kcm_ktexteditordir)"
 	@list='$(kcm_ktexteditor_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -794,7 +686,7 @@
 	done
 install-servicetypeDATA: $(servicetype_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(servicetypedir)" || $(mkdir_p) "$(DESTDIR)$(servicetypedir)"
+	test -z "$(servicetypedir)" || $(MKDIR_P) "$(DESTDIR)$(servicetypedir)"
 	@list='$(servicetype_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -811,7 +703,7 @@
 	done
 install-ktexteditorincludeHEADERS: $(ktexteditorinclude_HEADERS)
 	@$(NORMAL_INSTALL)
-	test -z "$(ktexteditorincludedir)" || $(mkdir_p) "$(DESTDIR)$(ktexteditorincludedir)"
+	test -z "$(ktexteditorincludedir)" || $(MKDIR_P) "$(DESTDIR)$(ktexteditorincludedir)"
 	@list='$(ktexteditorinclude_HEADERS)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -876,23 +768,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	$(mkdir_p) $(distdir)/../../admin
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -908,7 +798,7 @@
 all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS)
 installdirs:
 	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(kcm_ktexteditordir)" "$(DESTDIR)$(servicetypedir)" "$(DESTDIR)$(ktexteditorincludedir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -948,7 +838,7 @@
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
@@ -963,12 +853,20 @@
 install-data-am: install-data-local install-kcm_ktexteditorDATA \
 	install-ktexteditorincludeHEADERS install-servicetypeDATA
 
+install-dvi: install-dvi-am
+
 install-exec-am: install-libLTLIBRARIES
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -989,24 +887,27 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-kcm_ktexteditorDATA \
+uninstall-am: uninstall-kcm_ktexteditorDATA \
 	uninstall-ktexteditorincludeHEADERS uninstall-libLTLIBRARIES \
 	uninstall-local uninstall-servicetypeDATA
 
+.MAKE: install-am install-strip
+
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-libLTLIBRARIES clean-libtool ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
 	distclean-tags distdir dvi dvi-am html html-am info info-am \
 	install install-am install-data install-data-am \
-	install-data-local install-exec install-exec-am install-info \
+	install-data-local install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
 	install-info-am install-kcm_ktexteditorDATA \
 	install-ktexteditorincludeHEADERS install-libLTLIBRARIES \
-	install-man install-servicetypeDATA install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
+	install-man install-pdf install-pdf-am install-ps \
+	install-ps-am install-servicetypeDATA install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-info-am \
-	uninstall-kcm_ktexteditorDATA \
+	tags uninstall uninstall-am uninstall-kcm_ktexteditorDATA \
 	uninstall-ktexteditorincludeHEADERS uninstall-libLTLIBRARIES \
 	uninstall-local uninstall-servicetypeDATA
 
--- kdelibs-3.5.7.orig/interfaces/terminal/test/Makefile.in
+++ kdelibs-3.5.7/interfaces/terminal/test/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,15 +14,11 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -59,7 +55,14 @@
 am__DEPENDENCIES_1 =
 test_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+#>- test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
+#>- 	$(test_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
+	$(test_LDFLAGS) $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -67,19 +70,21 @@
 #>+ 2
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 #>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
 CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 3
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(test_SOURCES)
 DIST_SOURCES = $(test_SOURCES)
 ETAGS = etags
@@ -90,8 +95,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -99,13 +102,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -119,8 +122,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -141,17 +142,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -220,7 +218,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -257,12 +254,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -307,87 +306,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -411,75 +366,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -487,16 +384,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -513,7 +409,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cc .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -551,9 +447,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 clean-checkPROGRAMS:
@@ -564,7 +460,7 @@
 	done
 test$(EXEEXT): $(test_OBJECTS) $(test_DEPENDENCIES) 
 	@rm -f test$(EXEEXT)
-	$(CXXLINK) $(test_LDFLAGS) $(test_OBJECTS) $(test_LDADD) $(LIBS)
+	$(test_LINK) $(test_OBJECTS) $(test_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -575,22 +471,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@
 
 .cc.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cc.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cc.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -601,10 +497,6 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -654,22 +546,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -723,7 +614,7 @@
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
@@ -737,12 +628,20 @@
 
 install-data-am:
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -763,19 +662,23 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am
+uninstall-am:
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean \
 	clean-checkPROGRAMS clean-generic clean-libtool ctags \
 	distclean distclean-compile distclean-generic \
 	distclean-libtool distclean-tags distdir dvi dvi-am html \
 	html-am info info-am install install-am install-data \
-	install-data-am install-exec install-exec-am install-info \
-	install-info-am install-man install-strip installcheck \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
 	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-info-am
+	tags uninstall uninstall-am
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- kdelibs-3.5.7.orig/interfaces/terminal/Makefile.in
+++ kdelibs-3.5.7/interfaces/terminal/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -15,15 +15,11 @@
 
 @SET_MAKE@
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -72,8 +68,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -81,13 +75,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -101,8 +95,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -123,17 +115,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -202,7 +191,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -239,12 +227,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -289,87 +279,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -393,75 +339,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -469,16 +357,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -491,7 +378,7 @@
 all: docs-am  all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -529,9 +416,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 mostlyclean-libtool:
@@ -539,13 +426,9 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 install-ktexteditorincludeHEADERS: $(ktexteditorinclude_HEADERS)
 	@$(NORMAL_INSTALL)
-	test -z "$(ktexteditorincludedir)" || $(mkdir_p) "$(DESTDIR)$(ktexteditorincludedir)"
+	test -z "$(ktexteditorincludedir)" || $(MKDIR_P) "$(DESTDIR)$(ktexteditorincludedir)"
 	@list='$(ktexteditorinclude_HEADERS)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -610,22 +493,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -641,7 +523,7 @@
 all-am: Makefile $(HEADERS)
 installdirs:
 	for dir in "$(DESTDIR)$(ktexteditorincludedir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -677,8 +559,7 @@
 
 distclean: distclean-am
 	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool \
-	distclean-tags
+distclean-am: clean-am distclean-generic distclean-tags
 
 dvi: dvi-am
 
@@ -692,12 +573,20 @@
 
 install-data-am: install-ktexteditorincludeHEADERS
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -716,18 +605,22 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-ktexteditorincludeHEADERS
+uninstall-am: uninstall-ktexteditorincludeHEADERS
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-libtool ctags distclean distclean-generic \
 	distclean-libtool distclean-tags distdir dvi dvi-am html \
 	html-am info info-am install install-am install-data \
-	install-data-am install-exec install-exec-am install-info \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
 	install-info-am install-ktexteditorincludeHEADERS install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
 	install-strip installcheck installcheck-am installdirs \
 	maintainer-clean maintainer-clean-generic mostlyclean \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-info-am \
+	tags uninstall uninstall-am \
 	uninstall-ktexteditorincludeHEADERS
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
--- kdelibs-3.5.7.orig/interfaces/kspeech/Makefile.in
+++ kdelibs-3.5.7/interfaces/kspeech/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,15 +16,11 @@
 @SET_MAKE@
 
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -76,8 +72,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -85,13 +79,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -105,8 +99,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -127,17 +119,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -206,7 +195,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -243,12 +231,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -293,87 +283,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -397,75 +343,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -473,16 +361,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -501,7 +388,7 @@
 all: docs-am  all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(srcdir)/../../admin/Doxyfile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../admin/Doxyfile.am $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -539,9 +426,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 mostlyclean-libtool:
@@ -549,13 +436,9 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 install-kde_servicetypesDATA: $(kde_servicetypes_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(kde_servicetypesdir)" || $(mkdir_p) "$(DESTDIR)$(kde_servicetypesdir)"
+	test -z "$(kde_servicetypesdir)" || $(MKDIR_P) "$(DESTDIR)$(kde_servicetypesdir)"
 	@list='$(kde_servicetypes_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -572,7 +455,7 @@
 	done
 install-includeHEADERS: $(include_HEADERS)
 	@$(NORMAL_INSTALL)
-	test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"
+	test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)"
 	@list='$(include_HEADERS)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -637,23 +520,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	$(mkdir_p) $(distdir)/../../admin
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -669,7 +550,7 @@
 all-am: Makefile $(DATA) $(HEADERS)
 installdirs:
 	for dir in "$(DESTDIR)$(kde_servicetypesdir)" "$(DESTDIR)$(includedir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -705,8 +586,7 @@
 
 distclean: distclean-am
 	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool \
-	distclean-tags
+distclean-am: clean-am distclean-generic distclean-tags
 
 dvi: dvi-am
 
@@ -721,12 +601,20 @@
 install-data-am: install-data-local install-includeHEADERS \
 	install-kde_servicetypesDATA
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -745,22 +633,25 @@
 
 ps-am:
 
-uninstall-am: uninstall-includeHEADERS uninstall-info-am \
-	uninstall-kde_servicetypesDATA uninstall-local
+uninstall-am: uninstall-includeHEADERS uninstall-kde_servicetypesDATA \
+	uninstall-local
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-libtool ctags distclean distclean-generic \
 	distclean-libtool distclean-tags distdir dvi dvi-am html \
 	html-am info info-am install install-am install-data \
-	install-data-am install-data-local install-exec \
-	install-exec-am install-includeHEADERS install-info \
-	install-info-am install-kde_servicetypesDATA install-man \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-includeHEADERS \
-	uninstall-info-am uninstall-kde_servicetypesDATA \
-	uninstall-local
+	install-data-am install-data-local install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-includeHEADERS install-info install-info-am \
+	install-kde_servicetypesDATA install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
+	uninstall-am uninstall-includeHEADERS \
+	uninstall-kde_servicetypesDATA uninstall-local
 
 apidox-am-yes:
 	@if test \! -d "$(top_srcdir)/doc/common/" && test -z "$$DOXDATA" ; then \
--- kdelibs-3.5.7.orig/interfaces/Makefile.in
+++ kdelibs-3.5.7/interfaces/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,15 +14,11 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -56,17 +52,21 @@
 DIST_SOURCES =
 #>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 #>- 	html-recursive info-recursive install-data-recursive \
-#>- 	install-exec-recursive install-info-recursive \
-#>- 	install-recursive installcheck-recursive installdirs-recursive \
-#>- 	pdf-recursive ps-recursive uninstall-info-recursive \
-#>- 	uninstall-recursive
-#>+ 6
+#>- 	install-dvi-recursive install-exec-recursive \
+#>- 	install-html-recursive install-info-recursive \
+#>- 	install-pdf-recursive install-ps-recursive install-recursive \
+#>- 	installcheck-recursive installdirs-recursive pdf-recursive \
+#>- 	ps-recursive uninstall-recursive
+#>+ 7
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	html-recursive info-recursive install-data-recursive \
-	install-exec-recursive install-info-recursive \
-	install-recursive installcheck-recursive installdirs-recursive \
-	pdf-recursive ps-recursive uninstall-info-recursive \
-	uninstall-recursive nmcheck-recursive bcheck-recursive
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive nmcheck-recursive bcheck-recursive
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
@@ -76,8 +76,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -85,13 +83,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -105,8 +103,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -127,17 +123,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -206,7 +199,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -243,12 +235,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -293,87 +287,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -397,75 +347,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -473,16 +365,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -496,7 +387,7 @@
 all: docs-am  all-recursive
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(srcdir)/../admin/Doxyfile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../admin/Doxyfile.am $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -534,9 +425,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 mostlyclean-libtool:
@@ -545,10 +436,6 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
 # To change the values of `make' variables: instead of editing Makefiles,
@@ -580,8 +467,7 @@
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
+$(RECURSIVE_CLEAN_TARGETS):
 	@failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
@@ -682,23 +568,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	$(mkdir_p) $(distdir)/../admin
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -712,7 +596,7 @@
 	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
-	    || $(mkdir_p) "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 	    || exit 1; \
 	    distdir=`$(am__cd) $(distdir) && pwd`; \
 	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
@@ -720,6 +604,8 @@
 	      $(MAKE) $(AM_MAKEFLAGS) \
 	        top_distdir="$$top_distdir" \
 	        distdir="$$distdir/$$subdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -763,8 +649,7 @@
 
 distclean: distclean-recursive
 	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool \
-	distclean-tags
+distclean-am: clean-am distclean-generic distclean-tags
 
 dvi: dvi-recursive
 
@@ -778,12 +663,20 @@
 
 install-data-am: install-data-local
 
+install-dvi: install-dvi-recursive
+
 install-exec-am:
 
+install-html: install-html-recursive
+
 install-info: install-info-recursive
 
 install-man:
 
+install-pdf: install-pdf-recursive
+
+install-ps: install-ps-recursive
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
@@ -802,23 +695,24 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-local
+uninstall-am: uninstall-local
 
-uninstall-info: uninstall-info-recursive
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+	install-strip
 
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-	clean clean-generic clean-libtool clean-recursive ctags \
-	ctags-recursive distclean distclean-generic distclean-libtool \
-	distclean-recursive distclean-tags distdir dvi dvi-am html \
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+	all all-am check check-am clean clean-generic clean-libtool \
+	ctags ctags-recursive distclean distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
 	html-am info info-am install install-am install-data \
-	install-data-am install-data-local install-exec \
-	install-exec-am install-info install-info-am install-man \
-	install-strip installcheck installcheck-am installdirs \
-	installdirs-am maintainer-clean maintainer-clean-generic \
-	maintainer-clean-recursive mostlyclean mostlyclean-generic \
-	mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
-	tags tags-recursive uninstall uninstall-am uninstall-info-am \
-	uninstall-local
+	install-data-am install-data-local install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs installdirs-am \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags tags-recursive uninstall uninstall-am uninstall-local
 
 apidox-am-yes:
 	@if test \! -d "$(top_srcdir)/doc/common/" && test -z "$$DOXDATA" ; then \
--- kdelibs-3.5.7.orig/interfaces/kmediaplayer/kfileaudiopreview/Makefile.in
+++ kdelibs-3.5.7/interfaces/kmediaplayer/kfileaudiopreview/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,15 +16,11 @@
 @SET_MAKE@
 
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -71,7 +67,14 @@
 #>- kfileaudiopreview_la_OBJECTS = $(am_kfileaudiopreview_la_OBJECTS)
 #>+ 1
 kfileaudiopreview_la_OBJECTS = kfileaudiopreview.lo
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+#>- kfileaudiopreview_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(kfileaudiopreview_la_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+kfileaudiopreview_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(kfileaudiopreview_la_LDFLAGS) $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -79,19 +82,21 @@
 #>+ 2
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 #>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
 CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 3
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(kfileaudiopreview_la_SOURCES)
 DIST_SOURCES = $(kfileaudiopreview_la_SOURCES)
 HEADERS = $(noinst_HEADERS)
@@ -103,8 +108,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -112,13 +115,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -132,8 +135,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -154,17 +155,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -233,7 +231,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -270,12 +267,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -320,87 +319,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -424,75 +379,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -500,16 +397,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -519,9 +415,7 @@
 #>- METASOURCES = AUTO
 kde_module_LTLIBRARIES = kfileaudiopreview.la
 kfileaudiopreview_la_SOURCES = kfileaudiopreview.cpp
-#>- kfileaudiopreview_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version -no-undefined
-#>+ 1
-kfileaudiopreview_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version -no-undefined $(KDE_NO_UNDEFINED)
+kfileaudiopreview_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version -no-undefined
 kfileaudiopreview_la_LIBADD = $(top_builddir)/interfaces/kmediaplayer/libkmediaplayer.la $(top_builddir)/arts/kde/libartskde.la $(LIB_KIO)
 noinst_HEADERS = kfileaudiopreview.h
 #>- all: all-am
@@ -530,7 +424,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -568,13 +462,13 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
+	test -z "$(kde_moduledir)" || $(MKDIR_P) "$(DESTDIR)$(kde_moduledir)"
 	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
@@ -585,7 +479,7 @@
 
 uninstall-kde_moduleLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
@@ -599,11 +493,8 @@
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
-#>- kfileaudiopreview.la: $(kfileaudiopreview_la_OBJECTS) $(kfileaudiopreview_la_DEPENDENCIES) 
-#>+ 2
-@KDE_USE_CLOSURE_TRUE@kfileaudiopreview.la: kfileaudiopreview.la.closure $(kfileaudiopreview_la_OBJECTS) $(kfileaudiopreview_la_DEPENDENCIES) 
-@KDE_USE_CLOSURE_FALSE@kfileaudiopreview.la: $(kfileaudiopreview_la_OBJECTS) $(kfileaudiopreview_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(kde_moduledir) $(kfileaudiopreview_la_LDFLAGS) $(kfileaudiopreview_la_OBJECTS) $(kfileaudiopreview_la_LIBADD) $(LIBS)
+kfileaudiopreview.la: $(kfileaudiopreview_la_OBJECTS) $(kfileaudiopreview_la_DEPENDENCIES) 
+	$(kfileaudiopreview_la_LINK) -rpath $(kde_moduledir) $(kfileaudiopreview_la_OBJECTS) $(kfileaudiopreview_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -614,22 +505,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kfileaudiopreview.Plo@am__quote@
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -640,10 +531,6 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -693,22 +580,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -724,7 +610,7 @@
 all-am: Makefile $(LTLIBRARIES) $(HEADERS)
 installdirs:
 	for dir in "$(DESTDIR)$(kde_moduledir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -757,14 +643,14 @@
 #>- clean-am: clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
 #>- 	mostlyclean-am
 #>+ 2
-clean-am: clean-metasources clean-closures clean-bcheck  clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
+clean-am: clean-metasources clean-bcheck  clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
 	mostlyclean-am
 
 distclean: distclean-am
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
@@ -780,14 +666,22 @@
 #>+ 1
 install-data-am:   
 
+install-dvi: install-dvi-am
+
 #>- install-exec-am:
 #>+ 1
 install-exec-am:  install-kde_moduleLTLIBRARIES
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -808,20 +702,23 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-kde_moduleLTLIBRARIES
+uninstall-am: uninstall-kde_moduleLTLIBRARIES
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-kde_moduleLTLIBRARIES clean-libtool ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
 	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-exec \
-	install-exec-am install-info install-info-am \
-	install-kde_moduleLTLIBRARIES install-man install-strip \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am \
+	install-kde_moduleLTLIBRARIES install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
 	installcheck installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-info-am \
-	uninstall-kde_moduleLTLIBRARIES
+	tags uninstall uninstall-am uninstall-kde_moduleLTLIBRARIES
 
 
 messages:
@@ -830,15 +727,6 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
-#>+ 8
-kfileaudiopreview.la.closure: $(kfileaudiopreview_la_OBJECTS) $(kfileaudiopreview_la_DEPENDENCIES)
-	@echo "int main() {return 0;}" > kfileaudiopreview_la_closure.cpp
-	@$(LTCXXCOMPILE) -c kfileaudiopreview_la_closure.cpp
-	$(CXXLINK) kfileaudiopreview_la_closure.lo $(kfileaudiopreview_la_LDFLAGS) $(kfileaudiopreview_la_OBJECTS) $(kfileaudiopreview_la_LIBADD) $(LIBS)
-	@rm -f kfileaudiopreview_la_closure.* kfileaudiopreview.la.closure
-	@echo "timestamp" > kfileaudiopreview.la.closure
-
-
 #>+ 3
 kfileaudiopreview.moc: $(srcdir)/kfileaudiopreview.h
 	$(MOC) $(srcdir)/kfileaudiopreview.h -o kfileaudiopreview.moc
@@ -853,10 +741,6 @@
 #>+ 2
 KDE_DIST=Makefile.in Makefile.am 
 
-#>+ 3
-clean-closures:
-	-rm -f  kfileaudiopreview.la.closure
-
 #>+ 2
 docs-am:
 
--- kdelibs-3.5.7.orig/interfaces/kmediaplayer/Makefile.in
+++ kdelibs-3.5.7/interfaces/kmediaplayer/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -17,15 +17,11 @@
 
 
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -75,7 +71,14 @@
 libkmediaplayer_la_nofinal_OBJECTS = player.lo view.lo playerdcopobject_skel.lo
 @KDE_USE_FINAL_FALSE@libkmediaplayer_la_OBJECTS = $(libkmediaplayer_la_nofinal_OBJECTS)
 @KDE_USE_FINAL_TRUE@libkmediaplayer_la_OBJECTS = $(libkmediaplayer_la_final_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+#>- libkmediaplayer_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(libkmediaplayer_la_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+libkmediaplayer_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(libkmediaplayer_la_LDFLAGS) $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -83,38 +86,44 @@
 #>+ 2
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 #>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
 CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 3
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(libkmediaplayer_la_SOURCES)
 DIST_SOURCES = $(libkmediaplayer_la_SOURCES)
 #>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 #>- 	html-recursive info-recursive install-data-recursive \
-#>- 	install-exec-recursive install-info-recursive \
-#>- 	install-recursive installcheck-recursive installdirs-recursive \
-#>- 	pdf-recursive ps-recursive uninstall-info-recursive \
-#>- 	uninstall-recursive
-#>+ 6
+#>- 	install-dvi-recursive install-exec-recursive \
+#>- 	install-html-recursive install-info-recursive \
+#>- 	install-pdf-recursive install-ps-recursive install-recursive \
+#>- 	installcheck-recursive installdirs-recursive pdf-recursive \
+#>- 	ps-recursive uninstall-recursive
+#>+ 7
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	html-recursive info-recursive install-data-recursive \
-	install-exec-recursive install-info-recursive \
-	install-recursive installcheck-recursive installdirs-recursive \
-	pdf-recursive ps-recursive uninstall-info-recursive \
-	uninstall-recursive nmcheck-recursive bcheck-recursive
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive nmcheck-recursive bcheck-recursive
 kde_servicetypesDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(kde_servicetypes_DATA)
 kmediaplayerincludeHEADERS_INSTALL = $(INSTALL_HEADER)
 HEADERS = $(kmediaplayerinclude_HEADERS)
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = . kfileaudiopreview
@@ -124,8 +133,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -133,13 +140,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -153,8 +160,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -175,17 +180,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -254,7 +256,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -291,12 +292,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -341,87 +344,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -445,75 +404,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -521,16 +422,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -543,9 +443,7 @@
 #>- libkmediaplayer_la_SOURCES = player.cpp playerdcopobject.skel view.cpp
 #>+ 1
 libkmediaplayer_la_SOURCES=player.cpp  view.cpp playerdcopobject_skel.cpp
-#>- libkmediaplayer_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined
-#>+ 1
-libkmediaplayer_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined $(KDE_NO_UNDEFINED)
+libkmediaplayer_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined
 libkmediaplayer_la_LIBADD = $(LIB_KPARTS)
 #>- libkmediaplayer_la_METASOURCES = AUTO
 kmediaplayerinclude_HEADERS = player.h playerdcopobject.h view.h
@@ -557,7 +455,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -595,13 +493,13 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
@@ -612,7 +510,7 @@
 
 uninstall-libLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
@@ -626,11 +524,8 @@
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
-#>- libkmediaplayer.la: $(libkmediaplayer_la_OBJECTS) $(libkmediaplayer_la_DEPENDENCIES) 
-#>+ 2
-@KDE_USE_CLOSURE_TRUE@libkmediaplayer.la: libkmediaplayer.la.closure $(libkmediaplayer_la_OBJECTS) $(libkmediaplayer_la_DEPENDENCIES) 
-@KDE_USE_CLOSURE_FALSE@libkmediaplayer.la: $(libkmediaplayer_la_OBJECTS) $(libkmediaplayer_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(libdir) $(libkmediaplayer_la_LDFLAGS) $(libkmediaplayer_la_OBJECTS) $(libkmediaplayer_la_LIBADD) $(LIBS)
+libkmediaplayer.la: $(libkmediaplayer_la_OBJECTS) $(libkmediaplayer_la_DEPENDENCIES) 
+	$(libkmediaplayer_la_LINK) -rpath $(libdir) $(libkmediaplayer_la_OBJECTS) $(libkmediaplayer_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -642,22 +537,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/view.Plo@am__quote@
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -667,13 +562,9 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 install-kde_servicetypesDATA: $(kde_servicetypes_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(kde_servicetypesdir)" || $(mkdir_p) "$(DESTDIR)$(kde_servicetypesdir)"
+	test -z "$(kde_servicetypesdir)" || $(MKDIR_P) "$(DESTDIR)$(kde_servicetypesdir)"
 	@list='$(kde_servicetypes_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -690,7 +581,7 @@
 	done
 install-kmediaplayerincludeHEADERS: $(kmediaplayerinclude_HEADERS)
 	@$(NORMAL_INSTALL)
-	test -z "$(kmediaplayerincludedir)" || $(mkdir_p) "$(DESTDIR)$(kmediaplayerincludedir)"
+	test -z "$(kmediaplayerincludedir)" || $(MKDIR_P) "$(DESTDIR)$(kmediaplayerincludedir)"
 	@list='$(kmediaplayerinclude_HEADERS)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -737,8 +628,7 @@
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
+$(RECURSIVE_CLEAN_TARGETS):
 	@failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
@@ -839,22 +729,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -868,7 +757,7 @@
 	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
-	    || $(mkdir_p) "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 	    || exit 1; \
 	    distdir=`$(am__cd) $(distdir) && pwd`; \
 	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
@@ -876,6 +765,8 @@
 	      $(MAKE) $(AM_MAKEFLAGS) \
 	        top_distdir="$$top_distdir" \
 	        distdir="$$distdir/$$subdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -886,7 +777,7 @@
 installdirs: installdirs-recursive
 installdirs-am:
 	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(kde_servicetypesdir)" "$(DESTDIR)$(kmediaplayerincludedir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-recursive
 install-exec: install-exec-recursive
@@ -919,14 +810,14 @@
 #>- clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
 #>- 	mostlyclean-am
 #>+ 2
-clean-am: clean-metasources clean-idl clean-closures clean-bcheck clean-final  clean-generic clean-libLTLIBRARIES clean-libtool \
+clean-am: clean-metasources clean-idl clean-bcheck clean-final  clean-generic clean-libLTLIBRARIES clean-libtool \
 	mostlyclean-am
 
 distclean: distclean-recursive
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-recursive
 
@@ -941,12 +832,20 @@
 install-data-am: install-kde_servicetypesDATA \
 	install-kmediaplayerincludeHEADERS
 
+install-dvi: install-dvi-recursive
+
 install-exec-am: install-libLTLIBRARIES
 
+install-html: install-html-recursive
+
 install-info: install-info-recursive
 
 install-man:
 
+install-pdf: install-pdf-recursive
+
+install-ps: install-ps-recursive
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
@@ -967,26 +866,28 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-kde_servicetypesDATA \
+uninstall-am: uninstall-kde_servicetypesDATA \
 	uninstall-kmediaplayerincludeHEADERS uninstall-libLTLIBRARIES
 
-uninstall-info: uninstall-info-recursive
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+	install-strip
 
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-	clean clean-generic clean-libLTLIBRARIES clean-libtool \
-	clean-recursive ctags ctags-recursive distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-recursive distclean-tags distdir dvi dvi-am html \
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+	all all-am check check-am clean clean-generic \
+	clean-libLTLIBRARIES clean-libtool ctags ctags-recursive \
+	distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
 	html-am info info-am install install-am install-data \
-	install-data-am install-exec install-exec-am install-info \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
 	install-info-am install-kde_servicetypesDATA \
 	install-kmediaplayerincludeHEADERS install-libLTLIBRARIES \
-	install-man install-strip installcheck installcheck-am \
+	install-man install-pdf install-pdf-am install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
 	installdirs installdirs-am maintainer-clean \
-	maintainer-clean-generic maintainer-clean-recursive \
-	mostlyclean mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
-	tags tags-recursive uninstall uninstall-am uninstall-info-am \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags tags-recursive uninstall uninstall-am \
 	uninstall-kde_servicetypesDATA \
 	uninstall-kmediaplayerincludeHEADERS uninstall-libLTLIBRARIES
 
@@ -1000,15 +901,6 @@
 playerdcopobject_skel.cpp: playerdcopobject.kidl
 	$(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub playerdcopobject.kidl
 
-#>+ 8
-libkmediaplayer.la.closure: $(libkmediaplayer_la_OBJECTS) $(libkmediaplayer_la_DEPENDENCIES)
-	@echo "int main() {return 0;}" > libkmediaplayer_la_closure.cpp
-	@$(LTCXXCOMPILE) -c libkmediaplayer_la_closure.cpp
-	$(CXXLINK) libkmediaplayer_la_closure.lo $(libkmediaplayer_la_LDFLAGS) $(libkmediaplayer_la_OBJECTS) $(libkmediaplayer_la_LIBADD) $(LIBS)
-	@rm -f libkmediaplayer_la_closure.* libkmediaplayer.la.closure
-	@echo "timestamp" > libkmediaplayer.la.closure
-
-
 #>+ 3
 view.moc: $(srcdir)/view.h
 	$(MOC) $(srcdir)/view.h -o view.moc
@@ -1035,10 +927,6 @@
 	-rm -f \
 	playerdcopobject_skel.cpp playerdcopobject_skel.h playerdcopobject.kidl 
 
-#>+ 3
-clean-closures:
-	-rm -f  libkmediaplayer.la.closure
-
 #>+ 2
 docs-am:
 
--- kdelibs-3.5.7.orig/interfaces/kregexpeditor/Makefile.in
+++ kdelibs-3.5.7/interfaces/kregexpeditor/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -18,15 +18,11 @@
 # $Id: Makefile.am 162667 2002-06-23 13:34:47Z domi $
 
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -78,8 +74,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -87,13 +81,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -107,8 +101,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -129,17 +121,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -208,7 +197,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -245,12 +233,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -295,87 +285,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -399,75 +345,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -475,16 +363,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -500,7 +387,7 @@
 all: docs-am  all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -538,9 +425,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 mostlyclean-libtool:
@@ -548,13 +435,9 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 install-servicetypeDATA: $(servicetype_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(servicetypedir)" || $(mkdir_p) "$(DESTDIR)$(servicetypedir)"
+	test -z "$(servicetypedir)" || $(MKDIR_P) "$(DESTDIR)$(servicetypedir)"
 	@list='$(servicetype_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -571,7 +454,7 @@
 	done
 install-includeHEADERS: $(include_HEADERS)
 	@$(NORMAL_INSTALL)
-	test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"
+	test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)"
 	@list='$(include_HEADERS)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -636,22 +519,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -667,7 +549,7 @@
 all-am: Makefile $(DATA) $(HEADERS)
 installdirs:
 	for dir in "$(DESTDIR)$(servicetypedir)" "$(DESTDIR)$(includedir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -703,8 +585,7 @@
 
 distclean: distclean-am
 	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool \
-	distclean-tags
+distclean-am: clean-am distclean-generic distclean-tags
 
 dvi: dvi-am
 
@@ -718,12 +599,20 @@
 
 install-data-am: install-includeHEADERS install-servicetypeDATA
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -742,20 +631,23 @@
 
 ps-am:
 
-uninstall-am: uninstall-includeHEADERS uninstall-info-am \
-	uninstall-servicetypeDATA
+uninstall-am: uninstall-includeHEADERS uninstall-servicetypeDATA
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-libtool ctags distclean distclean-generic \
 	distclean-libtool distclean-tags distdir dvi dvi-am html \
 	html-am info info-am install install-am install-data \
-	install-data-am install-exec install-exec-am \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am \
 	install-includeHEADERS install-info install-info-am \
-	install-man install-servicetypeDATA install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
+	install-man install-pdf install-pdf-am install-ps \
+	install-ps-am install-servicetypeDATA install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-generic \
 	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
-	uninstall-am uninstall-includeHEADERS uninstall-info-am \
+	uninstall-am uninstall-includeHEADERS \
 	uninstall-servicetypeDATA
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
--- kdelibs-3.5.7.orig/interfaces/kscript/Makefile.in
+++ kdelibs-3.5.7/interfaces/kscript/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -17,15 +17,11 @@
 
 
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -75,7 +71,14 @@
 scriptclientinterface.moc.lo 
 @KDE_USE_FINAL_FALSE@libkscript_la_OBJECTS = $(libkscript_la_nofinal_OBJECTS)
 @KDE_USE_FINAL_TRUE@libkscript_la_OBJECTS = $(libkscript_la_final_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+#>- libkscript_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(libkscript_la_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+libkscript_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(libkscript_la_LDFLAGS) $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -83,38 +86,44 @@
 #>+ 2
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 #>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
 CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 3
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(libkscript_la_SOURCES)
 DIST_SOURCES = $(libkscript_la_SOURCES)
 #>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 #>- 	html-recursive info-recursive install-data-recursive \
-#>- 	install-exec-recursive install-info-recursive \
-#>- 	install-recursive installcheck-recursive installdirs-recursive \
-#>- 	pdf-recursive ps-recursive uninstall-info-recursive \
-#>- 	uninstall-recursive
-#>+ 6
+#>- 	install-dvi-recursive install-exec-recursive \
+#>- 	install-html-recursive install-info-recursive \
+#>- 	install-pdf-recursive install-ps-recursive install-recursive \
+#>- 	installcheck-recursive installdirs-recursive pdf-recursive \
+#>- 	ps-recursive uninstall-recursive
+#>+ 7
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	html-recursive info-recursive install-data-recursive \
-	install-exec-recursive install-info-recursive \
-	install-recursive installcheck-recursive installdirs-recursive \
-	pdf-recursive ps-recursive uninstall-info-recursive \
-	uninstall-recursive nmcheck-recursive bcheck-recursive
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive nmcheck-recursive bcheck-recursive
 servicetypeDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(servicetype_DATA)
 kscriptincludeHEADERS_INSTALL = $(INSTALL_HEADER)
 HEADERS = $(kscriptinclude_HEADERS)
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
@@ -124,8 +133,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -133,13 +140,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -153,8 +160,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -175,17 +180,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -254,7 +256,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -291,12 +292,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -341,87 +344,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -445,75 +404,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -521,16 +422,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -545,9 +445,7 @@
 #libkscriptloader_la_LDFLAGS = $(all_libraries) $(KDE_RPATH)
 #libkscriptloader_la_LIBADD = $(LIB_KPARTS)
 libkscript_la_SOURCES = scriptmanager.cpp
-#>- libkscript_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined
-#>+ 1
-libkscript_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined $(KDE_NO_UNDEFINED)
+libkscript_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined
 libkscript_la_LIBADD = $(LIB_KIO)
 kscriptinclude_HEADERS = scriptinterface.h scriptclientinterface.h scriptmanager.h
 kscriptincludedir = $(includedir)
@@ -560,7 +458,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -598,13 +496,13 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
@@ -615,7 +513,7 @@
 
 uninstall-libLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
@@ -629,11 +527,8 @@
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
-#>- libkscript.la: $(libkscript_la_OBJECTS) $(libkscript_la_DEPENDENCIES) 
-#>+ 2
-@KDE_USE_CLOSURE_TRUE@libkscript.la: libkscript.la.closure $(libkscript_la_OBJECTS) $(libkscript_la_DEPENDENCIES) 
-@KDE_USE_CLOSURE_FALSE@libkscript.la: $(libkscript_la_OBJECTS) $(libkscript_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(libdir) $(libkscript_la_LDFLAGS) $(libkscript_la_OBJECTS) $(libkscript_la_LIBADD) $(LIBS)
+libkscript.la: $(libkscript_la_OBJECTS) $(libkscript_la_DEPENDENCIES) 
+	$(libkscript_la_LINK) -rpath $(libdir) $(libkscript_la_OBJECTS) $(libkscript_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -644,22 +539,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scriptmanager.Plo@am__quote@
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -669,13 +564,9 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 install-servicetypeDATA: $(servicetype_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(servicetypedir)" || $(mkdir_p) "$(DESTDIR)$(servicetypedir)"
+	test -z "$(servicetypedir)" || $(MKDIR_P) "$(DESTDIR)$(servicetypedir)"
 	@list='$(servicetype_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -692,7 +583,7 @@
 	done
 install-kscriptincludeHEADERS: $(kscriptinclude_HEADERS)
 	@$(NORMAL_INSTALL)
-	test -z "$(kscriptincludedir)" || $(mkdir_p) "$(DESTDIR)$(kscriptincludedir)"
+	test -z "$(kscriptincludedir)" || $(MKDIR_P) "$(DESTDIR)$(kscriptincludedir)"
 	@list='$(kscriptinclude_HEADERS)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -739,8 +630,7 @@
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
+$(RECURSIVE_CLEAN_TARGETS):
 	@failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
@@ -841,22 +731,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -870,7 +759,7 @@
 	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
-	    || $(mkdir_p) "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 	    || exit 1; \
 	    distdir=`$(am__cd) $(distdir) && pwd`; \
 	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
@@ -878,6 +767,8 @@
 	      $(MAKE) $(AM_MAKEFLAGS) \
 	        top_distdir="$$top_distdir" \
 	        distdir="$$distdir/$$subdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -888,7 +779,7 @@
 installdirs: installdirs-recursive
 installdirs-am:
 	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(servicetypedir)" "$(DESTDIR)$(kscriptincludedir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-recursive
 install-exec: install-exec-recursive
@@ -921,14 +812,14 @@
 #>- clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
 #>- 	mostlyclean-am
 #>+ 2
-clean-am: clean-metasources clean-closures clean-bcheck clean-final  clean-generic clean-libLTLIBRARIES clean-libtool \
+clean-am: clean-metasources clean-bcheck clean-final  clean-generic clean-libLTLIBRARIES clean-libtool \
 	mostlyclean-am
 
 distclean: distclean-recursive
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-recursive
 
@@ -942,12 +833,20 @@
 
 install-data-am: install-kscriptincludeHEADERS install-servicetypeDATA
 
+install-dvi: install-dvi-recursive
+
 install-exec-am: install-libLTLIBRARIES
 
+install-html: install-html-recursive
+
 install-info: install-info-recursive
 
 install-man:
 
+install-pdf: install-pdf-recursive
+
+install-ps: install-ps-recursive
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
@@ -968,41 +867,34 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-kscriptincludeHEADERS \
-	uninstall-libLTLIBRARIES uninstall-servicetypeDATA
+uninstall-am: uninstall-kscriptincludeHEADERS uninstall-libLTLIBRARIES \
+	uninstall-servicetypeDATA
 
-uninstall-info: uninstall-info-recursive
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+	install-strip
 
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-	clean clean-generic clean-libLTLIBRARIES clean-libtool \
-	clean-recursive ctags ctags-recursive distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-recursive distclean-tags distdir dvi dvi-am html \
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+	all all-am check check-am clean clean-generic \
+	clean-libLTLIBRARIES clean-libtool ctags ctags-recursive \
+	distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
 	html-am info info-am install install-am install-data \
-	install-data-am install-exec install-exec-am install-info \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
 	install-info-am install-kscriptincludeHEADERS \
-	install-libLTLIBRARIES install-man install-servicetypeDATA \
-	install-strip installcheck installcheck-am installdirs \
-	installdirs-am maintainer-clean maintainer-clean-generic \
-	maintainer-clean-recursive mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
+	install-libLTLIBRARIES install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-servicetypeDATA install-strip \
+	installcheck installcheck-am installdirs installdirs-am \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
 	pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
-	uninstall-info-am uninstall-kscriptincludeHEADERS \
-	uninstall-libLTLIBRARIES uninstall-servicetypeDATA
+	uninstall-kscriptincludeHEADERS uninstall-libLTLIBRARIES \
+	uninstall-servicetypeDATA
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
-#>+ 8
-libkscript.la.closure: $(libkscript_la_OBJECTS) $(libkscript_la_DEPENDENCIES)
-	@echo "int main() {return 0;}" > libkscript_la_closure.cpp
-	@$(LTCXXCOMPILE) -c libkscript_la_closure.cpp
-	$(CXXLINK) libkscript_la_closure.lo $(libkscript_la_LDFLAGS) $(libkscript_la_OBJECTS) $(libkscript_la_LIBADD) $(LIBS)
-	@rm -f libkscript_la_closure.* libkscript.la.closure
-	@echo "timestamp" > libkscript.la.closure
-
-
 #>+ 3
 scriptclientinterface.moc.cpp: $(srcdir)/scriptclientinterface.h
 	$(MOC) $(srcdir)/scriptclientinterface.h -o scriptclientinterface.moc.cpp
@@ -1038,10 +930,6 @@
 #>+ 2
 KDE_DIST=scriptloader.h Makefile.in scriptinterface.desktop Makefile.am 
 
-#>+ 3
-clean-closures:
-	-rm -f  libkscript.la.closure
-
 #>+ 2
 docs-am:
 
--- kdelibs-3.5.7.orig/interfaces/kscript/sample/Makefile.in
+++ kdelibs-3.5.7/interfaces/kscript/sample/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,15 +16,11 @@
 @SET_MAKE@
 
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -68,7 +64,14 @@
 #>- libshellscript_la_OBJECTS = $(am_libshellscript_la_OBJECTS)
 #>+ 1
 libshellscript_la_OBJECTS = shellscript.lo
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+#>- libshellscript_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(libshellscript_la_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+libshellscript_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(libshellscript_la_LDFLAGS) $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -76,19 +79,21 @@
 #>+ 2
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 #>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
 CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 3
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(libshellscript_la_SOURCES)
 DIST_SOURCES = $(libshellscript_la_SOURCES)
 servicetypeDATA_INSTALL = $(INSTALL_DATA)
@@ -101,8 +106,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -110,13 +113,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -130,8 +133,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -152,17 +153,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -231,7 +229,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -268,12 +265,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -318,87 +317,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -422,75 +377,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -498,16 +395,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -516,9 +412,7 @@
 INCLUDES = -I$(top_srcdir)/kio -I$(top_srcdir)/interfaces -I$(srcdir) -I$(top_srcdir) -I$(top_srcdir)/interfaces/kscript $(all_includes)
 kde_module_LTLIBRARIES = libshellscript.la
 libshellscript_la_SOURCES = shellscript.cpp
-#>- libshellscript_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -no-undefined -avoid-version
-#>+ 1
-libshellscript_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -no-undefined $(KDE_NO_UNDEFINED) -avoid-version
+libshellscript_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -no-undefined -avoid-version
 libshellscript_la_LIBADD = ../libkscript.la
 #>- METASOURCES = AUTO
 servicetypedir = $(kde_servicesdir)
@@ -529,7 +423,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -567,13 +461,13 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
+	test -z "$(kde_moduledir)" || $(MKDIR_P) "$(DESTDIR)$(kde_moduledir)"
 	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
@@ -584,7 +478,7 @@
 
 uninstall-kde_moduleLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
@@ -598,11 +492,8 @@
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
-#>- libshellscript.la: $(libshellscript_la_OBJECTS) $(libshellscript_la_DEPENDENCIES) 
-#>+ 2
-@KDE_USE_CLOSURE_TRUE@libshellscript.la: libshellscript.la.closure $(libshellscript_la_OBJECTS) $(libshellscript_la_DEPENDENCIES) 
-@KDE_USE_CLOSURE_FALSE@libshellscript.la: $(libshellscript_la_OBJECTS) $(libshellscript_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(kde_moduledir) $(libshellscript_la_LDFLAGS) $(libshellscript_la_OBJECTS) $(libshellscript_la_LIBADD) $(LIBS)
+libshellscript.la: $(libshellscript_la_OBJECTS) $(libshellscript_la_DEPENDENCIES) 
+	$(libshellscript_la_LINK) -rpath $(kde_moduledir) $(libshellscript_la_OBJECTS) $(libshellscript_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -613,22 +504,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/shellscript.Plo@am__quote@
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -638,13 +529,9 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 install-servicetypeDATA: $(servicetype_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(servicetypedir)" || $(mkdir_p) "$(DESTDIR)$(servicetypedir)"
+	test -z "$(servicetypedir)" || $(MKDIR_P) "$(DESTDIR)$(servicetypedir)"
 	@list='$(servicetype_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -709,22 +596,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -740,7 +626,7 @@
 all-am: Makefile $(LTLIBRARIES) $(DATA)
 installdirs:
 	for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(servicetypedir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -773,14 +659,14 @@
 #>- clean-am: clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
 #>- 	mostlyclean-am
 #>+ 2
-clean-am: clean-metasources clean-closures clean-bcheck  clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
+clean-am: clean-metasources clean-bcheck  clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
 	mostlyclean-am
 
 distclean: distclean-am
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
@@ -796,14 +682,22 @@
 #>+ 1
 install-data-am:   install-servicetypeDATA
 
+install-dvi: install-dvi-am
+
 #>- install-exec-am:
 #>+ 1
 install-exec-am:  install-kde_moduleLTLIBRARIES
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -824,36 +718,31 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-kde_moduleLTLIBRARIES \
+uninstall-am: uninstall-kde_moduleLTLIBRARIES \
 	uninstall-servicetypeDATA
 
+.MAKE: install-am install-strip
+
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-kde_moduleLTLIBRARIES clean-libtool ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
 	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-exec \
-	install-exec-am install-info install-info-am \
-	install-kde_moduleLTLIBRARIES install-man \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am \
+	install-kde_moduleLTLIBRARIES install-man install-pdf \
+	install-pdf-am install-ps install-ps-am \
 	install-servicetypeDATA install-strip installcheck \
 	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-info-am \
-	uninstall-kde_moduleLTLIBRARIES uninstall-servicetypeDATA
+	tags uninstall uninstall-am uninstall-kde_moduleLTLIBRARIES \
+	uninstall-servicetypeDATA
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
-#>+ 8
-libshellscript.la.closure: $(libshellscript_la_OBJECTS) $(libshellscript_la_DEPENDENCIES)
-	@echo "int main() {return 0;}" > libshellscript_la_closure.cpp
-	@$(LTCXXCOMPILE) -c libshellscript_la_closure.cpp
-	$(CXXLINK) libshellscript_la_closure.lo $(libshellscript_la_LDFLAGS) $(libshellscript_la_OBJECTS) $(libshellscript_la_LIBADD) $(LIBS)
-	@rm -f libshellscript_la_closure.* libshellscript.la.closure
-	@echo "timestamp" > libshellscript.la.closure
-
-
 #>+ 3
 shellscript.moc: $(srcdir)/shellscript.h
 	$(MOC) $(srcdir)/shellscript.h -o shellscript.moc
@@ -868,10 +757,6 @@
 #>+ 2
 KDE_DIST=Makefile.in shellscript.h shellscript.desktop Makefile.am 
 
-#>+ 3
-clean-closures:
-	-rm -f  libshellscript.la.closure
-
 #>+ 2
 docs-am:
 
--- kdelibs-3.5.7.orig/interfaces/khexedit/Makefile.in
+++ kdelibs-3.5.7/interfaces/khexedit/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,15 +16,11 @@
 @SET_MAKE@
 
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -76,8 +72,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -85,13 +79,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -105,8 +99,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -127,17 +119,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -206,7 +195,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -243,12 +231,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -293,87 +283,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -397,75 +343,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -473,16 +361,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -505,7 +392,7 @@
 all: docs-am  all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -543,9 +430,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 mostlyclean-libtool:
@@ -553,13 +440,9 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 install-servicetypeDATA: $(servicetype_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(servicetypedir)" || $(mkdir_p) "$(DESTDIR)$(servicetypedir)"
+	test -z "$(servicetypedir)" || $(MKDIR_P) "$(DESTDIR)$(servicetypedir)"
 	@list='$(servicetype_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -576,7 +459,7 @@
 	done
 install-khexeditincludeHEADERS: $(khexeditinclude_HEADERS)
 	@$(NORMAL_INSTALL)
-	test -z "$(khexeditincludedir)" || $(mkdir_p) "$(DESTDIR)$(khexeditincludedir)"
+	test -z "$(khexeditincludedir)" || $(MKDIR_P) "$(DESTDIR)$(khexeditincludedir)"
 	@list='$(khexeditinclude_HEADERS)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -641,22 +524,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -672,7 +554,7 @@
 all-am: Makefile $(DATA) $(HEADERS)
 installdirs:
 	for dir in "$(DESTDIR)$(servicetypedir)" "$(DESTDIR)$(khexeditincludedir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -708,8 +590,7 @@
 
 distclean: distclean-am
 	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool \
-	distclean-tags
+distclean-am: clean-am distclean-generic distclean-tags
 
 dvi: dvi-am
 
@@ -724,12 +605,20 @@
 install-data-am: install-khexeditincludeHEADERS \
 	install-servicetypeDATA
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -748,21 +637,25 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-khexeditincludeHEADERS \
+uninstall-am: uninstall-khexeditincludeHEADERS \
 	uninstall-servicetypeDATA
 
+.MAKE: install-am install-strip
+
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-libtool ctags distclean distclean-generic \
 	distclean-libtool distclean-tags distdir dvi dvi-am html \
 	html-am info info-am install install-am install-data \
-	install-data-am install-exec install-exec-am install-info \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
 	install-info-am install-khexeditincludeHEADERS install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
 	install-servicetypeDATA install-strip installcheck \
 	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-generic \
 	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
-	uninstall-am uninstall-info-am \
-	uninstall-khexeditincludeHEADERS uninstall-servicetypeDATA
+	uninstall-am uninstall-khexeditincludeHEADERS \
+	uninstall-servicetypeDATA
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- kdelibs-3.5.7.orig/interfaces/kimproxy/interface/Makefile.in
+++ kdelibs-3.5.7/interfaces/kimproxy/interface/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,15 +16,11 @@
 @SET_MAKE@
 
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -78,8 +74,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -87,13 +81,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -107,8 +101,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -129,17 +121,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -208,7 +197,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -245,12 +233,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -295,87 +285,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -399,75 +345,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -475,16 +363,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -503,7 +390,7 @@
 all: docs-am  all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -541,9 +428,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 mostlyclean-libtool:
@@ -551,13 +438,9 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 install-kcm_instantmessengerDATA: $(kcm_instantmessenger_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(kcm_instantmessengerdir)" || $(mkdir_p) "$(DESTDIR)$(kcm_instantmessengerdir)"
+	test -z "$(kcm_instantmessengerdir)" || $(MKDIR_P) "$(DESTDIR)$(kcm_instantmessengerdir)"
 	@list='$(kcm_instantmessenger_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -574,7 +457,7 @@
 	done
 install-servicetypeDATA: $(servicetype_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(servicetypedir)" || $(mkdir_p) "$(DESTDIR)$(servicetypedir)"
+	test -z "$(servicetypedir)" || $(MKDIR_P) "$(DESTDIR)$(servicetypedir)"
 	@list='$(servicetype_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -591,7 +474,7 @@
 	done
 install-kimifaceincludeHEADERS: $(kimifaceinclude_HEADERS)
 	@$(NORMAL_INSTALL)
-	test -z "$(kimifaceincludedir)" || $(mkdir_p) "$(DESTDIR)$(kimifaceincludedir)"
+	test -z "$(kimifaceincludedir)" || $(MKDIR_P) "$(DESTDIR)$(kimifaceincludedir)"
 	@list='$(kimifaceinclude_HEADERS)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -656,23 +539,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	$(mkdir_p) $(distdir)/../../../admin
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -688,7 +569,7 @@
 all-am: Makefile $(DATA) $(HEADERS)
 installdirs:
 	for dir in "$(DESTDIR)$(kcm_instantmessengerdir)" "$(DESTDIR)$(servicetypedir)" "$(DESTDIR)$(kimifaceincludedir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -724,8 +605,7 @@
 
 distclean: distclean-am
 	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool \
-	distclean-tags
+distclean-am: clean-am distclean-generic distclean-tags
 
 dvi: dvi-am
 
@@ -740,12 +620,20 @@
 install-data-am: install-data-local install-kcm_instantmessengerDATA \
 	install-kimifaceincludeHEADERS install-servicetypeDATA
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -764,24 +652,26 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-kcm_instantmessengerDATA \
+uninstall-am: uninstall-kcm_instantmessengerDATA \
 	uninstall-kimifaceincludeHEADERS uninstall-local \
 	uninstall-servicetypeDATA
 
+.MAKE: install-am install-strip
+
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-libtool ctags distclean distclean-generic \
 	distclean-libtool distclean-tags distdir dvi dvi-am html \
 	html-am info info-am install install-am install-data \
-	install-data-am install-data-local install-exec \
-	install-exec-am install-info install-info-am \
-	install-kcm_instantmessengerDATA \
-	install-kimifaceincludeHEADERS install-man \
+	install-data-am install-data-local install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-kcm_instantmessengerDATA \
+	install-kimifaceincludeHEADERS install-man install-pdf \
+	install-pdf-am install-ps install-ps-am \
 	install-servicetypeDATA install-strip installcheck \
 	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-generic \
 	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
-	uninstall-am uninstall-info-am \
-	uninstall-kcm_instantmessengerDATA \
+	uninstall-am uninstall-kcm_instantmessengerDATA \
 	uninstall-kimifaceincludeHEADERS uninstall-local \
 	uninstall-servicetypeDATA
 
--- kdelibs-3.5.7.orig/interfaces/kimproxy/Makefile.in
+++ kdelibs-3.5.7/interfaces/kimproxy/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,15 +14,11 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -55,17 +51,21 @@
 DIST_SOURCES =
 #>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 #>- 	html-recursive info-recursive install-data-recursive \
-#>- 	install-exec-recursive install-info-recursive \
-#>- 	install-recursive installcheck-recursive installdirs-recursive \
-#>- 	pdf-recursive ps-recursive uninstall-info-recursive \
-#>- 	uninstall-recursive
-#>+ 6
+#>- 	install-dvi-recursive install-exec-recursive \
+#>- 	install-html-recursive install-info-recursive \
+#>- 	install-pdf-recursive install-ps-recursive install-recursive \
+#>- 	installcheck-recursive installdirs-recursive pdf-recursive \
+#>- 	ps-recursive uninstall-recursive
+#>+ 7
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	html-recursive info-recursive install-data-recursive \
-	install-exec-recursive install-info-recursive \
-	install-recursive installcheck-recursive installdirs-recursive \
-	pdf-recursive ps-recursive uninstall-info-recursive \
-	uninstall-recursive nmcheck-recursive bcheck-recursive
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive nmcheck-recursive bcheck-recursive
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
@@ -75,8 +75,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -84,13 +82,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -104,8 +102,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -126,17 +122,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -205,7 +198,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -242,12 +234,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -292,87 +286,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -396,75 +346,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -472,16 +364,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -493,7 +384,7 @@
 all: docs-am  all-recursive
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -531,9 +422,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 mostlyclean-libtool:
@@ -542,10 +433,6 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
 # To change the values of `make' variables: instead of editing Makefiles,
@@ -577,8 +464,7 @@
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
+$(RECURSIVE_CLEAN_TARGETS):
 	@failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
@@ -679,22 +565,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -708,7 +593,7 @@
 	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
-	    || $(mkdir_p) "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 	    || exit 1; \
 	    distdir=`$(am__cd) $(distdir) && pwd`; \
 	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
@@ -716,6 +601,8 @@
 	      $(MAKE) $(AM_MAKEFLAGS) \
 	        top_distdir="$$top_distdir" \
 	        distdir="$$distdir/$$subdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -759,8 +646,7 @@
 
 distclean: distclean-recursive
 	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool \
-	distclean-tags
+distclean-am: clean-am distclean-generic distclean-tags
 
 dvi: dvi-recursive
 
@@ -774,12 +660,20 @@
 
 install-data-am:
 
+install-dvi: install-dvi-recursive
+
 install-exec-am:
 
+install-html: install-html-recursive
+
 install-info: install-info-recursive
 
 install-man:
 
+install-pdf: install-pdf-recursive
+
+install-ps: install-ps-recursive
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
@@ -798,22 +692,24 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am
+uninstall-am:
 
-uninstall-info: uninstall-info-recursive
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+	install-strip
 
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-	clean clean-generic clean-libtool clean-recursive ctags \
-	ctags-recursive distclean distclean-generic distclean-libtool \
-	distclean-recursive distclean-tags distdir dvi dvi-am html \
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+	all all-am check check-am clean clean-generic clean-libtool \
+	ctags ctags-recursive distclean distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
 	html-am info info-am install install-am install-data \
-	install-data-am install-exec install-exec-am install-info \
-	install-info-am install-man install-strip installcheck \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
 	installcheck-am installdirs installdirs-am maintainer-clean \
-	maintainer-clean-generic maintainer-clean-recursive \
-	mostlyclean mostlyclean-generic mostlyclean-libtool \
-	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
-	uninstall uninstall-am uninstall-info-am
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
+	uninstall uninstall-am
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- kdelibs-3.5.7.orig/interfaces/kimproxy/library/icons/Makefile.in
+++ kdelibs-3.5.7/interfaces/kimproxy/library/icons/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,15 +14,11 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -59,8 +55,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -68,13 +62,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -88,8 +82,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -110,17 +102,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -189,7 +178,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -226,12 +214,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -276,87 +266,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -380,75 +326,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -456,16 +344,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -477,7 +364,7 @@
 all: docs-am  all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -515,9 +402,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 mostlyclean-libtool:
@@ -525,10 +412,6 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 tags: TAGS
 TAGS:
 
@@ -537,22 +420,21 @@
 
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -601,7 +483,7 @@
 
 distclean: distclean-am
 	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool
+distclean-am: clean-am distclean-generic
 
 dvi: dvi-am
 
@@ -617,12 +499,20 @@
 #>+ 1
 install-data-am: install-kde-icons 
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -641,19 +531,22 @@
 
 ps-am:
 
-#>- uninstall-am: uninstall-info-am
+#>- uninstall-am:
 #>+ 1
-uninstall-am: uninstall-kde-icons  uninstall-info-am
+uninstall-am: uninstall-kde-icons 
+
+.MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
 	distclean distclean-generic distclean-libtool distdir dvi \
 	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-exec install-exec-am \
-	install-info install-info-am install-man install-strip \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
 	installcheck installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
-	uninstall-info-am
+	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- kdelibs-3.5.7.orig/interfaces/kimproxy/library/Makefile.in
+++ kdelibs-3.5.7/interfaces/kimproxy/library/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,15 +16,11 @@
 @SET_MAKE@
 
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -74,7 +70,14 @@
 libkimproxy_la_nofinal_OBJECTS = kimproxy.lo kimiface_stub.lo kimproxyiface_skel.lo
 @KDE_USE_FINAL_FALSE@libkimproxy_la_OBJECTS = $(libkimproxy_la_nofinal_OBJECTS)
 @KDE_USE_FINAL_TRUE@libkimproxy_la_OBJECTS = $(libkimproxy_la_final_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+#>- libkimproxy_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(libkimproxy_la_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+libkimproxy_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(libkimproxy_la_LDFLAGS) $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -82,36 +85,42 @@
 #>+ 2
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 #>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
 CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 3
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(libkimproxy_la_SOURCES)
 DIST_SOURCES = $(libkimproxy_la_SOURCES)
 #>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 #>- 	html-recursive info-recursive install-data-recursive \
-#>- 	install-exec-recursive install-info-recursive \
-#>- 	install-recursive installcheck-recursive installdirs-recursive \
-#>- 	pdf-recursive ps-recursive uninstall-info-recursive \
-#>- 	uninstall-recursive
-#>+ 6
+#>- 	install-dvi-recursive install-exec-recursive \
+#>- 	install-html-recursive install-info-recursive \
+#>- 	install-pdf-recursive install-ps-recursive install-recursive \
+#>- 	installcheck-recursive installdirs-recursive pdf-recursive \
+#>- 	ps-recursive uninstall-recursive
+#>+ 7
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	html-recursive info-recursive install-data-recursive \
-	install-exec-recursive install-info-recursive \
-	install-recursive installcheck-recursive installdirs-recursive \
-	pdf-recursive ps-recursive uninstall-info-recursive \
-	uninstall-recursive nmcheck-recursive bcheck-recursive
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive nmcheck-recursive bcheck-recursive
 kimproxyincludeHEADERS_INSTALL = $(INSTALL_HEADER)
 HEADERS = $(kimproxyinclude_HEADERS) $(noinst_HEADERS)
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
@@ -121,8 +130,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -130,13 +137,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -150,8 +157,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -172,17 +177,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -251,7 +253,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -288,12 +289,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -338,87 +341,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -442,75 +401,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -518,16 +419,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -541,9 +441,7 @@
 kimproxyincludedir = $(includedir)
 kimproxyinclude_HEADERS = kimproxy.h kimproxyiface.h
 lib_LTLIBRARIES = libkimproxy.la
-#>- libkimproxy_la_LDFLAGS = -no-undefined $(all_libraries)
-#>+ 1
-libkimproxy_la_LDFLAGS = -no-undefined $(KDE_NO_UNDEFINED) $(all_libraries)
+libkimproxy_la_LDFLAGS = -no-undefined $(all_libraries)
 libkimproxy_la_LIBADD = $(LIB_KIO)
 #>- libkimproxy_la_SOURCES = kimproxy.cpp kimiface.stub kimproxyiface.skel
 #>+ 1
@@ -556,7 +454,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -594,13 +492,13 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
@@ -611,7 +509,7 @@
 
 uninstall-libLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
@@ -625,11 +523,8 @@
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
-#>- libkimproxy.la: $(libkimproxy_la_OBJECTS) $(libkimproxy_la_DEPENDENCIES) 
-#>+ 2
-@KDE_USE_CLOSURE_TRUE@libkimproxy.la: libkimproxy.la.closure $(libkimproxy_la_OBJECTS) $(libkimproxy_la_DEPENDENCIES) 
-@KDE_USE_CLOSURE_FALSE@libkimproxy.la: $(libkimproxy_la_OBJECTS) $(libkimproxy_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(libdir) $(libkimproxy_la_LDFLAGS) $(libkimproxy_la_OBJECTS) $(libkimproxy_la_LIBADD) $(LIBS)
+libkimproxy.la: $(libkimproxy_la_OBJECTS) $(libkimproxy_la_DEPENDENCIES) 
+	$(libkimproxy_la_LINK) -rpath $(libdir) $(libkimproxy_la_OBJECTS) $(libkimproxy_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -640,22 +535,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kimproxy.Plo@am__quote@
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -665,13 +560,9 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 install-kimproxyincludeHEADERS: $(kimproxyinclude_HEADERS)
 	@$(NORMAL_INSTALL)
-	test -z "$(kimproxyincludedir)" || $(mkdir_p) "$(DESTDIR)$(kimproxyincludedir)"
+	test -z "$(kimproxyincludedir)" || $(MKDIR_P) "$(DESTDIR)$(kimproxyincludedir)"
 	@list='$(kimproxyinclude_HEADERS)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -718,8 +609,7 @@
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
+$(RECURSIVE_CLEAN_TARGETS):
 	@failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
@@ -820,23 +710,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	$(mkdir_p) $(distdir)/../../../admin
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -850,7 +738,7 @@
 	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
-	    || $(mkdir_p) "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 	    || exit 1; \
 	    distdir=`$(am__cd) $(distdir) && pwd`; \
 	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
@@ -858,6 +746,8 @@
 	      $(MAKE) $(AM_MAKEFLAGS) \
 	        top_distdir="$$top_distdir" \
 	        distdir="$$distdir/$$subdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -868,7 +758,7 @@
 installdirs: installdirs-recursive
 installdirs-am:
 	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(kimproxyincludedir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-recursive
 install-exec: install-exec-recursive
@@ -901,14 +791,14 @@
 #>- clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
 #>- 	mostlyclean-am
 #>+ 2
-clean-am: clean-metasources clean-idl clean-closures clean-bcheck clean-final  clean-generic clean-libLTLIBRARIES clean-libtool \
+clean-am: clean-metasources clean-idl clean-bcheck clean-final  clean-generic clean-libLTLIBRARIES clean-libtool \
 	mostlyclean-am
 
 distclean: distclean-recursive
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-recursive
 
@@ -922,12 +812,20 @@
 
 install-data-am: install-data-local install-kimproxyincludeHEADERS
 
+install-dvi: install-dvi-recursive
+
 install-exec-am: install-libLTLIBRARIES
 
+install-html: install-html-recursive
+
 install-info: install-info-recursive
 
 install-man:
 
+install-pdf: install-pdf-recursive
+
+install-ps: install-ps-recursive
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
@@ -948,26 +846,27 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-kimproxyincludeHEADERS \
+uninstall-am: uninstall-kimproxyincludeHEADERS \
 	uninstall-libLTLIBRARIES uninstall-local
 
-uninstall-info: uninstall-info-recursive
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+	install-strip
 
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-	clean clean-generic clean-libLTLIBRARIES clean-libtool \
-	clean-recursive ctags ctags-recursive distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-recursive distclean-tags distdir dvi dvi-am html \
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+	all all-am check check-am clean clean-generic \
+	clean-libLTLIBRARIES clean-libtool ctags ctags-recursive \
+	distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
 	html-am info info-am install install-am install-data \
-	install-data-am install-data-local install-exec \
-	install-exec-am install-info install-info-am \
-	install-kimproxyincludeHEADERS install-libLTLIBRARIES \
-	install-man install-strip installcheck installcheck-am \
-	installdirs installdirs-am maintainer-clean \
-	maintainer-clean-generic maintainer-clean-recursive \
-	mostlyclean mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
-	tags tags-recursive uninstall uninstall-am uninstall-info-am \
+	install-data-am install-data-local install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-kimproxyincludeHEADERS \
+	install-libLTLIBRARIES install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs installdirs-am maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags tags-recursive uninstall uninstall-am \
 	uninstall-kimproxyincludeHEADERS uninstall-libLTLIBRARIES \
 	uninstall-local
 
@@ -1080,15 +979,6 @@
 kimproxyiface_skel.cpp: kimproxyiface.kidl
 	$(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub kimproxyiface.kidl
 
-#>+ 8
-libkimproxy.la.closure: $(libkimproxy_la_OBJECTS) $(libkimproxy_la_DEPENDENCIES)
-	@echo "int main() {return 0;}" > libkimproxy_la_closure.cpp
-	@$(LTCXXCOMPILE) -c libkimproxy_la_closure.cpp
-	$(CXXLINK) libkimproxy_la_closure.lo $(libkimproxy_la_LDFLAGS) $(libkimproxy_la_OBJECTS) $(libkimproxy_la_LIBADD) $(LIBS)
-	@rm -f libkimproxy_la_closure.* libkimproxy.la.closure
-	@echo "timestamp" > libkimproxy.la.closure
-
-
 #>+ 3
 kimproxy.moc: $(srcdir)/kimproxy.h
 	$(MOC) $(srcdir)/kimproxy.h -o kimproxy.moc
@@ -1109,10 +999,6 @@
 	kimiface_stub.cpp kimiface_stub.h kimiface.kidl \
 	kimproxyiface_skel.cpp kimproxyiface_skel.h kimproxyiface.kidl 
 
-#>+ 3
-clean-closures:
-	-rm -f  libkimproxy.la.closure
-
 #>+ 2
 docs-am:
 
--- kdelibs-3.5.7.orig/kinit/tests/Makefile.in
+++ kdelibs-3.5.7/kinit/tests/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,15 +16,11 @@
 @SET_MAKE@
 
 # $Id: Makefile.am 157691 2002-05-25 18:00:11Z coolo $
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -60,7 +56,7 @@
 klaunchertest_OBJECTS = klaunchertest.$(OBJEXT)
 am__DEPENDENCIES_1 =
 klaunchertest_DEPENDENCIES = $(am__DEPENDENCIES_1)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -68,19 +64,21 @@
 #>+ 2
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 #>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
 CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 3
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(klaunchertest_SOURCES)
 DIST_SOURCES = $(klaunchertest_SOURCES)
 ETAGS = etags
@@ -91,8 +89,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -100,13 +96,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -120,8 +116,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -142,17 +136,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -221,7 +212,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -258,12 +248,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -308,87 +300,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -412,75 +360,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -488,16 +378,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -512,7 +401,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -550,9 +439,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 clean-checkPROGRAMS:
@@ -563,7 +452,7 @@
 	done
 klaunchertest$(EXEEXT): $(klaunchertest_OBJECTS) $(klaunchertest_DEPENDENCIES) 
 	@rm -f klaunchertest$(EXEEXT)
-	$(CXXLINK) $(klaunchertest_LDFLAGS) $(klaunchertest_OBJECTS) $(klaunchertest_LDADD) $(LIBS)
+	$(CXXLINK) $(klaunchertest_OBJECTS) $(klaunchertest_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -574,22 +463,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/klaunchertest.Po@am__quote@
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -600,10 +489,6 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -653,22 +538,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -722,7 +606,7 @@
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
@@ -736,12 +620,20 @@
 
 install-data-am:
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -762,19 +654,23 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am
+uninstall-am:
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean \
 	clean-checkPROGRAMS clean-generic clean-libtool ctags \
 	distclean distclean-compile distclean-generic \
 	distclean-libtool distclean-tags distdir dvi dvi-am html \
 	html-am info info-am install install-am install-data \
-	install-data-am install-exec install-exec-am install-info \
-	install-info-am install-man install-strip installcheck \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
 	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-info-am
+	tags uninstall uninstall-am
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- kdelibs-3.5.7.orig/kinit/Makefile.in
+++ kdelibs-3.5.7/kinit/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -34,15 +34,11 @@
 
 
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -97,6 +93,13 @@
 #>- klauncher_la_OBJECTS = $(am_klauncher_la_OBJECTS)
 #>+ 1
 klauncher_la_OBJECTS = klauncher_dummy.lo
+#>- klauncher_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(klauncher_la_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+klauncher_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(klauncher_la_LDFLAGS) $(LDFLAGS) -o $@
 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 #>- PROGRAMS = $(bin_PROGRAMS)
 #>+ 2
@@ -110,6 +113,13 @@
 @KDE_USE_FINAL_FALSE@kdeinit_OBJECTS = $(kdeinit_nofinal_OBJECTS)
 @KDE_USE_FINAL_TRUE@kdeinit_OBJECTS = $(kdeinit_final_OBJECTS)
 kdeinit_DEPENDENCIES = $(am__DEPENDENCIES_1)
+#>- kdeinit_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
+#>- 	$(kdeinit_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+kdeinit_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
+	$(kdeinit_LDFLAGS) $(LDFLAGS) -o $@
 am_kdeinit_shutdown_OBJECTS = wrapper.$(OBJEXT)
 #>- kdeinit_shutdown_OBJECTS = $(am_kdeinit_shutdown_OBJECTS)
 #>+ 1
@@ -125,11 +135,25 @@
 #>+ 1
 kdostartupconfig_OBJECTS = kdostartupconfig.$(OBJEXT)
 kdostartupconfig_DEPENDENCIES = $(am__DEPENDENCIES_1)
+#>- kdostartupconfig_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(kdostartupconfig_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+kdostartupconfig_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(kdostartupconfig_LDFLAGS) $(LDFLAGS) -o $@
 am_kioslave_OBJECTS = kioslave.$(OBJEXT)
 #>- kioslave_OBJECTS = $(am_kioslave_OBJECTS)
 #>+ 1
 kioslave_OBJECTS = kioslave.$(OBJEXT)
 kioslave_DEPENDENCIES = $(am__DEPENDENCIES_1)
+#>- kioslave_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(kioslave_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+kioslave_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(kioslave_LDFLAGS) $(LDFLAGS) -o $@
 am_kshell_OBJECTS = shell.$(OBJEXT)
 #>- kshell_OBJECTS = $(am_kshell_OBJECTS)
 #>+ 1
@@ -150,40 +174,49 @@
 #>+ 1
 lnusertemp_OBJECTS = lnusertemp.$(OBJEXT)
 lnusertemp_LDADD = $(LDADD)
+lnusertemp_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(lnusertemp_LDFLAGS) $(LDFLAGS) -o $@
 am_start_kdeinit_OBJECTS = start_kdeinit-start_kdeinit.$(OBJEXT)
 #>- start_kdeinit_OBJECTS = $(am_start_kdeinit_OBJECTS)
 #>+ 1
 start_kdeinit_OBJECTS = start_kdeinit-start_kdeinit.$(OBJEXT)
 start_kdeinit_LDADD = $(LDADD)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+start_kdeinit_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(start_kdeinit_CFLAGS) \
+	$(CFLAGS) $(start_kdeinit_LDFLAGS) $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 #>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 #>+ 2
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 #>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
 CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 3
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 #>- SOURCES = $(klauncher_la_SOURCES) $(kdeinit_SOURCES) \
 #>- 	$(kdeinit_shutdown_SOURCES) $(kdeinit_wrapper_SOURCES) \
 #>- 	$(kdostartupconfig_SOURCES) $(kioslave_SOURCES) \
@@ -212,18 +245,22 @@
 	$(start_kdeinit_SOURCES) $(klauncher_SOURCES) 
 #>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 #>- 	html-recursive info-recursive install-data-recursive \
-#>- 	install-exec-recursive install-info-recursive \
-#>- 	install-recursive installcheck-recursive installdirs-recursive \
-#>- 	pdf-recursive ps-recursive uninstall-info-recursive \
-#>- 	uninstall-recursive
-#>+ 6
+#>- 	install-dvi-recursive install-exec-recursive \
+#>- 	install-html-recursive install-info-recursive \
+#>- 	install-pdf-recursive install-ps-recursive install-recursive \
+#>- 	installcheck-recursive installdirs-recursive pdf-recursive \
+#>- 	ps-recursive uninstall-recursive
+#>+ 7
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	html-recursive info-recursive install-data-recursive \
-	install-exec-recursive install-info-recursive \
-	install-recursive installcheck-recursive installdirs-recursive \
-	pdf-recursive ps-recursive uninstall-info-recursive \
-	uninstall-recursive nmcheck-recursive bcheck-recursive
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive nmcheck-recursive bcheck-recursive
 HEADERS = $(noinst_HEADERS)
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
@@ -233,8 +270,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -242,13 +277,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -262,8 +297,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -284,17 +317,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -363,7 +393,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -400,12 +429,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -450,87 +481,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -554,75 +541,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -630,16 +559,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -700,7 +628,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .c .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -738,13 +666,13 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(kdeinitdir)" || $(mkdir_p) "$(DESTDIR)$(kdeinitdir)"
+	test -z "$(kdeinitdir)" || $(MKDIR_P) "$(DESTDIR)$(kdeinitdir)"
 	@list='$(kdeinit_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
@@ -755,7 +683,7 @@
 
 uninstall-kdeinitLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@set -x; list='$(kdeinit_LTLIBRARIES)'; for p in $$list; do \
+	@list='$(kdeinit_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kdeinitdir)/$$p'"; \
 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kdeinitdir)/$$p"; \
@@ -771,7 +699,7 @@
 	done
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
@@ -782,7 +710,7 @@
 
 uninstall-libLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
@@ -797,10 +725,10 @@
 	  rm -f "$${dir}/so_locations"; \
 	done
 klauncher.la: $(klauncher_la_OBJECTS) $(klauncher_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(kdeinitdir) $(klauncher_la_LDFLAGS) $(klauncher_la_OBJECTS) $(klauncher_la_LIBADD) $(LIBS)
+	$(klauncher_la_LINK) -rpath $(kdeinitdir) $(klauncher_la_OBJECTS) $(klauncher_la_LIBADD) $(LIBS)
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
+	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
 	  if test -f $$p \
@@ -828,34 +756,34 @@
 	done
 kdeinit$(EXEEXT): $(kdeinit_OBJECTS) $(kdeinit_DEPENDENCIES) 
 	@rm -f kdeinit$(EXEEXT)
-	$(CXXLINK) $(kdeinit_LDFLAGS) $(kdeinit_OBJECTS) $(kdeinit_LDADD) $(LIBS)
+	$(kdeinit_LINK) $(kdeinit_OBJECTS) $(kdeinit_LDADD) $(LIBS)
 kdeinit_shutdown$(EXEEXT): $(kdeinit_shutdown_OBJECTS) $(kdeinit_shutdown_DEPENDENCIES) 
 	@rm -f kdeinit_shutdown$(EXEEXT)
-	$(LINK) $(kdeinit_shutdown_LDFLAGS) $(kdeinit_shutdown_OBJECTS) $(kdeinit_shutdown_LDADD) $(LIBS)
+	$(LINK) $(kdeinit_shutdown_OBJECTS) $(kdeinit_shutdown_LDADD) $(LIBS)
 kdeinit_wrapper$(EXEEXT): $(kdeinit_wrapper_OBJECTS) $(kdeinit_wrapper_DEPENDENCIES) 
 	@rm -f kdeinit_wrapper$(EXEEXT)
-	$(LINK) $(kdeinit_wrapper_LDFLAGS) $(kdeinit_wrapper_OBJECTS) $(kdeinit_wrapper_LDADD) $(LIBS)
+	$(LINK) $(kdeinit_wrapper_OBJECTS) $(kdeinit_wrapper_LDADD) $(LIBS)
 kdostartupconfig$(EXEEXT): $(kdostartupconfig_OBJECTS) $(kdostartupconfig_DEPENDENCIES) 
 	@rm -f kdostartupconfig$(EXEEXT)
-	$(CXXLINK) $(kdostartupconfig_LDFLAGS) $(kdostartupconfig_OBJECTS) $(kdostartupconfig_LDADD) $(LIBS)
+	$(kdostartupconfig_LINK) $(kdostartupconfig_OBJECTS) $(kdostartupconfig_LDADD) $(LIBS)
 kioslave$(EXEEXT): $(kioslave_OBJECTS) $(kioslave_DEPENDENCIES) 
 	@rm -f kioslave$(EXEEXT)
-	$(CXXLINK) $(kioslave_LDFLAGS) $(kioslave_OBJECTS) $(kioslave_LDADD) $(LIBS)
+	$(kioslave_LINK) $(kioslave_OBJECTS) $(kioslave_LDADD) $(LIBS)
 kshell$(EXEEXT): $(kshell_OBJECTS) $(kshell_DEPENDENCIES) 
 	@rm -f kshell$(EXEEXT)
-	$(LINK) $(kshell_LDFLAGS) $(kshell_OBJECTS) $(kshell_LDADD) $(LIBS)
+	$(LINK) $(kshell_OBJECTS) $(kshell_LDADD) $(LIBS)
 kstartupconfig$(EXEEXT): $(kstartupconfig_OBJECTS) $(kstartupconfig_DEPENDENCIES) 
 	@rm -f kstartupconfig$(EXEEXT)
-	$(CXXLINK) $(kstartupconfig_LDFLAGS) $(kstartupconfig_OBJECTS) $(kstartupconfig_LDADD) $(LIBS)
+	$(CXXLINK) $(kstartupconfig_OBJECTS) $(kstartupconfig_LDADD) $(LIBS)
 kwrapper$(EXEEXT): $(kwrapper_OBJECTS) $(kwrapper_DEPENDENCIES) 
 	@rm -f kwrapper$(EXEEXT)
-	$(LINK) $(kwrapper_LDFLAGS) $(kwrapper_OBJECTS) $(kwrapper_LDADD) $(LIBS)
+	$(LINK) $(kwrapper_OBJECTS) $(kwrapper_LDADD) $(LIBS)
 lnusertemp$(EXEEXT): $(lnusertemp_OBJECTS) $(lnusertemp_DEPENDENCIES) 
 	@rm -f lnusertemp$(EXEEXT)
-	$(LINK) $(lnusertemp_LDFLAGS) $(lnusertemp_OBJECTS) $(lnusertemp_LDADD) $(LIBS)
+	$(lnusertemp_LINK) $(lnusertemp_OBJECTS) $(lnusertemp_LDADD) $(LIBS)
 start_kdeinit$(EXEEXT): $(start_kdeinit_OBJECTS) $(start_kdeinit_DEPENDENCIES) 
 	@rm -f start_kdeinit$(EXEEXT)
-	$(LINK) $(start_kdeinit_LDFLAGS) $(start_kdeinit_OBJECTS) $(start_kdeinit_LDADD) $(LIBS)
+	$(start_kdeinit_LINK) $(start_kdeinit_OBJECTS) $(start_kdeinit_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -878,57 +806,57 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wrapper.Po@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
 start_kdeinit-start_kdeinit.o: start_kdeinit.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(start_kdeinit_CFLAGS) $(CFLAGS) -MT start_kdeinit-start_kdeinit.o -MD -MP -MF "$(DEPDIR)/start_kdeinit-start_kdeinit.Tpo" -c -o start_kdeinit-start_kdeinit.o `test -f 'start_kdeinit.c' || echo '$(srcdir)/'`start_kdeinit.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/start_kdeinit-start_kdeinit.Tpo" "$(DEPDIR)/start_kdeinit-start_kdeinit.Po"; else rm -f "$(DEPDIR)/start_kdeinit-start_kdeinit.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(start_kdeinit_CFLAGS) $(CFLAGS) -MT start_kdeinit-start_kdeinit.o -MD -MP -MF $(DEPDIR)/start_kdeinit-start_kdeinit.Tpo -c -o start_kdeinit-start_kdeinit.o `test -f 'start_kdeinit.c' || echo '$(srcdir)/'`start_kdeinit.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/start_kdeinit-start_kdeinit.Tpo $(DEPDIR)/start_kdeinit-start_kdeinit.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='start_kdeinit.c' object='start_kdeinit-start_kdeinit.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(start_kdeinit_CFLAGS) $(CFLAGS) -c -o start_kdeinit-start_kdeinit.o `test -f 'start_kdeinit.c' || echo '$(srcdir)/'`start_kdeinit.c
 
 start_kdeinit-start_kdeinit.obj: start_kdeinit.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(start_kdeinit_CFLAGS) $(CFLAGS) -MT start_kdeinit-start_kdeinit.obj -MD -MP -MF "$(DEPDIR)/start_kdeinit-start_kdeinit.Tpo" -c -o start_kdeinit-start_kdeinit.obj `if test -f 'start_kdeinit.c'; then $(CYGPATH_W) 'start_kdeinit.c'; else $(CYGPATH_W) '$(srcdir)/start_kdeinit.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/start_kdeinit-start_kdeinit.Tpo" "$(DEPDIR)/start_kdeinit-start_kdeinit.Po"; else rm -f "$(DEPDIR)/start_kdeinit-start_kdeinit.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(start_kdeinit_CFLAGS) $(CFLAGS) -MT start_kdeinit-start_kdeinit.obj -MD -MP -MF $(DEPDIR)/start_kdeinit-start_kdeinit.Tpo -c -o start_kdeinit-start_kdeinit.obj `if test -f 'start_kdeinit.c'; then $(CYGPATH_W) 'start_kdeinit.c'; else $(CYGPATH_W) '$(srcdir)/start_kdeinit.c'; fi`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/start_kdeinit-start_kdeinit.Tpo $(DEPDIR)/start_kdeinit-start_kdeinit.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='start_kdeinit.c' object='start_kdeinit-start_kdeinit.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(start_kdeinit_CFLAGS) $(CFLAGS) -c -o start_kdeinit-start_kdeinit.obj `if test -f 'start_kdeinit.c'; then $(CYGPATH_W) 'start_kdeinit.c'; else $(CYGPATH_W) '$(srcdir)/start_kdeinit.c'; fi`
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -939,10 +867,6 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
 # To change the values of `make' variables: instead of editing Makefiles,
@@ -974,8 +898,7 @@
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
+$(RECURSIVE_CLEAN_TARGETS):
 	@failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
@@ -1076,23 +999,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	$(mkdir_p) $(distdir)/../admin
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -1106,7 +1027,7 @@
 	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
-	    || $(mkdir_p) "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 	    || exit 1; \
 	    distdir=`$(am__cd) $(distdir) && pwd`; \
 	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
@@ -1114,6 +1035,8 @@
 	      $(MAKE) $(AM_MAKEFLAGS) \
 	        top_distdir="$$top_distdir" \
 	        distdir="$$distdir/$$subdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -1126,7 +1049,7 @@
 installdirs: installdirs-recursive
 installdirs-am:
 	for dir in "$(DESTDIR)$(kdeinitdir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-recursive
 install-exec: install-exec-recursive
@@ -1166,7 +1089,7 @@
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-recursive
 
@@ -1180,14 +1103,22 @@
 
 install-data-am: install-data-local install-kdeinitLTLIBRARIES
 
+install-dvi: install-dvi-recursive
+
 install-exec-am: install-binPROGRAMS install-libLTLIBRARIES
 	@$(NORMAL_INSTALL)
 	$(MAKE) $(AM_MAKEFLAGS) install-exec-hook
 
+install-html: install-html-recursive
+
 install-info: install-info-recursive
 
 install-man:
 
+install-pdf: install-pdf-recursive
+
+install-ps: install-ps-recursive
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
@@ -1208,28 +1139,29 @@
 
 ps-am:
 
-uninstall-am: uninstall-binPROGRAMS uninstall-info-am \
-	uninstall-kdeinitLTLIBRARIES uninstall-libLTLIBRARIES \
-	uninstall-local
+uninstall-am: uninstall-binPROGRAMS uninstall-kdeinitLTLIBRARIES \
+	uninstall-libLTLIBRARIES uninstall-local
 
-uninstall-info: uninstall-info-recursive
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+	install-exec-am install-strip
 
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-	clean clean-binPROGRAMS clean-generic clean-kdeinitLTLIBRARIES \
-	clean-libLTLIBRARIES clean-libtool clean-recursive ctags \
-	ctags-recursive distclean distclean-compile distclean-generic \
-	distclean-libtool distclean-recursive distclean-tags distdir \
-	dvi dvi-am html html-am info info-am install install-am \
-	install-binPROGRAMS install-data install-data-am \
-	install-data-local install-exec install-exec-am \
-	install-exec-hook install-info install-info-am \
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+	all all-am check check-am clean clean-binPROGRAMS \
+	clean-generic clean-kdeinitLTLIBRARIES clean-libLTLIBRARIES \
+	clean-libtool ctags ctags-recursive distclean \
+	distclean-compile distclean-generic distclean-libtool \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-binPROGRAMS install-data \
+	install-data-am install-data-local install-dvi install-dvi-am \
+	install-exec install-exec-am install-exec-hook install-html \
+	install-html-am install-info install-info-am \
 	install-kdeinitLTLIBRARIES install-libLTLIBRARIES install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
 	install-strip installcheck installcheck-am installdirs \
 	installdirs-am maintainer-clean maintainer-clean-generic \
-	maintainer-clean-recursive mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
-	pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
-	uninstall-binPROGRAMS uninstall-info-am \
+	mostlyclean mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
+	uninstall uninstall-am uninstall-binPROGRAMS \
 	uninstall-kdeinitLTLIBRARIES uninstall-libLTLIBRARIES \
 	uninstall-local
 
--- kdelibs-3.5.7.orig/libltdl/Makefile.in
+++ kdelibs-3.5.7/libltdl/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,15 +16,11 @@
 @SET_MAKE@
 
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -61,17 +57,18 @@
 #>- libltdlc_la_OBJECTS = $(am_libltdlc_la_OBJECTS)
 #>+ 1
 libltdlc_la_OBJECTS = ltdl.lo
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
 depcomp =
 am__depfiles_maybe =
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(libltdlc_la_SOURCES)
 DIST_SOURCES = $(libltdlc_la_SOURCES)
 HEADERS = $(noinst_HEADERS)
@@ -83,8 +80,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -92,13 +87,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -112,8 +107,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -134,17 +127,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -213,7 +203,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -250,12 +239,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -300,87 +291,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -404,75 +351,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -480,16 +369,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -506,7 +394,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -544,9 +432,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 clean-noinstLTLIBRARIES:
@@ -558,7 +446,7 @@
 	  rm -f "$${dir}/so_locations"; \
 	done
 libltdlc.la: $(libltdlc_la_OBJECTS) $(libltdlc_la_DEPENDENCIES) 
-	$(LINK)  $(libltdlc_la_LDFLAGS) $(libltdlc_la_OBJECTS) $(libltdlc_la_LIBADD) $(LIBS)
+	$(LINK)  $(libltdlc_la_OBJECTS) $(libltdlc_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -581,10 +469,6 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -634,22 +518,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -701,7 +584,7 @@
 distclean: distclean-am
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
@@ -715,12 +598,20 @@
 
 install-data-am:
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -740,19 +631,22 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am
+uninstall-am:
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-libtool clean-noinstLTLIBRARIES ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
 	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-exec \
-	install-exec-am install-info install-info-am install-man \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
 	install-strip installcheck installcheck-am installdirs \
 	maintainer-clean maintainer-clean-generic mostlyclean \
 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-	pdf pdf-am ps ps-am tags uninstall uninstall-am \
-	uninstall-info-am
+	pdf pdf-am ps ps-am tags uninstall uninstall-am
 
 
 ltdl.lo: $(srcdir)/ltdl.h $(top_builddir)/config.h
--- kdelibs-3.5.7.orig/Makefile.in
+++ kdelibs-3.5.7/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -34,15 +34,11 @@
 #    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 #    Boston, MA 02110-1301, USA.
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = .
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -71,7 +67,7 @@
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
- configure.lineno configure.status.lineno
+ configure.lineno config.status.lineno
 mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
 CONFIG_HEADER = config.h $(top_builddir)/dcop/dcop-path.h \
 	$(top_builddir)/kdecore/kdemacros.h \
@@ -82,17 +78,19 @@
 DIST_SOURCES =
 #>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 #>- 	html-recursive info-recursive install-data-recursive \
-#>- 	install-exec-recursive install-info-recursive \
-#>- 	install-recursive installcheck-recursive installdirs-recursive \
-#>- 	pdf-recursive ps-recursive uninstall-info-recursive \
-#>- 	uninstall-recursive
-#>+ 6
+#>- 	install-dvi-recursive install-exec-recursive \
+#>- 	install-html-recursive install-info-recursive \
+#>- 	install-pdf-recursive install-ps-recursive install-recursive \
+#>- 	installcheck-recursive installdirs-recursive pdf-recursive \
+#>- 	ps-recursive uninstall-recursive
+#>+ 7
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	html-recursive info-recursive install-data-recursive \
-	install-exec-recursive install-info-recursive \
-	install-recursive installcheck-recursive installdirs-recursive \
-	pdf-recursive ps-recursive uninstall-info-recursive \
-	uninstall-recursive nmcheck-recursive bcheck-recursive
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive nmcheck-recursive bcheck-recursive
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -102,6 +100,8 @@
 am__installdirs = "$(DESTDIR)$(potdir)"
 potDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(pot_DATA)
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
@@ -121,8 +121,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -130,13 +128,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -150,8 +148,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -172,17 +168,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -251,7 +244,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -288,12 +280,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -338,87 +332,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -442,75 +392,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -518,16 +410,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -552,7 +443,7 @@
 .SUFFIXES:
 am--refresh:
 	@:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(srcdir)/admin/Doxyfile.am $(srcdir)/admin/deps.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/admin/Doxyfile.am $(srcdir)/admin/deps.am $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -594,24 +485,24 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	$(SHELL) ./config.status --recheck
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 #>- 	cd $(srcdir) && $(AUTOCONF)
 #>+ 2
 	cd $(srcdir) && rm -f configure
 	cd $(top_srcdir) && $(MAKE) -f admin/Makefile.common configure
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 
 config.h: stamp-h1
 	@if test ! -f $@; then \
 	  rm -f stamp-h1; \
-	  $(MAKE) stamp-h1; \
+	  $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
 	else :; fi
 
 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
 	@rm -f stamp-h1
 	cd $(top_builddir) && $(SHELL) ./config.status config.h
-$(srcdir)/config.h.in:  $(am__configure_deps) 
+$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) 
 	cd $(top_srcdir) && $(AUTOHEADER)
 	rm -f stamp-h1
 	touch $@
@@ -627,10 +518,9 @@
 
 distclean-libtool:
 	-rm -f libtool
-uninstall-info-am:
 install-potDATA: $(pot_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(potdir)" || $(mkdir_p) "$(DESTDIR)$(potdir)"
+	test -z "$(potdir)" || $(MKDIR_P) "$(DESTDIR)$(potdir)"
 	@list='$(pot_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -677,8 +567,7 @@
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
+$(RECURSIVE_CLEAN_TARGETS):
 	@failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
@@ -780,24 +669,22 @@
 
 distdir: $(DISTFILES)
 	$(am__remove_distdir)
-	mkdir $(distdir)
-	$(mkdir_p) $(distdir)/admin $(distdir)/kdecore $(distdir)/kdoctools $(distdir)/khtml/java
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	test -d $(distdir) || mkdir $(distdir)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -811,7 +698,7 @@
 	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
-	    || $(mkdir_p) "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 	    || exit 1; \
 	    distdir=`$(am__cd) $(distdir) && pwd`; \
 	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
@@ -819,6 +706,8 @@
 	      $(MAKE) $(AM_MAKEFLAGS) \
 	        top_distdir="$$top_distdir" \
 	        distdir="$$distdir/$$subdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -829,7 +718,7 @@
 	-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
 	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
 	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
-	  ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
+	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
 	|| chmod -R a+r $(distdir)
 dist-gzip: distdir
 	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
@@ -904,7 +793,7 @@
 	$(am__remove_distdir)
 	@(echo "$(distdir) archives ready for distribution: "; \
 	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
-	  sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}'
+	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
 distuninstallcheck:
 	@cd $(distuninstallcheck_dir) \
 	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
@@ -929,7 +818,7 @@
 installdirs: installdirs-recursive
 installdirs-am:
 	for dir in "$(DESTDIR)$(potdir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-recursive
 install-exec: install-exec-recursive
@@ -982,12 +871,20 @@
 
 install-data-am: install-data-local install-potDATA
 
+install-dvi: install-dvi-recursive
+
 install-exec-am:
 
+install-html: install-html-recursive
+
 install-info: install-info-recursive
 
 install-man:
 
+install-pdf: install-pdf-recursive
+
+install-ps: install-ps-recursive
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
@@ -1008,26 +905,27 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-local uninstall-potDATA
+uninstall-am: uninstall-local uninstall-potDATA
 
-uninstall-info: uninstall-info-recursive
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+	install-strip
 
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \
-	check-am clean clean-generic clean-libtool clean-recursive \
-	ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
-	dist-hook dist-shar dist-tarZ dist-zip distcheck distclean \
-	distclean-generic distclean-hdr distclean-libtool \
-	distclean-recursive distclean-tags distcleancheck distdir \
-	distuninstallcheck dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am \
-	install-data-local install-exec install-exec-am install-info \
-	install-info-am install-man install-potDATA install-strip \
-	installcheck installcheck-am installdirs installdirs-am \
-	maintainer-clean maintainer-clean-generic \
-	maintainer-clean-recursive mostlyclean mostlyclean-generic \
-	mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
-	tags tags-recursive uninstall uninstall-am uninstall-info-am \
-	uninstall-local uninstall-potDATA
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+	all all-am am--refresh check check-am clean clean-generic \
+	clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \
+	dist-gzip dist-hook dist-shar dist-tarZ dist-zip distcheck \
+	distclean distclean-generic distclean-hdr distclean-libtool \
+	distclean-tags distcleancheck distdir distuninstallcheck dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-data-local install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-potDATA install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs installdirs-am maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
+	uninstall uninstall-am uninstall-local uninstall-potDATA
 
 # COMPILE_BEFORE_doc = kdoctools
 # COMPILE_AFTER_kparts = kspell2 kmdi kdeprint kinit kate interfaces kcert khtml
@@ -1059,10 +957,8 @@
 	find $$dirs -maxdepth 1 -name "*.cc" -print >> files ;\
 	find $$dirs -maxdepth 1 -name "*.h" -print >> files ;\
 	echo ./kdecore/kde-config.cpp.in >> files ;\
-	$(EXTRACTRC) `find $$dirs -maxdepth 1 \( -name "*.rc" -o -name "*.ui" \) ` ./dnssd/kcm_kdnssd.kcfg > rc.cpp; \
-	: > kde.pot ;\
+	$(EXTRACTRC) `find $$dirs -maxdepth 1 \( -name "*.rc" -o -name "*.ui" \) ` ./dnssd/kcm_kdnssd.kcfg > rc.cpp;
 	$(XGETTEXT) -ktranslate -x qt-messages.pot rc.cpp `cat files` && cat messages.po qt-messages.pot > $(podir)/kdelibs.pot
-	$(XGETTEXT) common_texts.cpp -o kde.pot
 	rm -f dirs
 
 dist-hook:
@@ -1223,7 +1119,7 @@
 .NOEXPORT:
 
 #>+ 2
-KDE_DIST=Mainpage.dox configure.files Makefile.am.in.wo aclocal.m4 Makefile.am.in COPYING-DOCS subdirs Makefile.in KDE3PORTING.html config.h.in configure.in Makefile.cvs acinclude.m4 Makefile.am 
+KDE_DIST=Mainpage.dox configure.files Makefile.am.in.wo aclocal.m4 Makefile.am.in stamp-h.in COPYING-DOCS subdirs Makefile.in KDE3PORTING.html config.h.in configure.in Makefile.cvs acinclude.m4 configure Makefile.am 
 
 #>+ 2
 docs-am:
--- kdelibs-3.5.7.orig/doc/common/Makefile.in
+++ kdelibs-3.5.7/doc/common/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -19,15 +19,11 @@
 # are not included in the language-specific common directory
 # They serve only as `reference' versions.
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -73,8 +69,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -82,13 +76,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -102,8 +96,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -124,17 +116,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -203,7 +192,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -240,12 +228,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -290,87 +280,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -394,75 +340,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -470,16 +358,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -506,7 +393,7 @@
 all: docs-am  all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -544,9 +431,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 mostlyclean-libtool:
@@ -554,13 +441,9 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 install-commonDATA: $(common_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(commondir)" || $(mkdir_p) "$(DESTDIR)$(commondir)"
+	test -z "$(commondir)" || $(MKDIR_P) "$(DESTDIR)$(commondir)"
 	@list='$(common_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -583,22 +466,21 @@
 
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -614,7 +496,7 @@
 all-am: Makefile $(DATA)
 installdirs:
 	for dir in "$(DESTDIR)$(commondir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -650,7 +532,7 @@
 
 distclean: distclean-am
 	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool
+distclean-am: clean-am distclean-generic
 
 dvi: dvi-am
 
@@ -664,12 +546,20 @@
 
 install-data-am: install-commonDATA
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -688,17 +578,21 @@
 
 ps-am:
 
-uninstall-am: uninstall-commonDATA uninstall-info-am
+uninstall-am: uninstall-commonDATA
+
+.MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
 	distclean distclean-generic distclean-libtool distdir dvi \
 	dvi-am html html-am info info-am install install-am \
-	install-commonDATA install-data install-data-am install-exec \
-	install-exec-am install-info install-info-am install-man \
+	install-commonDATA install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
 	install-strip installcheck installcheck-am installdirs \
 	maintainer-clean maintainer-clean-generic mostlyclean \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	uninstall uninstall-am uninstall-commonDATA uninstall-info-am
+	uninstall uninstall-am uninstall-commonDATA
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- kdelibs-3.5.7.orig/doc/Makefile.in
+++ kdelibs-3.5.7/doc/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,15 +14,11 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -55,17 +51,21 @@
 DIST_SOURCES =
 #>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 #>- 	html-recursive info-recursive install-data-recursive \
-#>- 	install-exec-recursive install-info-recursive \
-#>- 	install-recursive installcheck-recursive installdirs-recursive \
-#>- 	pdf-recursive ps-recursive uninstall-info-recursive \
-#>- 	uninstall-recursive
-#>+ 6
+#>- 	install-dvi-recursive install-exec-recursive \
+#>- 	install-html-recursive install-info-recursive \
+#>- 	install-pdf-recursive install-ps-recursive install-recursive \
+#>- 	installcheck-recursive installdirs-recursive pdf-recursive \
+#>- 	ps-recursive uninstall-recursive
+#>+ 7
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	html-recursive info-recursive install-data-recursive \
-	install-exec-recursive install-info-recursive \
-	install-recursive installcheck-recursive installdirs-recursive \
-	pdf-recursive ps-recursive uninstall-info-recursive \
-	uninstall-recursive nmcheck-recursive bcheck-recursive
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive nmcheck-recursive bcheck-recursive
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
@@ -75,8 +75,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -84,13 +82,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -104,8 +102,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -126,17 +122,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -205,7 +198,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -242,12 +234,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -292,87 +286,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -396,75 +346,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -472,16 +364,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -493,7 +384,7 @@
 all: docs-am  all-recursive
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -531,9 +422,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 mostlyclean-libtool:
@@ -542,10 +433,6 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
 # To change the values of `make' variables: instead of editing Makefiles,
@@ -577,8 +464,7 @@
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
+$(RECURSIVE_CLEAN_TARGETS):
 	@failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
@@ -679,22 +565,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -708,7 +593,7 @@
 	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
-	    || $(mkdir_p) "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 	    || exit 1; \
 	    distdir=`$(am__cd) $(distdir) && pwd`; \
 	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
@@ -716,6 +601,8 @@
 	      $(MAKE) $(AM_MAKEFLAGS) \
 	        top_distdir="$$top_distdir" \
 	        distdir="$$distdir/$$subdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -759,8 +646,7 @@
 
 distclean: distclean-recursive
 	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool \
-	distclean-tags
+distclean-am: clean-am distclean-generic distclean-tags
 
 dvi: dvi-recursive
 
@@ -774,12 +660,20 @@
 
 install-data-am:
 
+install-dvi: install-dvi-recursive
+
 install-exec-am:
 
+install-html: install-html-recursive
+
 install-info: install-info-recursive
 
 install-man:
 
+install-pdf: install-pdf-recursive
+
+install-ps: install-ps-recursive
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
@@ -798,22 +692,24 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am
+uninstall-am:
 
-uninstall-info: uninstall-info-recursive
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+	install-strip
 
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-	clean clean-generic clean-libtool clean-recursive ctags \
-	ctags-recursive distclean distclean-generic distclean-libtool \
-	distclean-recursive distclean-tags distdir dvi dvi-am html \
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+	all all-am check check-am clean clean-generic clean-libtool \
+	ctags ctags-recursive distclean distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
 	html-am info info-am install install-am install-data \
-	install-data-am install-exec install-exec-am install-info \
-	install-info-am install-man install-strip installcheck \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
 	installcheck-am installdirs installdirs-am maintainer-clean \
-	maintainer-clean-generic maintainer-clean-recursive \
-	mostlyclean mostlyclean-generic mostlyclean-libtool \
-	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
-	uninstall uninstall-am uninstall-info-am
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
+	uninstall uninstall-am
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- kdelibs-3.5.7.orig/doc/kspell/Makefile.in
+++ kdelibs-3.5.7/doc/kspell/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,15 +14,11 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -59,8 +55,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -68,13 +62,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -88,8 +82,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -110,17 +102,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -189,7 +178,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -226,12 +214,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -276,87 +266,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -380,75 +326,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -456,16 +344,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -479,7 +366,7 @@
 all: docs-am  all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -517,9 +404,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 mostlyclean-libtool:
@@ -527,10 +414,6 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 tags: TAGS
 TAGS:
 
@@ -541,22 +424,21 @@
 #>- distdir: $(DISTFILES)
 #>+ 1
 distdir: distdir-nls  $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -607,7 +489,7 @@
 
 distclean: distclean-am
 	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool
+distclean-am: clean-am distclean-generic
 
 dvi: dvi-am
 
@@ -623,12 +505,20 @@
 #>+ 1
 install-data-am: install-docs install-nls 
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -647,17 +537,20 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am
+uninstall-am:
+
+.MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
 	distclean distclean-generic distclean-libtool distdir dvi \
 	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-exec install-exec-am \
-	install-info install-info-am install-man install-strip \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
 	installcheck installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
-	uninstall-info-am
+	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- kdelibs-3.5.7.orig/doc/kdelibs/Makefile.in
+++ kdelibs-3.5.7/doc/kdelibs/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,15 +14,11 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -59,8 +55,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -68,13 +62,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -88,8 +82,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -110,17 +102,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -189,7 +178,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -226,12 +214,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -276,87 +266,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -380,75 +326,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -456,16 +344,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -480,7 +367,7 @@
 all: docs-am  all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -518,9 +405,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 mostlyclean-libtool:
@@ -528,10 +415,6 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 tags: TAGS
 TAGS:
 
@@ -540,22 +423,21 @@
 
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -604,7 +486,7 @@
 
 distclean: distclean-am
 	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool
+distclean-am: clean-am distclean-generic
 
 dvi: dvi-am
 
@@ -618,12 +500,20 @@
 
 install-data-am:
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -642,17 +532,20 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am
+uninstall-am:
+
+.MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
 	distclean distclean-generic distclean-libtool distdir dvi \
 	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-exec install-exec-am \
-	install-info install-info-am install-man install-strip \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
 	installcheck installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
-	uninstall-info-am
+	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- kdelibs-3.5.7.orig/kabc/tests/Makefile.in
+++ kdelibs-3.5.7/kabc/tests/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,15 +14,11 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -63,79 +59,170 @@
 bigread_OBJECTS = bigread.$(OBJEXT)
 bigread_DEPENDENCIES = ../libkabc.la \
 	$(top_builddir)/kabc/plugins/file/libkabc_file.la
+#>- bigread_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
+#>- 	$(bigread_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+bigread_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
+	$(bigread_LDFLAGS) $(LDFLAGS) -o $@
 am_bigwrite_OBJECTS = bigwrite.$(OBJEXT)
 #>- bigwrite_OBJECTS = $(am_bigwrite_OBJECTS)
 #>+ 1
 bigwrite_OBJECTS = bigwrite.$(OBJEXT)
 bigwrite_DEPENDENCIES = ../libkabc.la \
 	$(top_builddir)/kabc/plugins/file/libkabc_file.la
+#>- bigwrite_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(bigwrite_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+bigwrite_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(bigwrite_LDFLAGS) $(LDFLAGS) -o $@
 am_kabcargl_OBJECTS = kabcargl.$(OBJEXT)
 #>- kabcargl_OBJECTS = $(am_kabcargl_OBJECTS)
 #>+ 1
 kabcargl_OBJECTS = kabcargl.$(OBJEXT)
 kabcargl_LDADD = $(LDADD)
 kabcargl_DEPENDENCIES = ../libkabc.la
+#>- kabcargl_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(kabcargl_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+kabcargl_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(kabcargl_LDFLAGS) $(LDFLAGS) -o $@
 am_testaddressee_OBJECTS = testaddressee.$(OBJEXT)
 #>- testaddressee_OBJECTS = $(am_testaddressee_OBJECTS)
 #>+ 1
 testaddressee_OBJECTS = testaddressee.$(OBJEXT)
 testaddressee_LDADD = $(LDADD)
 testaddressee_DEPENDENCIES = ../libkabc.la
+#>- testaddressee_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(testaddressee_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+testaddressee_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(testaddressee_LDFLAGS) $(LDFLAGS) -o $@
 am_testaddresseelist_OBJECTS = testaddresseelist.$(OBJEXT)
 #>- testaddresseelist_OBJECTS = $(am_testaddresseelist_OBJECTS)
 #>+ 1
 testaddresseelist_OBJECTS = testaddresseelist.$(OBJEXT)
 testaddresseelist_LDADD = $(LDADD)
 testaddresseelist_DEPENDENCIES = ../libkabc.la
+#>- testaddresseelist_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(testaddresseelist_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+testaddresseelist_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(testaddresseelist_LDFLAGS) $(LDFLAGS) -o $@
 am_testaddressfmt_OBJECTS = testaddressfmt.$(OBJEXT)
 #>- testaddressfmt_OBJECTS = $(am_testaddressfmt_OBJECTS)
 #>+ 1
 testaddressfmt_OBJECTS = testaddressfmt.$(OBJEXT)
 testaddressfmt_LDADD = $(LDADD)
 testaddressfmt_DEPENDENCIES = ../libkabc.la
+#>- testaddressfmt_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(testaddressfmt_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+testaddressfmt_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(testaddressfmt_LDFLAGS) $(LDFLAGS) -o $@
 am_testaddresslineedit_OBJECTS = testaddresslineedit.$(OBJEXT)
 #>- testaddresslineedit_OBJECTS = $(am_testaddresslineedit_OBJECTS)
 #>+ 1
 testaddresslineedit_OBJECTS = testaddresslineedit.$(OBJEXT)
 testaddresslineedit_LDADD = $(LDADD)
 testaddresslineedit_DEPENDENCIES = ../libkabc.la
+#>- testaddresslineedit_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(testaddresslineedit_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+testaddresslineedit_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(testaddresslineedit_LDFLAGS) $(LDFLAGS) -o $@
 am_testdb_OBJECTS = testdb.$(OBJEXT)
 #>- testdb_OBJECTS = $(am_testdb_OBJECTS)
 #>+ 1
 testdb_OBJECTS = testdb.$(OBJEXT)
 testdb_LDADD = $(LDADD)
 testdb_DEPENDENCIES = ../libkabc.la
+#>- testdb_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
+#>- 	$(testdb_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+testdb_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
+	$(testdb_LDFLAGS) $(LDFLAGS) -o $@
 am_testdistlist_OBJECTS = testdistlist.$(OBJEXT)
 #>- testdistlist_OBJECTS = $(am_testdistlist_OBJECTS)
 #>+ 1
 testdistlist_OBJECTS = testdistlist.$(OBJEXT)
 testdistlist_LDADD = $(LDADD)
 testdistlist_DEPENDENCIES = ../libkabc.la
+#>- testdistlist_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(testdistlist_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+testdistlist_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(testdistlist_LDFLAGS) $(LDFLAGS) -o $@
 am_testkabc_OBJECTS = testkabc.$(OBJEXT)
 #>- testkabc_OBJECTS = $(am_testkabc_OBJECTS)
 #>+ 1
 testkabc_OBJECTS = testkabc.$(OBJEXT)
 testkabc_LDADD = $(LDADD)
 testkabc_DEPENDENCIES = ../libkabc.la
+#>- testkabc_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(testkabc_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+testkabc_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(testkabc_LDFLAGS) $(LDFLAGS) -o $@
 am_testkabcdlg_OBJECTS = testkabcdlg.$(OBJEXT)
 #>- testkabcdlg_OBJECTS = $(am_testkabcdlg_OBJECTS)
 #>+ 1
 testkabcdlg_OBJECTS = testkabcdlg.$(OBJEXT)
 testkabcdlg_LDADD = $(LDADD)
 testkabcdlg_DEPENDENCIES = ../libkabc.la
+#>- testkabcdlg_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(testkabcdlg_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+testkabcdlg_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(testkabcdlg_LDFLAGS) $(LDFLAGS) -o $@
 am_testldapclient_OBJECTS = testldapclient.$(OBJEXT)
 #>- testldapclient_OBJECTS = $(am_testldapclient_OBJECTS)
 #>+ 1
 testldapclient_OBJECTS = testldapclient.$(OBJEXT)
 testldapclient_LDADD = $(LDADD)
 testldapclient_DEPENDENCIES = ../libkabc.la
+#>- testldapclient_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(testldapclient_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+testldapclient_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(testldapclient_LDFLAGS) $(LDFLAGS) -o $@
 am_testlock_OBJECTS = testlock.$(OBJEXT)
 #>- testlock_OBJECTS = $(am_testlock_OBJECTS)
 #>+ 1
 testlock_OBJECTS = testlock.$(OBJEXT)
 testlock_LDADD = $(LDADD)
 testlock_DEPENDENCIES = ../libkabc.la
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+#>- testlock_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(testlock_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+testlock_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(testlock_LDFLAGS) $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -143,19 +230,21 @@
 #>+ 2
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
-#>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+#>+ 3
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
 CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 3
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(bigread_SOURCES) $(bigwrite_SOURCES) $(kabcargl_SOURCES) \
 	$(testaddressee_SOURCES) $(testaddresseelist_SOURCES) \
 	$(testaddressfmt_SOURCES) $(testaddresslineedit_SOURCES) \
@@ -177,8 +266,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -186,13 +273,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -206,8 +293,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -228,17 +313,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -307,7 +389,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -344,12 +425,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -394,87 +477,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -498,75 +537,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -574,16 +555,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -632,7 +612,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -670,9 +650,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 clean-checkPROGRAMS:
@@ -683,43 +663,43 @@
 	done
 bigread$(EXEEXT): $(bigread_OBJECTS) $(bigread_DEPENDENCIES) 
 	@rm -f bigread$(EXEEXT)
-	$(CXXLINK) $(bigread_LDFLAGS) $(bigread_OBJECTS) $(bigread_LDADD) $(LIBS)
+	$(bigread_LINK) $(bigread_OBJECTS) $(bigread_LDADD) $(LIBS)
 bigwrite$(EXEEXT): $(bigwrite_OBJECTS) $(bigwrite_DEPENDENCIES) 
 	@rm -f bigwrite$(EXEEXT)
-	$(CXXLINK) $(bigwrite_LDFLAGS) $(bigwrite_OBJECTS) $(bigwrite_LDADD) $(LIBS)
+	$(bigwrite_LINK) $(bigwrite_OBJECTS) $(bigwrite_LDADD) $(LIBS)
 kabcargl$(EXEEXT): $(kabcargl_OBJECTS) $(kabcargl_DEPENDENCIES) 
 	@rm -f kabcargl$(EXEEXT)
-	$(CXXLINK) $(kabcargl_LDFLAGS) $(kabcargl_OBJECTS) $(kabcargl_LDADD) $(LIBS)
+	$(kabcargl_LINK) $(kabcargl_OBJECTS) $(kabcargl_LDADD) $(LIBS)
 testaddressee$(EXEEXT): $(testaddressee_OBJECTS) $(testaddressee_DEPENDENCIES) 
 	@rm -f testaddressee$(EXEEXT)
-	$(CXXLINK) $(testaddressee_LDFLAGS) $(testaddressee_OBJECTS) $(testaddressee_LDADD) $(LIBS)
+	$(testaddressee_LINK) $(testaddressee_OBJECTS) $(testaddressee_LDADD) $(LIBS)
 testaddresseelist$(EXEEXT): $(testaddresseelist_OBJECTS) $(testaddresseelist_DEPENDENCIES) 
 	@rm -f testaddresseelist$(EXEEXT)
-	$(CXXLINK) $(testaddresseelist_LDFLAGS) $(testaddresseelist_OBJECTS) $(testaddresseelist_LDADD) $(LIBS)
+	$(testaddresseelist_LINK) $(testaddresseelist_OBJECTS) $(testaddresseelist_LDADD) $(LIBS)
 testaddressfmt$(EXEEXT): $(testaddressfmt_OBJECTS) $(testaddressfmt_DEPENDENCIES) 
 	@rm -f testaddressfmt$(EXEEXT)
-	$(CXXLINK) $(testaddressfmt_LDFLAGS) $(testaddressfmt_OBJECTS) $(testaddressfmt_LDADD) $(LIBS)
+	$(testaddressfmt_LINK) $(testaddressfmt_OBJECTS) $(testaddressfmt_LDADD) $(LIBS)
 testaddresslineedit$(EXEEXT): $(testaddresslineedit_OBJECTS) $(testaddresslineedit_DEPENDENCIES) 
 	@rm -f testaddresslineedit$(EXEEXT)
-	$(CXXLINK) $(testaddresslineedit_LDFLAGS) $(testaddresslineedit_OBJECTS) $(testaddresslineedit_LDADD) $(LIBS)
+	$(testaddresslineedit_LINK) $(testaddresslineedit_OBJECTS) $(testaddresslineedit_LDADD) $(LIBS)
 testdb$(EXEEXT): $(testdb_OBJECTS) $(testdb_DEPENDENCIES) 
 	@rm -f testdb$(EXEEXT)
-	$(CXXLINK) $(testdb_LDFLAGS) $(testdb_OBJECTS) $(testdb_LDADD) $(LIBS)
+	$(testdb_LINK) $(testdb_OBJECTS) $(testdb_LDADD) $(LIBS)
 testdistlist$(EXEEXT): $(testdistlist_OBJECTS) $(testdistlist_DEPENDENCIES) 
 	@rm -f testdistlist$(EXEEXT)
-	$(CXXLINK) $(testdistlist_LDFLAGS) $(testdistlist_OBJECTS) $(testdistlist_LDADD) $(LIBS)
+	$(testdistlist_LINK) $(testdistlist_OBJECTS) $(testdistlist_LDADD) $(LIBS)
 testkabc$(EXEEXT): $(testkabc_OBJECTS) $(testkabc_DEPENDENCIES) 
 	@rm -f testkabc$(EXEEXT)
-	$(CXXLINK) $(testkabc_LDFLAGS) $(testkabc_OBJECTS) $(testkabc_LDADD) $(LIBS)
+	$(testkabc_LINK) $(testkabc_OBJECTS) $(testkabc_LDADD) $(LIBS)
 testkabcdlg$(EXEEXT): $(testkabcdlg_OBJECTS) $(testkabcdlg_DEPENDENCIES) 
 	@rm -f testkabcdlg$(EXEEXT)
-	$(CXXLINK) $(testkabcdlg_LDFLAGS) $(testkabcdlg_OBJECTS) $(testkabcdlg_LDADD) $(LIBS)
+	$(testkabcdlg_LINK) $(testkabcdlg_OBJECTS) $(testkabcdlg_LDADD) $(LIBS)
 testldapclient$(EXEEXT): $(testldapclient_OBJECTS) $(testldapclient_DEPENDENCIES) 
 	@rm -f testldapclient$(EXEEXT)
-	$(CXXLINK) $(testldapclient_LDFLAGS) $(testldapclient_OBJECTS) $(testldapclient_LDADD) $(LIBS)
+	$(testldapclient_LINK) $(testldapclient_OBJECTS) $(testldapclient_LDADD) $(LIBS)
 testlock$(EXEEXT): $(testlock_OBJECTS) $(testlock_DEPENDENCIES) 
 	@rm -f testlock$(EXEEXT)
-	$(CXXLINK) $(testlock_LDFLAGS) $(testlock_OBJECTS) $(testlock_LDADD) $(LIBS)
+	$(testlock_LINK) $(testlock_OBJECTS) $(testlock_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -742,22 +722,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testlock.Po@am__quote@
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -768,10 +748,6 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -821,22 +797,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -890,7 +865,7 @@
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
@@ -904,12 +879,20 @@
 
 install-data-am:
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -930,19 +913,23 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am
+uninstall-am:
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean \
 	clean-checkPROGRAMS clean-generic clean-libtool ctags \
 	distclean distclean-compile distclean-generic \
 	distclean-libtool distclean-tags distdir dvi dvi-am html \
 	html-am info info-am install install-am install-data \
-	install-data-am install-exec install-exec-am install-info \
-	install-info-am install-man install-strip installcheck \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
 	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-info-am
+	tags uninstall uninstall-am
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- kdelibs-3.5.7.orig/kabc/plugins/evolution/Makefile.in
+++ kdelibs-3.5.7/kabc/plugins/evolution/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -17,15 +17,11 @@
 
 
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -75,7 +71,14 @@
 kabc_evo_la_nofinal_OBJECTS = dbwrapper.lo resourceevo.lo
 @KDE_USE_FINAL_FALSE@kabc_evo_la_OBJECTS = $(kabc_evo_la_nofinal_OBJECTS)
 @KDE_USE_FINAL_TRUE@kabc_evo_la_OBJECTS = $(kabc_evo_la_final_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+#>- kabc_evo_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(kabc_evo_la_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+kabc_evo_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(kabc_evo_la_LDFLAGS) $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -83,19 +86,21 @@
 #>+ 2
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 #>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
 CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 3
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(kabc_evo_la_SOURCES)
 DIST_SOURCES = $(kabc_evo_la_SOURCES)
 serviceDATA_INSTALL = $(INSTALL_DATA)
@@ -109,8 +114,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -118,13 +121,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -138,8 +141,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -160,17 +161,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -239,7 +237,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -276,12 +273,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -326,87 +325,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -430,75 +385,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -506,16 +403,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -538,7 +434,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -576,13 +472,13 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
+	test -z "$(kde_moduledir)" || $(MKDIR_P) "$(DESTDIR)$(kde_moduledir)"
 	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
@@ -593,7 +489,7 @@
 
 uninstall-kde_moduleLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
@@ -607,11 +503,8 @@
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
-#>- kabc_evo.la: $(kabc_evo_la_OBJECTS) $(kabc_evo_la_DEPENDENCIES) 
-#>+ 2
-@KDE_USE_CLOSURE_TRUE@kabc_evo.la: kabc_evo.la.closure $(kabc_evo_la_OBJECTS) $(kabc_evo_la_DEPENDENCIES) 
-@KDE_USE_CLOSURE_FALSE@kabc_evo.la: $(kabc_evo_la_OBJECTS) $(kabc_evo_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(kde_moduledir) $(kabc_evo_la_LDFLAGS) $(kabc_evo_la_OBJECTS) $(kabc_evo_la_LIBADD) $(LIBS)
+kabc_evo.la: $(kabc_evo_la_OBJECTS) $(kabc_evo_la_DEPENDENCIES) 
+	$(kabc_evo_la_LINK) -rpath $(kde_moduledir) $(kabc_evo_la_OBJECTS) $(kabc_evo_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -623,22 +516,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/resourceevo.Plo@am__quote@
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -648,13 +541,9 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 install-serviceDATA: $(service_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(servicedir)" || $(mkdir_p) "$(DESTDIR)$(servicedir)"
+	test -z "$(servicedir)" || $(MKDIR_P) "$(DESTDIR)$(servicedir)"
 	@list='$(service_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -719,22 +608,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -750,7 +638,7 @@
 all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS)
 installdirs:
 	for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(servicedir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -783,14 +671,14 @@
 #>- clean-am: clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
 #>- 	mostlyclean-am
 #>+ 2
-clean-am: clean-closures clean-bcheck clean-final  clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
+clean-am: clean-bcheck clean-final  clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
 	mostlyclean-am
 
 distclean: distclean-am
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
@@ -806,14 +694,22 @@
 #>+ 1
 install-data-am:   install-serviceDATA
 
+install-dvi: install-dvi-am
+
 #>- install-exec-am:
 #>+ 1
 install-exec-am:  install-kde_moduleLTLIBRARIES
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -834,22 +730,24 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-kde_moduleLTLIBRARIES \
-	uninstall-serviceDATA
+uninstall-am: uninstall-kde_moduleLTLIBRARIES uninstall-serviceDATA
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-kde_moduleLTLIBRARIES clean-libtool ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
 	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-exec \
-	install-exec-am install-info install-info-am \
-	install-kde_moduleLTLIBRARIES install-man install-serviceDATA \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am \
+	install-kde_moduleLTLIBRARIES install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-serviceDATA \
 	install-strip installcheck installcheck-am installdirs \
 	maintainer-clean maintainer-clean-generic mostlyclean \
 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
 	pdf pdf-am ps ps-am tags uninstall uninstall-am \
-	uninstall-info-am uninstall-kde_moduleLTLIBRARIES \
-	uninstall-serviceDATA
+	uninstall-kde_moduleLTLIBRARIES uninstall-serviceDATA
 
 
 messages: rc.cpp
@@ -858,22 +756,9 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
-#>+ 8
-kabc_evo.la.closure: $(kabc_evo_la_OBJECTS) $(kabc_evo_la_DEPENDENCIES)
-	@echo "int main() {return 0;}" > kabc_evo_la_closure.cpp
-	@$(LTCXXCOMPILE) -c kabc_evo_la_closure.cpp
-	$(CXXLINK) kabc_evo_la_closure.lo $(kabc_evo_la_LDFLAGS) $(kabc_evo_la_OBJECTS) $(kabc_evo_la_LIBADD) $(LIBS)
-	@rm -f kabc_evo_la_closure.* kabc_evo.la.closure
-	@echo "timestamp" > kabc_evo.la.closure
-
-
 #>+ 2
 KDE_DIST=evolution.desktop Makefile.in Makefile.am 
 
-#>+ 3
-clean-closures:
-	-rm -f  kabc_evo.la.closure
-
 #>+ 2
 docs-am:
 
--- kdelibs-3.5.7.orig/kabc/plugins/sql/Makefile.in
+++ kdelibs-3.5.7/kabc/plugins/sql/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -17,15 +17,11 @@
 
 
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -72,7 +68,14 @@
 kabc_sql_la_nofinal_OBJECTS = resourcesql.lo resourcesqlconfig.lo
 @KDE_USE_FINAL_FALSE@kabc_sql_la_OBJECTS = $(kabc_sql_la_nofinal_OBJECTS)
 @KDE_USE_FINAL_TRUE@kabc_sql_la_OBJECTS = $(kabc_sql_la_final_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+#>- kabc_sql_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(kabc_sql_la_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+kabc_sql_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(kabc_sql_la_LDFLAGS) $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -80,19 +83,21 @@
 #>+ 2
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
-#>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+#>+ 3
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
 CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 3
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(kabc_sql_la_SOURCES)
 DIST_SOURCES = $(kabc_sql_la_SOURCES)
 linkDATA_INSTALL = $(INSTALL_DATA)
@@ -106,8 +111,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -115,13 +118,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -135,8 +138,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -157,17 +158,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -236,7 +234,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -273,12 +270,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -323,87 +322,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -427,75 +382,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -503,16 +400,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -536,7 +432,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -574,13 +470,13 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
+	test -z "$(kde_moduledir)" || $(MKDIR_P) "$(DESTDIR)$(kde_moduledir)"
 	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
@@ -591,7 +487,7 @@
 
 uninstall-kde_moduleLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
@@ -605,11 +501,8 @@
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
-#>- kabc_sql.la: $(kabc_sql_la_OBJECTS) $(kabc_sql_la_DEPENDENCIES) 
-#>+ 2
-@KDE_USE_CLOSURE_TRUE@kabc_sql.la: kabc_sql.la.closure $(kabc_sql_la_OBJECTS) $(kabc_sql_la_DEPENDENCIES) 
-@KDE_USE_CLOSURE_FALSE@kabc_sql.la: $(kabc_sql_la_OBJECTS) $(kabc_sql_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(kde_moduledir) $(kabc_sql_la_LDFLAGS) $(kabc_sql_la_OBJECTS) $(kabc_sql_la_LIBADD) $(LIBS)
+kabc_sql.la: $(kabc_sql_la_OBJECTS) $(kabc_sql_la_DEPENDENCIES) 
+	$(kabc_sql_la_LINK) -rpath $(kde_moduledir) $(kabc_sql_la_OBJECTS) $(kabc_sql_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -621,22 +514,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/resourcesqlconfig.Plo@am__quote@
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -646,13 +539,9 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 install-linkDATA: $(link_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(linkdir)" || $(mkdir_p) "$(DESTDIR)$(linkdir)"
+	test -z "$(linkdir)" || $(MKDIR_P) "$(DESTDIR)$(linkdir)"
 	@list='$(link_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -717,22 +606,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -748,7 +636,7 @@
 all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS)
 installdirs:
 	for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(linkdir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -781,14 +669,14 @@
 #>- clean-am: clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
 #>- 	mostlyclean-am
 #>+ 2
-clean-am: clean-metasources clean-closures clean-bcheck clean-final  clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
+clean-am: clean-metasources clean-bcheck clean-final  clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
 	mostlyclean-am
 
 distclean: distclean-am
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
@@ -804,14 +692,22 @@
 #>+ 1
 install-data-am:   install-linkDATA
 
+install-dvi: install-dvi-am
+
 #>- install-exec-am:
 #>+ 1
 install-exec-am:  install-kde_moduleLTLIBRARIES
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -832,22 +728,24 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-kde_moduleLTLIBRARIES \
-	uninstall-linkDATA
+uninstall-am: uninstall-kde_moduleLTLIBRARIES uninstall-linkDATA
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-kde_moduleLTLIBRARIES clean-libtool ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
 	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-exec \
-	install-exec-am install-info install-info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am \
 	install-kde_moduleLTLIBRARIES install-linkDATA install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
 	install-strip installcheck installcheck-am installdirs \
 	maintainer-clean maintainer-clean-generic mostlyclean \
 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
 	pdf pdf-am ps ps-am tags uninstall uninstall-am \
-	uninstall-info-am uninstall-kde_moduleLTLIBRARIES \
-	uninstall-linkDATA
+	uninstall-kde_moduleLTLIBRARIES uninstall-linkDATA
 
 
 messages: rc.cpp
@@ -856,15 +754,6 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
-#>+ 8
-kabc_sql.la.closure: $(kabc_sql_la_OBJECTS) $(kabc_sql_la_DEPENDENCIES)
-	@echo "int main() {return 0;}" > kabc_sql_la_closure.cpp
-	@$(LTCXXCOMPILE) -c kabc_sql_la_closure.cpp
-	$(CXXLINK) kabc_sql_la_closure.lo $(kabc_sql_la_LDFLAGS) $(kabc_sql_la_OBJECTS) $(kabc_sql_la_LIBADD) $(LIBS)
-	@rm -f kabc_sql_la_closure.* kabc_sql.la.closure
-	@echo "timestamp" > kabc_sql.la.closure
-
-
 #>+ 3
 resourcesqlconfig.moc: $(srcdir)/resourcesqlconfig.h
 	$(MOC) $(srcdir)/resourcesqlconfig.h -o resourcesqlconfig.moc
@@ -879,10 +768,6 @@
 #>+ 2
 KDE_DIST=Makefile.in Makefile.am sql.desktop 
 
-#>+ 3
-clean-closures:
-	-rm -f  kabc_sql.la.closure
-
 #>+ 2
 docs-am:
 
--- kdelibs-3.5.7.orig/kabc/plugins/ldapkio/Makefile.in
+++ kdelibs-3.5.7/kabc/plugins/ldapkio/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -17,15 +17,11 @@
 
 
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -71,6 +67,13 @@
 #>- kabc_ldapkio_la_OBJECTS = $(am_kabc_ldapkio_la_OBJECTS)
 #>+ 1
 kabc_ldapkio_la_OBJECTS = resourceldapkioplugin.lo
+#>- kabc_ldapkio_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(kabc_ldapkio_la_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+kabc_ldapkio_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(kabc_ldapkio_la_LDFLAGS) $(LDFLAGS) -o $@
 am__DEPENDENCIES_1 =
 libkabc_ldapkio_la_DEPENDENCIES = $(top_builddir)/kabc/libkabc.la \
 	$(am__DEPENDENCIES_1)
@@ -83,7 +86,14 @@
 	resourceldapkioconfig.lo
 @KDE_USE_FINAL_FALSE@libkabc_ldapkio_la_OBJECTS = $(libkabc_ldapkio_la_nofinal_OBJECTS)
 @KDE_USE_FINAL_TRUE@libkabc_ldapkio_la_OBJECTS = $(libkabc_ldapkio_la_final_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+#>- libkabc_ldapkio_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(libkabc_ldapkio_la_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+libkabc_ldapkio_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(libkabc_ldapkio_la_LDFLAGS) $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -91,19 +101,21 @@
 #>+ 2
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 #>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
 CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 3
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(kabc_ldapkio_la_SOURCES) $(libkabc_ldapkio_la_SOURCES)
 DIST_SOURCES = $(kabc_ldapkio_la_SOURCES) \
 	$(libkabc_ldapkio_la_SOURCES)
@@ -119,8 +131,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -128,13 +138,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -148,8 +158,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -170,17 +178,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -249,7 +254,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -286,12 +290,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -336,87 +342,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -440,75 +402,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -516,16 +420,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -537,9 +440,7 @@
 noinst_HEADERS = resourceldapkioconfig.h
 lib_LTLIBRARIES = libkabc_ldapkio.la
 libkabc_ldapkio_la_SOURCES = resourceldapkio.cpp resourceldapkioconfig.cpp
-#>- libkabc_ldapkio_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:0:0 -no-undefined
-#>+ 1
-libkabc_ldapkio_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:0:0 -no-undefined $(KDE_NO_UNDEFINED)
+libkabc_ldapkio_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:0:0 -no-undefined
 libkabc_ldapkio_la_LIBADD = $(top_builddir)/kabc/libkabc.la $(LIB_KIO)
 libkabc_ldapkio_la_COMPILE_FIRST = $(top_builddir)/kabc/addressee.h
 kde_module_LTLIBRARIES = kabc_ldapkio.la
@@ -557,7 +458,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -595,13 +496,13 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
+	test -z "$(kde_moduledir)" || $(MKDIR_P) "$(DESTDIR)$(kde_moduledir)"
 	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
@@ -612,7 +513,7 @@
 
 uninstall-kde_moduleLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
@@ -628,7 +529,7 @@
 	done
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
@@ -639,7 +540,7 @@
 
 uninstall-libLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
@@ -653,16 +554,10 @@
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
-#>- kabc_ldapkio.la: $(kabc_ldapkio_la_OBJECTS) $(kabc_ldapkio_la_DEPENDENCIES) 
-#>+ 2
-@KDE_USE_CLOSURE_TRUE@kabc_ldapkio.la: kabc_ldapkio.la.closure $(kabc_ldapkio_la_OBJECTS) $(kabc_ldapkio_la_DEPENDENCIES) 
-@KDE_USE_CLOSURE_FALSE@kabc_ldapkio.la: $(kabc_ldapkio_la_OBJECTS) $(kabc_ldapkio_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(kde_moduledir) $(kabc_ldapkio_la_LDFLAGS) $(kabc_ldapkio_la_OBJECTS) $(kabc_ldapkio_la_LIBADD) $(LIBS)
-#>- libkabc_ldapkio.la: $(libkabc_ldapkio_la_OBJECTS) $(libkabc_ldapkio_la_DEPENDENCIES) 
-#>+ 2
-@KDE_USE_CLOSURE_TRUE@libkabc_ldapkio.la: libkabc_ldapkio.la.closure $(libkabc_ldapkio_la_OBJECTS) $(libkabc_ldapkio_la_DEPENDENCIES) 
-@KDE_USE_CLOSURE_FALSE@libkabc_ldapkio.la: $(libkabc_ldapkio_la_OBJECTS) $(libkabc_ldapkio_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(libdir) $(libkabc_ldapkio_la_LDFLAGS) $(libkabc_ldapkio_la_OBJECTS) $(libkabc_ldapkio_la_LIBADD) $(LIBS)
+kabc_ldapkio.la: $(kabc_ldapkio_la_OBJECTS) $(kabc_ldapkio_la_DEPENDENCIES) 
+	$(kabc_ldapkio_la_LINK) -rpath $(kde_moduledir) $(kabc_ldapkio_la_OBJECTS) $(kabc_ldapkio_la_LIBADD) $(LIBS)
+libkabc_ldapkio.la: $(libkabc_ldapkio_la_OBJECTS) $(libkabc_ldapkio_la_DEPENDENCIES) 
+	$(libkabc_ldapkio_la_LINK) -rpath $(libdir) $(libkabc_ldapkio_la_OBJECTS) $(libkabc_ldapkio_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -675,22 +570,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/resourceldapkioplugin.Plo@am__quote@
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -700,13 +595,9 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 install-serviceDATA: $(service_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(servicedir)" || $(mkdir_p) "$(DESTDIR)$(servicedir)"
+	test -z "$(servicedir)" || $(MKDIR_P) "$(DESTDIR)$(servicedir)"
 	@list='$(service_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -723,7 +614,7 @@
 	done
 install-kabcincludeHEADERS: $(kabcinclude_HEADERS)
 	@$(NORMAL_INSTALL)
-	test -z "$(kabcincludedir)" || $(mkdir_p) "$(DESTDIR)$(kabcincludedir)"
+	test -z "$(kabcincludedir)" || $(MKDIR_P) "$(DESTDIR)$(kabcincludedir)"
 	@list='$(kabcinclude_HEADERS)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -788,22 +679,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -819,7 +709,7 @@
 all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS)
 installdirs:
 	for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(servicedir)" "$(DESTDIR)$(kabcincludedir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -852,14 +742,14 @@
 #>- clean-am: clean-generic clean-kde_moduleLTLIBRARIES \
 #>- 	clean-libLTLIBRARIES clean-libtool mostlyclean-am
 #>+ 2
-clean-am: clean-metasources clean-closures clean-bcheck clean-final  clean-generic clean-kde_moduleLTLIBRARIES \
+clean-am: clean-metasources clean-bcheck clean-final  clean-generic clean-kde_moduleLTLIBRARIES \
 	clean-libLTLIBRARIES clean-libtool mostlyclean-am
 
 distclean: distclean-am
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
@@ -877,14 +767,22 @@
 install-data-am:   install-kabcincludeHEADERS \
  install-serviceDATA
 
+install-dvi: install-dvi-am
+
 #>- install-exec-am: install-libLTLIBRARIES
 #>+ 1
 install-exec-am:  install-libLTLIBRARIES install-kde_moduleLTLIBRARIES
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -905,25 +803,29 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-kabcincludeHEADERS \
+uninstall-am: uninstall-kabcincludeHEADERS \
 	uninstall-kde_moduleLTLIBRARIES uninstall-libLTLIBRARIES \
 	uninstall-serviceDATA
 
+.MAKE: install-am install-strip
+
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-kde_moduleLTLIBRARIES clean-libLTLIBRARIES clean-libtool \
 	ctags distclean distclean-compile distclean-generic \
 	distclean-libtool distclean-tags distdir dvi dvi-am html \
 	html-am info info-am install install-am install-data \
-	install-data-am install-exec install-exec-am install-info \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
 	install-info-am install-kabcincludeHEADERS \
 	install-kde_moduleLTLIBRARIES install-libLTLIBRARIES \
-	install-man install-serviceDATA install-strip installcheck \
+	install-man install-pdf install-pdf-am install-ps \
+	install-ps-am install-serviceDATA install-strip installcheck \
 	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-info-am \
-	uninstall-kabcincludeHEADERS uninstall-kde_moduleLTLIBRARIES \
-	uninstall-libLTLIBRARIES uninstall-serviceDATA
+	tags uninstall uninstall-am uninstall-kabcincludeHEADERS \
+	uninstall-kde_moduleLTLIBRARIES uninstall-libLTLIBRARIES \
+	uninstall-serviceDATA
 
 
 messages: rc.cpp
@@ -934,15 +836,6 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
-#>+ 8
-kabc_ldapkio.la.closure: $(kabc_ldapkio_la_OBJECTS) $(kabc_ldapkio_la_DEPENDENCIES)
-	@echo "int main() {return 0;}" > kabc_ldapkio_la_closure.cpp
-	@$(LTCXXCOMPILE) -c kabc_ldapkio_la_closure.cpp
-	$(CXXLINK) kabc_ldapkio_la_closure.lo $(kabc_ldapkio_la_LDFLAGS) $(kabc_ldapkio_la_OBJECTS) $(kabc_ldapkio_la_LIBADD) $(LIBS)
-	@rm -f kabc_ldapkio_la_closure.* kabc_ldapkio.la.closure
-	@echo "timestamp" > kabc_ldapkio.la.closure
-
-
 #>+ 3
 resourceldapkioconfig.moc: $(srcdir)/resourceldapkioconfig.h
 	$(MOC) $(srcdir)/resourceldapkioconfig.h -o resourceldapkioconfig.moc
@@ -957,15 +850,6 @@
 #>+ 2
 mocs: resourceldapkio.moc
 
-#>+ 8
-libkabc_ldapkio.la.closure: $(libkabc_ldapkio_la_OBJECTS) $(libkabc_ldapkio_la_DEPENDENCIES)
-	@echo "int main() {return 0;}" > libkabc_ldapkio_la_closure.cpp
-	@$(LTCXXCOMPILE) -c libkabc_ldapkio_la_closure.cpp
-	$(CXXLINK) libkabc_ldapkio_la_closure.lo $(libkabc_ldapkio_la_LDFLAGS) $(libkabc_ldapkio_la_OBJECTS) $(libkabc_ldapkio_la_LIBADD) $(LIBS)
-	@rm -f libkabc_ldapkio_la_closure.* libkabc_ldapkio.la.closure
-	@echo "timestamp" > libkabc_ldapkio.la.closure
-
-
 #>+ 3
 clean-metasources:
 	-rm -f  resourceldapkioconfig.moc resourceldapkio.moc
@@ -973,10 +857,6 @@
 #>+ 2
 KDE_DIST=ldapkio.desktop Makefile.in Makefile.am 
 
-#>+ 3
-clean-closures:
-	-rm -f  kabc_ldapkio.la.closure libkabc_ldapkio.la.closure
-
 #>+ 2
 docs-am:
 
--- kdelibs-3.5.7.orig/kabc/plugins/file/Makefile.in
+++ kdelibs-3.5.7/kabc/plugins/file/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -17,15 +17,11 @@
 
 
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -71,6 +67,13 @@
 #>- kabc_file_la_OBJECTS = $(am_kabc_file_la_OBJECTS)
 #>+ 1
 kabc_file_la_OBJECTS = resourcefileplugin.lo
+#>- kabc_file_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(kabc_file_la_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+kabc_file_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(kabc_file_la_LDFLAGS) $(LDFLAGS) -o $@
 am__DEPENDENCIES_1 =
 libkabc_file_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
 am_libkabc_file_la_OBJECTS = resourcefile.lo resourcefileconfig.lo
@@ -80,7 +83,14 @@
 libkabc_file_la_nofinal_OBJECTS = resourcefile.lo resourcefileconfig.lo
 @KDE_USE_FINAL_FALSE@libkabc_file_la_OBJECTS = $(libkabc_file_la_nofinal_OBJECTS)
 @KDE_USE_FINAL_TRUE@libkabc_file_la_OBJECTS = $(libkabc_file_la_final_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+#>- libkabc_file_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(libkabc_file_la_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+libkabc_file_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(libkabc_file_la_LDFLAGS) $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -88,19 +98,21 @@
 #>+ 2
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 #>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
 CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 3
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(kabc_file_la_SOURCES) $(libkabc_file_la_SOURCES)
 DIST_SOURCES = $(kabc_file_la_SOURCES) $(libkabc_file_la_SOURCES)
 serviceDATA_INSTALL = $(INSTALL_DATA)
@@ -115,8 +127,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -124,13 +134,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -144,8 +154,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -166,17 +174,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -245,7 +250,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -282,12 +286,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -332,87 +338,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -436,75 +398,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -512,16 +416,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -533,16 +436,12 @@
 noinst_HEADERS = resourcefileconfig.h
 lib_LTLIBRARIES = libkabc_file.la
 libkabc_file_la_SOURCES = resourcefile.cpp resourcefileconfig.cpp
-#>- libkabc_file_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:0:0 -no-undefined
-#>+ 1
-libkabc_file_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:0:0 -no-undefined $(KDE_NO_UNDEFINED)
+libkabc_file_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:0:0 -no-undefined
 libkabc_file_la_LIBADD = $(LIB_KABC)
 libkabc_file_la_COMPILE_FIRST = $(top_builddir)/kabc/addressee.h
 kde_module_LTLIBRARIES = kabc_file.la
 kabc_file_la_SOURCES = resourcefileplugin.cpp
-#>- kabc_file_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined
-#>+ 1
-kabc_file_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined $(KDE_NO_UNDEFINED)
+kabc_file_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined
 kabc_file_la_LIBADD = libkabc_file.la
 kabc_file_la_COMPILE_FIRST = $(top_builddir)/kabc/addressee.h
 #>- METASOURCES = AUTO
@@ -556,7 +455,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -594,13 +493,13 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
+	test -z "$(kde_moduledir)" || $(MKDIR_P) "$(DESTDIR)$(kde_moduledir)"
 	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
@@ -611,7 +510,7 @@
 
 uninstall-kde_moduleLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
@@ -627,7 +526,7 @@
 	done
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
@@ -638,7 +537,7 @@
 
 uninstall-libLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
@@ -652,16 +551,10 @@
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
-#>- kabc_file.la: $(kabc_file_la_OBJECTS) $(kabc_file_la_DEPENDENCIES) 
-#>+ 2
-@KDE_USE_CLOSURE_TRUE@kabc_file.la: kabc_file.la.closure $(kabc_file_la_OBJECTS) $(kabc_file_la_DEPENDENCIES) 
-@KDE_USE_CLOSURE_FALSE@kabc_file.la: $(kabc_file_la_OBJECTS) $(kabc_file_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(kde_moduledir) $(kabc_file_la_LDFLAGS) $(kabc_file_la_OBJECTS) $(kabc_file_la_LIBADD) $(LIBS)
-#>- libkabc_file.la: $(libkabc_file_la_OBJECTS) $(libkabc_file_la_DEPENDENCIES) 
-#>+ 2
-@KDE_USE_CLOSURE_TRUE@libkabc_file.la: libkabc_file.la.closure $(libkabc_file_la_OBJECTS) $(libkabc_file_la_DEPENDENCIES) 
-@KDE_USE_CLOSURE_FALSE@libkabc_file.la: $(libkabc_file_la_OBJECTS) $(libkabc_file_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(libdir) $(libkabc_file_la_LDFLAGS) $(libkabc_file_la_OBJECTS) $(libkabc_file_la_LIBADD) $(LIBS)
+kabc_file.la: $(kabc_file_la_OBJECTS) $(kabc_file_la_DEPENDENCIES) 
+	$(kabc_file_la_LINK) -rpath $(kde_moduledir) $(kabc_file_la_OBJECTS) $(kabc_file_la_LIBADD) $(LIBS)
+libkabc_file.la: $(libkabc_file_la_OBJECTS) $(libkabc_file_la_DEPENDENCIES) 
+	$(libkabc_file_la_LINK) -rpath $(libdir) $(libkabc_file_la_OBJECTS) $(libkabc_file_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -674,22 +567,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/resourcefileplugin.Plo@am__quote@
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -699,13 +592,9 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 install-serviceDATA: $(service_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(servicedir)" || $(mkdir_p) "$(DESTDIR)$(servicedir)"
+	test -z "$(servicedir)" || $(MKDIR_P) "$(DESTDIR)$(servicedir)"
 	@list='$(service_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -722,7 +611,7 @@
 	done
 install-kabcincludeHEADERS: $(kabcinclude_HEADERS)
 	@$(NORMAL_INSTALL)
-	test -z "$(kabcincludedir)" || $(mkdir_p) "$(DESTDIR)$(kabcincludedir)"
+	test -z "$(kabcincludedir)" || $(MKDIR_P) "$(DESTDIR)$(kabcincludedir)"
 	@list='$(kabcinclude_HEADERS)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -787,22 +676,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -818,7 +706,7 @@
 all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS)
 installdirs:
 	for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(servicedir)" "$(DESTDIR)$(kabcincludedir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -851,14 +739,14 @@
 #>- clean-am: clean-generic clean-kde_moduleLTLIBRARIES \
 #>- 	clean-libLTLIBRARIES clean-libtool mostlyclean-am
 #>+ 2
-clean-am: clean-metasources clean-closures clean-bcheck clean-final  clean-generic clean-kde_moduleLTLIBRARIES \
+clean-am: clean-metasources clean-bcheck clean-final  clean-generic clean-kde_moduleLTLIBRARIES \
 	clean-libLTLIBRARIES clean-libtool mostlyclean-am
 
 distclean: distclean-am
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
@@ -876,14 +764,22 @@
 install-data-am:   install-kabcincludeHEADERS \
  install-serviceDATA
 
+install-dvi: install-dvi-am
+
 #>- install-exec-am: install-libLTLIBRARIES
 #>+ 1
 install-exec-am:  install-libLTLIBRARIES install-kde_moduleLTLIBRARIES
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -904,25 +800,29 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-kabcincludeHEADERS \
+uninstall-am: uninstall-kabcincludeHEADERS \
 	uninstall-kde_moduleLTLIBRARIES uninstall-libLTLIBRARIES \
 	uninstall-serviceDATA
 
+.MAKE: install-am install-strip
+
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-kde_moduleLTLIBRARIES clean-libLTLIBRARIES clean-libtool \
 	ctags distclean distclean-compile distclean-generic \
 	distclean-libtool distclean-tags distdir dvi dvi-am html \
 	html-am info info-am install install-am install-data \
-	install-data-am install-exec install-exec-am install-info \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
 	install-info-am install-kabcincludeHEADERS \
 	install-kde_moduleLTLIBRARIES install-libLTLIBRARIES \
-	install-man install-serviceDATA install-strip installcheck \
+	install-man install-pdf install-pdf-am install-ps \
+	install-ps-am install-serviceDATA install-strip installcheck \
 	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-info-am \
-	uninstall-kabcincludeHEADERS uninstall-kde_moduleLTLIBRARIES \
-	uninstall-libLTLIBRARIES uninstall-serviceDATA
+	tags uninstall uninstall-am uninstall-kabcincludeHEADERS \
+	uninstall-kde_moduleLTLIBRARIES uninstall-libLTLIBRARIES \
+	uninstall-serviceDATA
 
 
 messages: rc.cpp
@@ -931,15 +831,6 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
-#>+ 8
-kabc_file.la.closure: $(kabc_file_la_OBJECTS) $(kabc_file_la_DEPENDENCIES)
-	@echo "int main() {return 0;}" > kabc_file_la_closure.cpp
-	@$(LTCXXCOMPILE) -c kabc_file_la_closure.cpp
-	$(CXXLINK) kabc_file_la_closure.lo $(kabc_file_la_LDFLAGS) $(kabc_file_la_OBJECTS) $(kabc_file_la_LIBADD) $(LIBS)
-	@rm -f kabc_file_la_closure.* kabc_file.la.closure
-	@echo "timestamp" > kabc_file.la.closure
-
-
 #>+ 3
 resourcefileconfig.moc: $(srcdir)/resourcefileconfig.h
 	$(MOC) $(srcdir)/resourcefileconfig.h -o resourcefileconfig.moc
@@ -954,15 +845,6 @@
 #>+ 2
 mocs: resourcefile.moc
 
-#>+ 8
-libkabc_file.la.closure: $(libkabc_file_la_OBJECTS) $(libkabc_file_la_DEPENDENCIES)
-	@echo "int main() {return 0;}" > libkabc_file_la_closure.cpp
-	@$(LTCXXCOMPILE) -c libkabc_file_la_closure.cpp
-	$(CXXLINK) libkabc_file_la_closure.lo $(libkabc_file_la_LDFLAGS) $(libkabc_file_la_OBJECTS) $(libkabc_file_la_LIBADD) $(LIBS)
-	@rm -f libkabc_file_la_closure.* libkabc_file.la.closure
-	@echo "timestamp" > libkabc_file.la.closure
-
-
 #>+ 3
 clean-metasources:
 	-rm -f  resourcefileconfig.moc resourcefile.moc
@@ -970,10 +852,6 @@
 #>+ 2
 KDE_DIST=file.desktop Makefile.in Makefile.am 
 
-#>+ 3
-clean-closures:
-	-rm -f  kabc_file.la.closure libkabc_file.la.closure
-
 #>+ 2
 docs-am:
 
--- kdelibs-3.5.7.orig/kabc/plugins/net/Makefile.in
+++ kdelibs-3.5.7/kabc/plugins/net/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -17,15 +17,11 @@
 
 
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -71,6 +67,13 @@
 #>- kabc_net_la_OBJECTS = $(am_kabc_net_la_OBJECTS)
 #>+ 1
 kabc_net_la_OBJECTS = resourcenetplugin.lo
+#>- kabc_net_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(kabc_net_la_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+kabc_net_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(kabc_net_la_LDFLAGS) $(LDFLAGS) -o $@
 am__DEPENDENCIES_1 =
 libkabc_net_la_DEPENDENCIES = $(top_builddir)/kabc/libkabc.la \
 	$(am__DEPENDENCIES_1)
@@ -81,7 +84,14 @@
 libkabc_net_la_nofinal_OBJECTS = resourcenet.lo resourcenetconfig.lo
 @KDE_USE_FINAL_FALSE@libkabc_net_la_OBJECTS = $(libkabc_net_la_nofinal_OBJECTS)
 @KDE_USE_FINAL_TRUE@libkabc_net_la_OBJECTS = $(libkabc_net_la_final_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+#>- libkabc_net_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(libkabc_net_la_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+libkabc_net_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(libkabc_net_la_LDFLAGS) $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -89,19 +99,21 @@
 #>+ 2
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 #>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
 CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 3
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(kabc_net_la_SOURCES) $(libkabc_net_la_SOURCES)
 DIST_SOURCES = $(kabc_net_la_SOURCES) $(libkabc_net_la_SOURCES)
 serviceDATA_INSTALL = $(INSTALL_DATA)
@@ -116,8 +128,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -125,13 +135,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -145,8 +155,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -167,17 +175,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -246,7 +251,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -283,12 +287,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -333,87 +339,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -437,75 +399,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -513,16 +417,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -534,9 +437,7 @@
 noinst_HEADERS = resourcenetconfig.h
 lib_LTLIBRARIES = libkabc_net.la
 libkabc_net_la_SOURCES = resourcenet.cpp resourcenetconfig.cpp
-#>- libkabc_net_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:0:0 -no-undefined
-#>+ 1
-libkabc_net_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:0:0 -no-undefined $(KDE_NO_UNDEFINED)
+libkabc_net_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:0:0 -no-undefined
 libkabc_net_la_LIBADD = $(top_builddir)/kabc/libkabc.la $(LIB_KIO)
 libkabc_net_la_COMPILE_FIRST = $(top_builddir)/kabc/addressee.h
 kde_module_LTLIBRARIES = kabc_net.la
@@ -554,7 +455,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -592,13 +493,13 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
+	test -z "$(kde_moduledir)" || $(MKDIR_P) "$(DESTDIR)$(kde_moduledir)"
 	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
@@ -609,7 +510,7 @@
 
 uninstall-kde_moduleLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
@@ -625,7 +526,7 @@
 	done
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
@@ -636,7 +537,7 @@
 
 uninstall-libLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
@@ -650,16 +551,10 @@
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
-#>- kabc_net.la: $(kabc_net_la_OBJECTS) $(kabc_net_la_DEPENDENCIES) 
-#>+ 2
-@KDE_USE_CLOSURE_TRUE@kabc_net.la: kabc_net.la.closure $(kabc_net_la_OBJECTS) $(kabc_net_la_DEPENDENCIES) 
-@KDE_USE_CLOSURE_FALSE@kabc_net.la: $(kabc_net_la_OBJECTS) $(kabc_net_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(kde_moduledir) $(kabc_net_la_LDFLAGS) $(kabc_net_la_OBJECTS) $(kabc_net_la_LIBADD) $(LIBS)
-#>- libkabc_net.la: $(libkabc_net_la_OBJECTS) $(libkabc_net_la_DEPENDENCIES) 
-#>+ 2
-@KDE_USE_CLOSURE_TRUE@libkabc_net.la: libkabc_net.la.closure $(libkabc_net_la_OBJECTS) $(libkabc_net_la_DEPENDENCIES) 
-@KDE_USE_CLOSURE_FALSE@libkabc_net.la: $(libkabc_net_la_OBJECTS) $(libkabc_net_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(libdir) $(libkabc_net_la_LDFLAGS) $(libkabc_net_la_OBJECTS) $(libkabc_net_la_LIBADD) $(LIBS)
+kabc_net.la: $(kabc_net_la_OBJECTS) $(kabc_net_la_DEPENDENCIES) 
+	$(kabc_net_la_LINK) -rpath $(kde_moduledir) $(kabc_net_la_OBJECTS) $(kabc_net_la_LIBADD) $(LIBS)
+libkabc_net.la: $(libkabc_net_la_OBJECTS) $(libkabc_net_la_DEPENDENCIES) 
+	$(libkabc_net_la_LINK) -rpath $(libdir) $(libkabc_net_la_OBJECTS) $(libkabc_net_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -672,22 +567,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/resourcenetplugin.Plo@am__quote@
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -697,13 +592,9 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 install-serviceDATA: $(service_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(servicedir)" || $(mkdir_p) "$(DESTDIR)$(servicedir)"
+	test -z "$(servicedir)" || $(MKDIR_P) "$(DESTDIR)$(servicedir)"
 	@list='$(service_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -720,7 +611,7 @@
 	done
 install-kabcincludeHEADERS: $(kabcinclude_HEADERS)
 	@$(NORMAL_INSTALL)
-	test -z "$(kabcincludedir)" || $(mkdir_p) "$(DESTDIR)$(kabcincludedir)"
+	test -z "$(kabcincludedir)" || $(MKDIR_P) "$(DESTDIR)$(kabcincludedir)"
 	@list='$(kabcinclude_HEADERS)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -785,22 +676,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -816,7 +706,7 @@
 all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS)
 installdirs:
 	for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(servicedir)" "$(DESTDIR)$(kabcincludedir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -849,14 +739,14 @@
 #>- clean-am: clean-generic clean-kde_moduleLTLIBRARIES \
 #>- 	clean-libLTLIBRARIES clean-libtool mostlyclean-am
 #>+ 2
-clean-am: clean-metasources clean-closures clean-bcheck clean-final  clean-generic clean-kde_moduleLTLIBRARIES \
+clean-am: clean-metasources clean-bcheck clean-final  clean-generic clean-kde_moduleLTLIBRARIES \
 	clean-libLTLIBRARIES clean-libtool mostlyclean-am
 
 distclean: distclean-am
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
@@ -874,14 +764,22 @@
 install-data-am:   install-kabcincludeHEADERS \
  install-serviceDATA
 
+install-dvi: install-dvi-am
+
 #>- install-exec-am: install-libLTLIBRARIES
 #>+ 1
 install-exec-am:  install-libLTLIBRARIES install-kde_moduleLTLIBRARIES
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -902,25 +800,29 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-kabcincludeHEADERS \
+uninstall-am: uninstall-kabcincludeHEADERS \
 	uninstall-kde_moduleLTLIBRARIES uninstall-libLTLIBRARIES \
 	uninstall-serviceDATA
 
+.MAKE: install-am install-strip
+
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-kde_moduleLTLIBRARIES clean-libLTLIBRARIES clean-libtool \
 	ctags distclean distclean-compile distclean-generic \
 	distclean-libtool distclean-tags distdir dvi dvi-am html \
 	html-am info info-am install install-am install-data \
-	install-data-am install-exec install-exec-am install-info \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
 	install-info-am install-kabcincludeHEADERS \
 	install-kde_moduleLTLIBRARIES install-libLTLIBRARIES \
-	install-man install-serviceDATA install-strip installcheck \
+	install-man install-pdf install-pdf-am install-ps \
+	install-ps-am install-serviceDATA install-strip installcheck \
 	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-info-am \
-	uninstall-kabcincludeHEADERS uninstall-kde_moduleLTLIBRARIES \
-	uninstall-libLTLIBRARIES uninstall-serviceDATA
+	tags uninstall uninstall-am uninstall-kabcincludeHEADERS \
+	uninstall-kde_moduleLTLIBRARIES uninstall-libLTLIBRARIES \
+	uninstall-serviceDATA
 
 
 messages: rc.cpp
@@ -931,15 +833,6 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
-#>+ 8
-kabc_net.la.closure: $(kabc_net_la_OBJECTS) $(kabc_net_la_DEPENDENCIES)
-	@echo "int main() {return 0;}" > kabc_net_la_closure.cpp
-	@$(LTCXXCOMPILE) -c kabc_net_la_closure.cpp
-	$(CXXLINK) kabc_net_la_closure.lo $(kabc_net_la_LDFLAGS) $(kabc_net_la_OBJECTS) $(kabc_net_la_LIBADD) $(LIBS)
-	@rm -f kabc_net_la_closure.* kabc_net.la.closure
-	@echo "timestamp" > kabc_net.la.closure
-
-
 #>+ 3
 resourcenetconfig.moc: $(srcdir)/resourcenetconfig.h
 	$(MOC) $(srcdir)/resourcenetconfig.h -o resourcenetconfig.moc
@@ -954,15 +847,6 @@
 #>+ 2
 mocs: resourcenet.moc
 
-#>+ 8
-libkabc_net.la.closure: $(libkabc_net_la_OBJECTS) $(libkabc_net_la_DEPENDENCIES)
-	@echo "int main() {return 0;}" > libkabc_net_la_closure.cpp
-	@$(LTCXXCOMPILE) -c libkabc_net_la_closure.cpp
-	$(CXXLINK) libkabc_net_la_closure.lo $(libkabc_net_la_LDFLAGS) $(libkabc_net_la_OBJECTS) $(libkabc_net_la_LIBADD) $(LIBS)
-	@rm -f libkabc_net_la_closure.* libkabc_net.la.closure
-	@echo "timestamp" > libkabc_net.la.closure
-
-
 #>+ 3
 clean-metasources:
 	-rm -f  resourcenetconfig.moc resourcenet.moc
@@ -970,10 +854,6 @@
 #>+ 2
 KDE_DIST=net.desktop Makefile.in Makefile.am 
 
-#>+ 3
-clean-closures:
-	-rm -f  kabc_net.la.closure libkabc_net.la.closure
-
 #>+ 2
 docs-am:
 
--- kdelibs-3.5.7.orig/kabc/plugins/Makefile.in
+++ kdelibs-3.5.7/kabc/plugins/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,15 +14,11 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -55,17 +51,21 @@
 DIST_SOURCES =
 #>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 #>- 	html-recursive info-recursive install-data-recursive \
-#>- 	install-exec-recursive install-info-recursive \
-#>- 	install-recursive installcheck-recursive installdirs-recursive \
-#>- 	pdf-recursive ps-recursive uninstall-info-recursive \
-#>- 	uninstall-recursive
-#>+ 6
+#>- 	install-dvi-recursive install-exec-recursive \
+#>- 	install-html-recursive install-info-recursive \
+#>- 	install-pdf-recursive install-ps-recursive install-recursive \
+#>- 	installcheck-recursive installdirs-recursive pdf-recursive \
+#>- 	ps-recursive uninstall-recursive
+#>+ 7
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	html-recursive info-recursive install-data-recursive \
-	install-exec-recursive install-info-recursive \
-	install-recursive installcheck-recursive installdirs-recursive \
-	pdf-recursive ps-recursive uninstall-info-recursive \
-	uninstall-recursive nmcheck-recursive bcheck-recursive
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive nmcheck-recursive bcheck-recursive
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
@@ -75,8 +75,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -84,13 +82,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -104,8 +102,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -126,17 +122,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -205,7 +198,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -242,12 +234,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -292,87 +286,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -396,75 +346,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -472,16 +364,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -493,7 +384,7 @@
 all: docs-am  all-recursive
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -531,9 +422,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 mostlyclean-libtool:
@@ -542,10 +433,6 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
 # To change the values of `make' variables: instead of editing Makefiles,
@@ -577,8 +464,7 @@
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
+$(RECURSIVE_CLEAN_TARGETS):
 	@failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
@@ -679,22 +565,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -708,7 +593,7 @@
 	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
-	    || $(mkdir_p) "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 	    || exit 1; \
 	    distdir=`$(am__cd) $(distdir) && pwd`; \
 	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
@@ -716,6 +601,8 @@
 	      $(MAKE) $(AM_MAKEFLAGS) \
 	        top_distdir="$$top_distdir" \
 	        distdir="$$distdir/$$subdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -759,8 +646,7 @@
 
 distclean: distclean-recursive
 	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool \
-	distclean-tags
+distclean-am: clean-am distclean-generic distclean-tags
 
 dvi: dvi-recursive
 
@@ -774,12 +660,20 @@
 
 install-data-am:
 
+install-dvi: install-dvi-recursive
+
 install-exec-am:
 
+install-html: install-html-recursive
+
 install-info: install-info-recursive
 
 install-man:
 
+install-pdf: install-pdf-recursive
+
+install-ps: install-ps-recursive
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
@@ -798,22 +692,24 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am
+uninstall-am:
 
-uninstall-info: uninstall-info-recursive
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+	install-strip
 
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-	clean clean-generic clean-libtool clean-recursive ctags \
-	ctags-recursive distclean distclean-generic distclean-libtool \
-	distclean-recursive distclean-tags distdir dvi dvi-am html \
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+	all all-am check check-am clean clean-generic clean-libtool \
+	ctags ctags-recursive distclean distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
 	html-am info info-am install install-am install-data \
-	install-data-am install-exec install-exec-am install-info \
-	install-info-am install-man install-strip installcheck \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
 	installcheck-am installdirs installdirs-am maintainer-clean \
-	maintainer-clean-generic maintainer-clean-recursive \
-	mostlyclean mostlyclean-generic mostlyclean-libtool \
-	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
-	uninstall uninstall-am uninstall-info-am
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
+	uninstall uninstall-am
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- kdelibs-3.5.7.orig/kabc/plugins/dir/Makefile.in
+++ kdelibs-3.5.7/kabc/plugins/dir/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -17,15 +17,11 @@
 
 
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -71,6 +67,13 @@
 #>- kabc_dir_la_OBJECTS = $(am_kabc_dir_la_OBJECTS)
 #>+ 1
 kabc_dir_la_OBJECTS = resourcedirplugin.lo
+#>- kabc_dir_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(kabc_dir_la_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+kabc_dir_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(kabc_dir_la_LDFLAGS) $(LDFLAGS) -o $@
 am__DEPENDENCIES_1 =
 libkabc_dir_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
 am_libkabc_dir_la_OBJECTS = resourcedir.lo resourcedirconfig.lo
@@ -80,7 +83,14 @@
 libkabc_dir_la_nofinal_OBJECTS = resourcedir.lo resourcedirconfig.lo
 @KDE_USE_FINAL_FALSE@libkabc_dir_la_OBJECTS = $(libkabc_dir_la_nofinal_OBJECTS)
 @KDE_USE_FINAL_TRUE@libkabc_dir_la_OBJECTS = $(libkabc_dir_la_final_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+#>- libkabc_dir_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(libkabc_dir_la_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+libkabc_dir_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(libkabc_dir_la_LDFLAGS) $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -88,19 +98,21 @@
 #>+ 2
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 #>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
 CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 3
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(kabc_dir_la_SOURCES) $(libkabc_dir_la_SOURCES)
 DIST_SOURCES = $(kabc_dir_la_SOURCES) $(libkabc_dir_la_SOURCES)
 serviceDATA_INSTALL = $(INSTALL_DATA)
@@ -115,8 +127,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -124,13 +134,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -144,8 +154,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -166,17 +174,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -245,7 +250,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -282,12 +286,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -332,87 +338,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -436,75 +398,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -512,16 +416,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -533,16 +436,12 @@
 noinst_HEADERS = resourcedirconfig.h
 lib_LTLIBRARIES = libkabc_dir.la
 libkabc_dir_la_SOURCES = resourcedir.cpp resourcedirconfig.cpp
-#>- libkabc_dir_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:0:0 -no-undefined 
-#>+ 1
-libkabc_dir_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:0:0 -no-undefined $(KDE_NO_UNDEFINED) 
+libkabc_dir_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:0:0 -no-undefined 
 libkabc_dir_la_LIBADD = $(LIB_KABC)
 libkabc_dir_la_COMPILE_FIRST = $(top_builddir)/kabc/addressee.h
 kde_module_LTLIBRARIES = kabc_dir.la
 kabc_dir_la_SOURCES = resourcedirplugin.cpp
-#>- kabc_dir_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined
-#>+ 1
-kabc_dir_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined $(KDE_NO_UNDEFINED)
+kabc_dir_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined
 kabc_dir_la_LIBADD = libkabc_dir.la
 #>- METASOURCES = AUTO
 kabcincludedir = $(includedir)/kabc
@@ -555,7 +454,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -593,13 +492,13 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
+	test -z "$(kde_moduledir)" || $(MKDIR_P) "$(DESTDIR)$(kde_moduledir)"
 	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
@@ -610,7 +509,7 @@
 
 uninstall-kde_moduleLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
@@ -626,7 +525,7 @@
 	done
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
@@ -637,7 +536,7 @@
 
 uninstall-libLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
@@ -651,16 +550,10 @@
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
-#>- kabc_dir.la: $(kabc_dir_la_OBJECTS) $(kabc_dir_la_DEPENDENCIES) 
-#>+ 2
-@KDE_USE_CLOSURE_TRUE@kabc_dir.la: kabc_dir.la.closure $(kabc_dir_la_OBJECTS) $(kabc_dir_la_DEPENDENCIES) 
-@KDE_USE_CLOSURE_FALSE@kabc_dir.la: $(kabc_dir_la_OBJECTS) $(kabc_dir_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(kde_moduledir) $(kabc_dir_la_LDFLAGS) $(kabc_dir_la_OBJECTS) $(kabc_dir_la_LIBADD) $(LIBS)
-#>- libkabc_dir.la: $(libkabc_dir_la_OBJECTS) $(libkabc_dir_la_DEPENDENCIES) 
-#>+ 2
-@KDE_USE_CLOSURE_TRUE@libkabc_dir.la: libkabc_dir.la.closure $(libkabc_dir_la_OBJECTS) $(libkabc_dir_la_DEPENDENCIES) 
-@KDE_USE_CLOSURE_FALSE@libkabc_dir.la: $(libkabc_dir_la_OBJECTS) $(libkabc_dir_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(libdir) $(libkabc_dir_la_LDFLAGS) $(libkabc_dir_la_OBJECTS) $(libkabc_dir_la_LIBADD) $(LIBS)
+kabc_dir.la: $(kabc_dir_la_OBJECTS) $(kabc_dir_la_DEPENDENCIES) 
+	$(kabc_dir_la_LINK) -rpath $(kde_moduledir) $(kabc_dir_la_OBJECTS) $(kabc_dir_la_LIBADD) $(LIBS)
+libkabc_dir.la: $(libkabc_dir_la_OBJECTS) $(libkabc_dir_la_DEPENDENCIES) 
+	$(libkabc_dir_la_LINK) -rpath $(libdir) $(libkabc_dir_la_OBJECTS) $(libkabc_dir_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -673,22 +566,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/resourcedirplugin.Plo@am__quote@
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -698,13 +591,9 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 install-serviceDATA: $(service_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(servicedir)" || $(mkdir_p) "$(DESTDIR)$(servicedir)"
+	test -z "$(servicedir)" || $(MKDIR_P) "$(DESTDIR)$(servicedir)"
 	@list='$(service_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -721,7 +610,7 @@
 	done
 install-kabcincludeHEADERS: $(kabcinclude_HEADERS)
 	@$(NORMAL_INSTALL)
-	test -z "$(kabcincludedir)" || $(mkdir_p) "$(DESTDIR)$(kabcincludedir)"
+	test -z "$(kabcincludedir)" || $(MKDIR_P) "$(DESTDIR)$(kabcincludedir)"
 	@list='$(kabcinclude_HEADERS)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -786,22 +675,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -817,7 +705,7 @@
 all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS)
 installdirs:
 	for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(servicedir)" "$(DESTDIR)$(kabcincludedir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -850,14 +738,14 @@
 #>- clean-am: clean-generic clean-kde_moduleLTLIBRARIES \
 #>- 	clean-libLTLIBRARIES clean-libtool mostlyclean-am
 #>+ 2
-clean-am: clean-metasources clean-closures clean-bcheck clean-final  clean-generic clean-kde_moduleLTLIBRARIES \
+clean-am: clean-metasources clean-bcheck clean-final  clean-generic clean-kde_moduleLTLIBRARIES \
 	clean-libLTLIBRARIES clean-libtool mostlyclean-am
 
 distclean: distclean-am
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
@@ -875,14 +763,22 @@
 install-data-am:   install-kabcincludeHEADERS \
  install-serviceDATA
 
+install-dvi: install-dvi-am
+
 #>- install-exec-am: install-libLTLIBRARIES
 #>+ 1
 install-exec-am:  install-libLTLIBRARIES install-kde_moduleLTLIBRARIES
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -903,25 +799,29 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-kabcincludeHEADERS \
+uninstall-am: uninstall-kabcincludeHEADERS \
 	uninstall-kde_moduleLTLIBRARIES uninstall-libLTLIBRARIES \
 	uninstall-serviceDATA
 
+.MAKE: install-am install-strip
+
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-kde_moduleLTLIBRARIES clean-libLTLIBRARIES clean-libtool \
 	ctags distclean distclean-compile distclean-generic \
 	distclean-libtool distclean-tags distdir dvi dvi-am html \
 	html-am info info-am install install-am install-data \
-	install-data-am install-exec install-exec-am install-info \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
 	install-info-am install-kabcincludeHEADERS \
 	install-kde_moduleLTLIBRARIES install-libLTLIBRARIES \
-	install-man install-serviceDATA install-strip installcheck \
+	install-man install-pdf install-pdf-am install-ps \
+	install-ps-am install-serviceDATA install-strip installcheck \
 	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-info-am \
-	uninstall-kabcincludeHEADERS uninstall-kde_moduleLTLIBRARIES \
-	uninstall-libLTLIBRARIES uninstall-serviceDATA
+	tags uninstall uninstall-am uninstall-kabcincludeHEADERS \
+	uninstall-kde_moduleLTLIBRARIES uninstall-libLTLIBRARIES \
+	uninstall-serviceDATA
 
 
 messages: rc.cpp
@@ -932,15 +832,6 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
-#>+ 8
-kabc_dir.la.closure: $(kabc_dir_la_OBJECTS) $(kabc_dir_la_DEPENDENCIES)
-	@echo "int main() {return 0;}" > kabc_dir_la_closure.cpp
-	@$(LTCXXCOMPILE) -c kabc_dir_la_closure.cpp
-	$(CXXLINK) kabc_dir_la_closure.lo $(kabc_dir_la_LDFLAGS) $(kabc_dir_la_OBJECTS) $(kabc_dir_la_LIBADD) $(LIBS)
-	@rm -f kabc_dir_la_closure.* kabc_dir.la.closure
-	@echo "timestamp" > kabc_dir.la.closure
-
-
 #>+ 3
 resourcedir.moc: $(srcdir)/resourcedir.h
 	$(MOC) $(srcdir)/resourcedir.h -o resourcedir.moc
@@ -955,15 +846,6 @@
 #>+ 2
 mocs: resourcedirconfig.moc
 
-#>+ 8
-libkabc_dir.la.closure: $(libkabc_dir_la_OBJECTS) $(libkabc_dir_la_DEPENDENCIES)
-	@echo "int main() {return 0;}" > libkabc_dir_la_closure.cpp
-	@$(LTCXXCOMPILE) -c libkabc_dir_la_closure.cpp
-	$(CXXLINK) libkabc_dir_la_closure.lo $(libkabc_dir_la_LDFLAGS) $(libkabc_dir_la_OBJECTS) $(libkabc_dir_la_LIBADD) $(LIBS)
-	@rm -f libkabc_dir_la_closure.* libkabc_dir.la.closure
-	@echo "timestamp" > libkabc_dir.la.closure
-
-
 #>+ 3
 clean-metasources:
 	-rm -f  resourcedir.moc resourcedirconfig.moc
@@ -971,10 +853,6 @@
 #>+ 2
 KDE_DIST=dir.desktop Makefile.in Makefile.am 
 
-#>+ 3
-clean-closures:
-	-rm -f  kabc_dir.la.closure libkabc_dir.la.closure
-
 #>+ 2
 docs-am:
 
--- kdelibs-3.5.7.orig/kabc/scripts/Makefile.in
+++ kdelibs-3.5.7/kabc/scripts/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,15 +14,11 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -59,8 +55,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -68,13 +62,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -88,8 +82,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -110,17 +102,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -189,7 +178,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -226,12 +214,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -276,87 +266,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -380,75 +326,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -456,16 +344,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -482,7 +369,7 @@
 all: docs-am  all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -520,9 +407,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 mostlyclean-libtool:
@@ -530,10 +417,6 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 tags: TAGS
 TAGS:
 
@@ -542,23 +425,21 @@
 
 
 distdir: $(DISTFILES)
-	$(mkdir_p) $(distdir)/$(srcdir)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -607,7 +488,7 @@
 
 distclean: distclean-am
 	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool
+distclean-am: clean-am distclean-generic
 
 dvi: dvi-am
 
@@ -621,12 +502,20 @@
 
 install-data-am:
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -645,17 +534,20 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am
+uninstall-am:
+
+.MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
 	distclean distclean-generic distclean-libtool distdir dvi \
 	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-exec install-exec-am \
-	install-info install-info-am install-man install-strip \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
 	installcheck installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
-	uninstall-info-am
+	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- kdelibs-3.5.7.orig/kabc/Makefile.in
+++ kdelibs-3.5.7/kabc/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -18,15 +18,11 @@
 
 
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -100,6 +96,13 @@
 	ldapconfigwidget.lo sortmode.lo addresseehelper_skel.lo
 @KDE_USE_FINAL_FALSE@libkabc_la_OBJECTS = $(libkabc_la_nofinal_OBJECTS)
 @KDE_USE_FINAL_TRUE@libkabc_la_OBJECTS = $(libkabc_la_final_OBJECTS)
+#>- libkabc_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(libkabc_la_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+libkabc_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(libkabc_la_LDFLAGS) $(LDFLAGS) -o $@
 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(bin_PROGRAMS)
 am_kab2kabc_OBJECTS = kab2kabc.$(OBJEXT)
@@ -107,7 +110,14 @@
 #>+ 1
 kab2kabc_OBJECTS = kab2kabc.$(OBJEXT)
 kab2kabc_DEPENDENCIES = libkabc.la ../kab/libkab.la
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+#>- kab2kabc_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(kab2kabc_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+kab2kabc_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(kab2kabc_LDFLAGS) $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -115,40 +125,46 @@
 #>+ 2
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
-#>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+#>+ 3
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
 CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 3
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(libkabc_la_SOURCES) $(kab2kabc_SOURCES)
 DIST_SOURCES = $(libkabc_la_SOURCES) $(kab2kabc_SOURCES)
 #>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 #>- 	html-recursive info-recursive install-data-recursive \
-#>- 	install-exec-recursive install-info-recursive \
-#>- 	install-recursive installcheck-recursive installdirs-recursive \
-#>- 	pdf-recursive ps-recursive uninstall-info-recursive \
-#>- 	uninstall-recursive
-#>+ 6
+#>- 	install-dvi-recursive install-exec-recursive \
+#>- 	install-html-recursive install-info-recursive \
+#>- 	install-pdf-recursive install-ps-recursive install-recursive \
+#>- 	installcheck-recursive installdirs-recursive pdf-recursive \
+#>- 	ps-recursive uninstall-recursive
+#>+ 7
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	html-recursive info-recursive install-data-recursive \
-	install-exec-recursive install-info-recursive \
-	install-recursive installcheck-recursive installdirs-recursive \
-	pdf-recursive ps-recursive uninstall-info-recursive \
-	uninstall-recursive nmcheck-recursive bcheck-recursive
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive nmcheck-recursive bcheck-recursive
 autostartDATA_INSTALL = $(INSTALL_DATA)
 managerDATA_INSTALL = $(INSTALL_DATA)
 mapDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(autostart_DATA) $(manager_DATA) $(map_DATA)
 kabcincludeHEADERS_INSTALL = $(INSTALL_HEADER)
 HEADERS = $(kabcinclude_HEADERS)
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
@@ -158,8 +174,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -167,13 +181,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -187,8 +201,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -209,17 +221,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -288,7 +297,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -325,12 +333,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -375,87 +385,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -479,75 +445,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -555,16 +463,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -580,9 +487,7 @@
 
 CLEANFILES = addressee.h addressee.cpp field.cpp
 lib_LTLIBRARIES = libkabc.la
-#>- libkabc_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 3:0:2 -no-undefined
-#>+ 1
-libkabc_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 3:0:2 -no-undefined $(KDE_NO_UNDEFINED)
+libkabc_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 3:0:2 -no-undefined
 libkabc_la_LIBADD = vcard/libvcard.la vcardparser/libvcards.la $(LIB_KIO) \
                     $(top_builddir)/kresources/libkresources.la
 
@@ -639,7 +544,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(srcdir)/../admin/Doxyfile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../admin/Doxyfile.am $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -677,13 +582,13 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
@@ -694,7 +599,7 @@
 
 uninstall-libLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
@@ -708,14 +613,11 @@
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
-#>- libkabc.la: $(libkabc_la_OBJECTS) $(libkabc_la_DEPENDENCIES) 
-#>+ 2
-@KDE_USE_CLOSURE_TRUE@libkabc.la: libkabc.la.closure $(libkabc_la_OBJECTS) $(libkabc_la_DEPENDENCIES) 
-@KDE_USE_CLOSURE_FALSE@libkabc.la: $(libkabc_la_OBJECTS) $(libkabc_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(libdir) $(libkabc_la_LDFLAGS) $(libkabc_la_OBJECTS) $(libkabc_la_LIBADD) $(LIBS)
+libkabc.la: $(libkabc_la_OBJECTS) $(libkabc_la_DEPENDENCIES) 
+	$(libkabc_la_LINK) -rpath $(libdir) $(libkabc_la_OBJECTS) $(libkabc_la_LIBADD) $(LIBS)
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
+	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
 	  if test -f $$p \
@@ -743,7 +645,7 @@
 	done
 kab2kabc$(EXEEXT): $(kab2kabc_OBJECTS) $(kab2kabc_DEPENDENCIES) 
 	@rm -f kab2kabc$(EXEEXT)
-	$(CXXLINK) $(kab2kabc_LDFLAGS) $(kab2kabc_OBJECTS) $(kab2kabc_LDADD) $(LIBS)
+	$(kab2kabc_LINK) $(kab2kabc_OBJECTS) $(kab2kabc_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -793,22 +695,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vcardtool.Plo@am__quote@
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -818,13 +720,9 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 install-autostartDATA: $(autostart_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(autostartdir)" || $(mkdir_p) "$(DESTDIR)$(autostartdir)"
+	test -z "$(autostartdir)" || $(MKDIR_P) "$(DESTDIR)$(autostartdir)"
 	@list='$(autostart_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -841,7 +739,7 @@
 	done
 install-managerDATA: $(manager_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(managerdir)" || $(mkdir_p) "$(DESTDIR)$(managerdir)"
+	test -z "$(managerdir)" || $(MKDIR_P) "$(DESTDIR)$(managerdir)"
 	@list='$(manager_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -858,7 +756,7 @@
 	done
 install-mapDATA: $(map_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(mapdir)" || $(mkdir_p) "$(DESTDIR)$(mapdir)"
+	test -z "$(mapdir)" || $(MKDIR_P) "$(DESTDIR)$(mapdir)"
 	@list='$(map_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -875,7 +773,7 @@
 	done
 install-kabcincludeHEADERS: $(kabcinclude_HEADERS)
 	@$(NORMAL_INSTALL)
-	test -z "$(kabcincludedir)" || $(mkdir_p) "$(DESTDIR)$(kabcincludedir)"
+	test -z "$(kabcincludedir)" || $(MKDIR_P) "$(DESTDIR)$(kabcincludedir)"
 	@list='$(kabcinclude_HEADERS)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -922,8 +820,7 @@
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
+$(RECURSIVE_CLEAN_TARGETS):
 	@failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
@@ -1024,23 +921,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	$(mkdir_p) $(distdir)/../admin
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -1054,7 +949,7 @@
 	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
-	    || $(mkdir_p) "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 	    || exit 1; \
 	    distdir=`$(am__cd) $(distdir) && pwd`; \
 	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
@@ -1062,6 +957,8 @@
 	      $(MAKE) $(AM_MAKEFLAGS) \
 	        top_distdir="$$top_distdir" \
 	        distdir="$$distdir/$$subdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -1074,7 +971,7 @@
 installdirs: installdirs-recursive
 installdirs-am:
 	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(autostartdir)" "$(DESTDIR)$(managerdir)" "$(DESTDIR)$(mapdir)" "$(DESTDIR)$(kabcincludedir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-recursive
 install-exec: install-exec-recursive
@@ -1108,14 +1005,14 @@
 #>- clean-am: clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \
 #>- 	clean-libtool mostlyclean-am
 #>+ 2
-clean-am: clean-metasources clean-idl clean-closures clean-bcheck clean-final  clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \
+clean-am: clean-metasources clean-idl clean-bcheck clean-final  clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \
 	clean-libtool mostlyclean-am
 
 distclean: distclean-recursive
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-recursive
 
@@ -1130,12 +1027,20 @@
 install-data-am: install-autostartDATA install-data-local \
 	install-kabcincludeHEADERS install-managerDATA install-mapDATA
 
+install-dvi: install-dvi-recursive
+
 install-exec-am: install-binPROGRAMS install-libLTLIBRARIES
 
+install-html: install-html-recursive
+
 install-info: install-info-recursive
 
 install-man:
 
+install-pdf: install-pdf-recursive
+
+install-ps: install-ps-recursive
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
@@ -1157,32 +1062,32 @@
 ps-am:
 
 uninstall-am: uninstall-autostartDATA uninstall-binPROGRAMS \
-	uninstall-info-am uninstall-kabcincludeHEADERS \
-	uninstall-libLTLIBRARIES uninstall-local uninstall-managerDATA \
-	uninstall-mapDATA
-
-uninstall-info: uninstall-info-recursive
-
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-	clean clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \
-	clean-libtool clean-recursive ctags ctags-recursive distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-recursive distclean-tags distdir dvi dvi-am html \
+	uninstall-kabcincludeHEADERS uninstall-libLTLIBRARIES \
+	uninstall-local uninstall-managerDATA uninstall-mapDATA
+
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+	install-strip
+
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+	all all-am check check-am clean clean-binPROGRAMS \
+	clean-generic clean-libLTLIBRARIES clean-libtool ctags \
+	ctags-recursive distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
 	html-am info info-am install install-am install-autostartDATA \
 	install-binPROGRAMS install-data install-data-am \
-	install-data-local install-exec install-exec-am install-info \
+	install-data-local install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
 	install-info-am install-kabcincludeHEADERS \
 	install-libLTLIBRARIES install-man install-managerDATA \
-	install-mapDATA install-strip installcheck installcheck-am \
+	install-mapDATA install-pdf install-pdf-am install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
 	installdirs installdirs-am maintainer-clean \
-	maintainer-clean-generic maintainer-clean-recursive \
-	mostlyclean mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 	tags tags-recursive uninstall uninstall-am \
 	uninstall-autostartDATA uninstall-binPROGRAMS \
-	uninstall-info-am uninstall-kabcincludeHEADERS \
-	uninstall-libLTLIBRARIES uninstall-local uninstall-managerDATA \
-	uninstall-mapDATA
+	uninstall-kabcincludeHEADERS uninstall-libLTLIBRARIES \
+	uninstall-local uninstall-managerDATA uninstall-mapDATA
 
 
 #>- field.cpp: addressee.h addressee.cpp
@@ -1303,15 +1208,6 @@
 addresseehelper_skel.cpp: addressee.h  addresseehelper.kidl
 	$(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub addresseehelper.kidl
 
-#>+ 8
-libkabc.la.closure: $(libkabc_la_OBJECTS) $(libkabc_la_DEPENDENCIES)
-	@echo "int main() {return 0;}" > libkabc_la_closure.cpp
-	@$(LTCXXCOMPILE) -c libkabc_la_closure.cpp
-	$(CXXLINK) libkabc_la_closure.lo $(libkabc_la_LDFLAGS) $(libkabc_la_OBJECTS) $(libkabc_la_LIBADD) $(LIBS)
-	@rm -f libkabc_la_closure.* libkabc.la.closure
-	@echo "timestamp" > libkabc.la.closure
-
-
 #>+ 3
 lock.moc: $(srcdir)/lock.h
 	$(MOC) $(srcdir)/lock.h -o lock.moc
@@ -1401,10 +1297,6 @@
 	-rm -f \
 	addresseehelper_skel.cpp addresseehelper_skel.h addresseehelper.kidl 
 
-#>+ 3
-clean-closures:
-	-rm -f  libkabc.la.closure
-
 #>+ 2
 docs-am:
 
--- kdelibs-3.5.7.orig/kabc/formats/Makefile.in
+++ kdelibs-3.5.7/kabc/formats/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -17,15 +17,11 @@
 
 
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -69,7 +65,14 @@
 #>- kabcformat_binary_la_OBJECTS = $(am_kabcformat_binary_la_OBJECTS)
 #>+ 1
 kabcformat_binary_la_OBJECTS = binaryformat.lo
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+#>- kabcformat_binary_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(kabcformat_binary_la_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+kabcformat_binary_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(kabcformat_binary_la_LDFLAGS) $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -77,19 +80,21 @@
 #>+ 2
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 #>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
 CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 3
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(kabcformat_binary_la_SOURCES)
 DIST_SOURCES = $(kabcformat_binary_la_SOURCES)
 linkDATA_INSTALL = $(INSTALL_DATA)
@@ -103,8 +108,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -112,13 +115,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -132,8 +135,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -154,17 +155,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -233,7 +231,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -270,12 +267,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -320,87 +319,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -424,75 +379,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -500,16 +397,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -518,11 +414,8 @@
 INCLUDES = -I$(top_srcdir)/kabc -I$(top_builddir)/kabc $(all_includes)
 kde_module_LTLIBRARIES = kabcformat_binary.la
 kabcformat_binary_la_SOURCES = binaryformat.cpp
-#>- kabcformat_binary_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) \
-#>-                                 -no-undefined
-#>+ 2
 kabcformat_binary_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) \
-                                -no-undefined $(KDE_NO_UNDEFINED)
+                                -no-undefined
 
 kabcformat_binary_la_LIBADD = $(top_builddir)/kabc/libkabc.la
 kabcformat_binary_la_COMPILE_FIRST = $(top_builddir)/kabc/addressee.h
@@ -541,7 +434,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -579,13 +472,13 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
+	test -z "$(kde_moduledir)" || $(MKDIR_P) "$(DESTDIR)$(kde_moduledir)"
 	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
@@ -596,7 +489,7 @@
 
 uninstall-kde_moduleLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
@@ -610,11 +503,8 @@
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
-#>- kabcformat_binary.la: $(kabcformat_binary_la_OBJECTS) $(kabcformat_binary_la_DEPENDENCIES) 
-#>+ 2
-@KDE_USE_CLOSURE_TRUE@kabcformat_binary.la: kabcformat_binary.la.closure $(kabcformat_binary_la_OBJECTS) $(kabcformat_binary_la_DEPENDENCIES) 
-@KDE_USE_CLOSURE_FALSE@kabcformat_binary.la: $(kabcformat_binary_la_OBJECTS) $(kabcformat_binary_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(kde_moduledir) $(kabcformat_binary_la_LDFLAGS) $(kabcformat_binary_la_OBJECTS) $(kabcformat_binary_la_LIBADD) $(LIBS)
+kabcformat_binary.la: $(kabcformat_binary_la_OBJECTS) $(kabcformat_binary_la_DEPENDENCIES) 
+	$(kabcformat_binary_la_LINK) -rpath $(kde_moduledir) $(kabcformat_binary_la_OBJECTS) $(kabcformat_binary_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -625,22 +515,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/binaryformat.Plo@am__quote@
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -650,13 +540,9 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 install-linkDATA: $(link_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(linkdir)" || $(mkdir_p) "$(DESTDIR)$(linkdir)"
+	test -z "$(linkdir)" || $(MKDIR_P) "$(DESTDIR)$(linkdir)"
 	@list='$(link_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -721,22 +607,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -752,7 +637,7 @@
 all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS)
 installdirs:
 	for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(linkdir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -785,14 +670,14 @@
 #>- clean-am: clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
 #>- 	mostlyclean-am
 #>+ 2
-clean-am: clean-closures clean-bcheck  clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
+clean-am: clean-bcheck  clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
 	mostlyclean-am
 
 distclean: distclean-am
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
@@ -808,14 +693,22 @@
 #>+ 1
 install-data-am:   install-linkDATA
 
+install-dvi: install-dvi-am
+
 #>- install-exec-am:
 #>+ 1
 install-exec-am:  install-kde_moduleLTLIBRARIES
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -836,22 +729,24 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-kde_moduleLTLIBRARIES \
-	uninstall-linkDATA
+uninstall-am: uninstall-kde_moduleLTLIBRARIES uninstall-linkDATA
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-kde_moduleLTLIBRARIES clean-libtool ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
 	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-exec \
-	install-exec-am install-info install-info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am \
 	install-kde_moduleLTLIBRARIES install-linkDATA install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
 	install-strip installcheck installcheck-am installdirs \
 	maintainer-clean maintainer-clean-generic mostlyclean \
 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
 	pdf pdf-am ps ps-am tags uninstall uninstall-am \
-	uninstall-info-am uninstall-kde_moduleLTLIBRARIES \
-	uninstall-linkDATA
+	uninstall-kde_moduleLTLIBRARIES uninstall-linkDATA
 
 
 messages: rc.cpp
@@ -860,22 +755,9 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
-#>+ 8
-kabcformat_binary.la.closure: $(kabcformat_binary_la_OBJECTS) $(kabcformat_binary_la_DEPENDENCIES)
-	@echo "int main() {return 0;}" > kabcformat_binary_la_closure.cpp
-	@$(LTCXXCOMPILE) -c kabcformat_binary_la_closure.cpp
-	$(CXXLINK) kabcformat_binary_la_closure.lo $(kabcformat_binary_la_LDFLAGS) $(kabcformat_binary_la_OBJECTS) $(kabcformat_binary_la_LIBADD) $(LIBS)
-	@rm -f kabcformat_binary_la_closure.* kabcformat_binary.la.closure
-	@echo "timestamp" > kabcformat_binary.la.closure
-
-
 #>+ 2
 KDE_DIST=binary.desktop Makefile.in Makefile.am 
 
-#>+ 3
-clean-closures:
-	-rm -f  kabcformat_binary.la.closure
-
 #>+ 2
 docs-am:
 
--- kdelibs-3.5.7.orig/kabc/vcardparser/Makefile.in
+++ kdelibs-3.5.7/kabc/vcardparser/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,15 +16,11 @@
 @SET_MAKE@
 
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -70,6 +66,13 @@
 #>+ 1
 testread_OBJECTS = testread.$(OBJEXT)
 testread_DEPENDENCIES = libvcards.la $(top_builddir)/kabc/libkabc.la
+#>- testread_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(testread_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+testread_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(testread_LDFLAGS) $(LDFLAGS) -o $@
 am_testread2_OBJECTS = testread2.$(OBJEXT) testutils.$(OBJEXT)
 #>- testread2_OBJECTS = $(am_testread2_OBJECTS)
 #>+ 4
@@ -78,12 +81,26 @@
 @KDE_USE_FINAL_FALSE@testread2_OBJECTS = $(testread2_nofinal_OBJECTS)
 @KDE_USE_FINAL_TRUE@testread2_OBJECTS = $(testread2_final_OBJECTS)
 testread2_DEPENDENCIES = libvcards.la $(top_builddir)/kabc/libkabc.la
+#>- testread2_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(testread2_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+testread2_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(testread2_LDFLAGS) $(LDFLAGS) -o $@
 am_testwrite_OBJECTS = testwrite.$(OBJEXT)
 #>- testwrite_OBJECTS = $(am_testwrite_OBJECTS)
 #>+ 1
 testwrite_OBJECTS = testwrite.$(OBJEXT)
 testwrite_DEPENDENCIES = libvcards.la $(top_builddir)/kabc/libkabc.la
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+#>- testwrite_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(testwrite_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+testwrite_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(testwrite_LDFLAGS) $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -91,19 +108,21 @@
 #>+ 2
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
-#>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+#>+ 3
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
 CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 3
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(libvcards_la_SOURCES) $(testread_SOURCES) \
 	$(testread2_SOURCES) $(testwrite_SOURCES)
 DIST_SOURCES = $(libvcards_la_SOURCES) $(testread_SOURCES) \
@@ -125,8 +144,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -134,13 +151,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -154,8 +171,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -176,17 +191,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -255,7 +267,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -292,12 +303,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -342,87 +355,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -446,75 +415,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -522,16 +433,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -558,7 +468,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -596,9 +506,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 clean-noinstLTLIBRARIES:
@@ -610,7 +520,7 @@
 	  rm -f "$${dir}/so_locations"; \
 	done
 libvcards.la: $(libvcards_la_OBJECTS) $(libvcards_la_DEPENDENCIES) 
-	$(CXXLINK)  $(libvcards_la_LDFLAGS) $(libvcards_la_OBJECTS) $(libvcards_la_LIBADD) $(LIBS)
+	$(CXXLINK)  $(libvcards_la_OBJECTS) $(libvcards_la_LIBADD) $(LIBS)
 
 clean-checkPROGRAMS:
 	@list='$(check_PROGRAMS)'; for p in $$list; do \
@@ -620,13 +530,13 @@
 	done
 testread$(EXEEXT): $(testread_OBJECTS) $(testread_DEPENDENCIES) 
 	@rm -f testread$(EXEEXT)
-	$(CXXLINK) $(testread_LDFLAGS) $(testread_OBJECTS) $(testread_LDADD) $(LIBS)
+	$(testread_LINK) $(testread_OBJECTS) $(testread_LDADD) $(LIBS)
 testread2$(EXEEXT): $(testread2_OBJECTS) $(testread2_DEPENDENCIES) 
 	@rm -f testread2$(EXEEXT)
-	$(CXXLINK) $(testread2_LDFLAGS) $(testread2_OBJECTS) $(testread2_LDADD) $(LIBS)
+	$(testread2_LINK) $(testread2_OBJECTS) $(testread2_LDADD) $(LIBS)
 testwrite$(EXEEXT): $(testwrite_OBJECTS) $(testwrite_DEPENDENCIES) 
 	@rm -f testwrite$(EXEEXT)
-	$(CXXLINK) $(testwrite_LDFLAGS) $(testwrite_OBJECTS) $(testwrite_LDADD) $(LIBS)
+	$(testwrite_LINK) $(testwrite_OBJECTS) $(testwrite_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -643,22 +553,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vcardparser.Plo@am__quote@
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -668,13 +578,9 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 install-vcardsincludeHEADERS: $(vcardsinclude_HEADERS)
 	@$(NORMAL_INSTALL)
-	test -z "$(vcardsincludedir)" || $(mkdir_p) "$(DESTDIR)$(vcardsincludedir)"
+	test -z "$(vcardsincludedir)" || $(MKDIR_P) "$(DESTDIR)$(vcardsincludedir)"
 	@list='$(vcardsinclude_HEADERS)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -739,22 +645,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -772,7 +677,7 @@
 all-am: Makefile $(LTLIBRARIES) $(HEADERS)
 installdirs:
 	for dir in "$(DESTDIR)$(vcardsincludedir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -812,7 +717,7 @@
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
@@ -826,12 +731,20 @@
 
 install-data-am: install-vcardsincludeHEADERS
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -852,20 +765,24 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-vcardsincludeHEADERS
+uninstall-am: uninstall-vcardsincludeHEADERS
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am check-local clean \
 	clean-checkPROGRAMS clean-generic clean-libtool \
 	clean-noinstLTLIBRARIES ctags distclean distclean-compile \
 	distclean-generic distclean-libtool distclean-tags distdir dvi \
 	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-exec install-exec-am \
-	install-info install-info-am install-man install-strip \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
 	install-vcardsincludeHEADERS installcheck installcheck-am \
 	installdirs maintainer-clean maintainer-clean-generic \
 	mostlyclean mostlyclean-compile mostlyclean-generic \
 	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
-	uninstall-am uninstall-info-am uninstall-vcardsincludeHEADERS
+	uninstall-am uninstall-vcardsincludeHEADERS
 
 
 check-local: testread
--- kdelibs-3.5.7.orig/kabc/vcard/Makefile.in
+++ kdelibs-3.5.7/kabc/vcard/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -15,15 +15,11 @@
 
 @SET_MAKE@
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -68,17 +64,38 @@
 #>- libvcard_la_OBJECTS = $(am_libvcard_la_OBJECTS)
 #>+ 1
 libvcard_la_OBJECTS = vCard-all.lo
+#>- libvcard_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(libvcard_la_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+libvcard_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(libvcard_la_LDFLAGS) $(LDFLAGS) -o $@
 am_testread_OBJECTS = testread.$(OBJEXT)
 #>- testread_OBJECTS = $(am_testread_OBJECTS)
 #>+ 1
 testread_OBJECTS = testread.$(OBJEXT)
 testread_DEPENDENCIES = libvcard.la
+#>- testread_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(testread_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+testread_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(testread_LDFLAGS) $(LDFLAGS) -o $@
 am_testwrite_OBJECTS = testwrite.$(OBJEXT)
 #>- testwrite_OBJECTS = $(am_testwrite_OBJECTS)
 #>+ 1
 testwrite_OBJECTS = testwrite.$(OBJEXT)
 testwrite_DEPENDENCIES = libvcard.la
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+#>- testwrite_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(testwrite_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+testwrite_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(testwrite_LDFLAGS) $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -86,19 +103,21 @@
 #>+ 2
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
-#>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+#>+ 3
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
 CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 3
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(libvcard_la_SOURCES) $(testread_SOURCES) \
 	$(testwrite_SOURCES)
 DIST_SOURCES = $(libvcard_la_SOURCES) $(testread_SOURCES) \
@@ -111,8 +130,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -120,13 +137,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -140,8 +157,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -162,17 +177,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -241,7 +253,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -278,12 +289,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -328,87 +341,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -432,75 +401,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -508,16 +419,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -546,7 +456,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -584,13 +494,13 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
@@ -601,7 +511,7 @@
 
 uninstall-libLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
@@ -616,7 +526,7 @@
 	  rm -f "$${dir}/so_locations"; \
 	done
 libvcard.la: $(libvcard_la_OBJECTS) $(libvcard_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(libdir) $(libvcard_la_LDFLAGS) $(libvcard_la_OBJECTS) $(libvcard_la_LIBADD) $(LIBS)
+	$(libvcard_la_LINK) -rpath $(libdir) $(libvcard_la_OBJECTS) $(libvcard_la_LIBADD) $(LIBS)
 
 clean-checkPROGRAMS:
 	@list='$(check_PROGRAMS)'; for p in $$list; do \
@@ -626,10 +536,10 @@
 	done
 testread$(EXEEXT): $(testread_OBJECTS) $(testread_DEPENDENCIES) 
 	@rm -f testread$(EXEEXT)
-	$(CXXLINK) $(testread_LDFLAGS) $(testread_OBJECTS) $(testread_LDADD) $(LIBS)
+	$(testread_LINK) $(testread_OBJECTS) $(testread_LDADD) $(LIBS)
 testwrite$(EXEEXT): $(testwrite_OBJECTS) $(testwrite_DEPENDENCIES) 
 	@rm -f testwrite$(EXEEXT)
-	$(CXXLINK) $(testwrite_LDFLAGS) $(testwrite_OBJECTS) $(testwrite_LDADD) $(LIBS)
+	$(testwrite_LINK) $(testwrite_OBJECTS) $(testwrite_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -642,22 +552,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vCard-all.Plo@am__quote@
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -668,10 +578,6 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -721,22 +627,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -753,7 +658,7 @@
 all-am: Makefile $(LTLIBRARIES)
 installdirs:
 	for dir in "$(DESTDIR)$(libdir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -793,7 +698,7 @@
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
@@ -807,12 +712,20 @@
 
 install-data-am:
 
+install-dvi: install-dvi-am
+
 install-exec-am: install-libLTLIBRARIES
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -833,20 +746,24 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES
+uninstall-am: uninstall-libLTLIBRARIES
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean \
 	clean-checkPROGRAMS clean-generic clean-libLTLIBRARIES \
 	clean-libtool ctags distclean distclean-compile \
 	distclean-generic distclean-libtool distclean-tags distdir dvi \
 	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-exec install-exec-am \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
 	install-info install-info-am install-libLTLIBRARIES \
-	install-man install-strip installcheck installcheck-am \
+	install-man install-pdf install-pdf-am install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
 	installdirs maintainer-clean maintainer-clean-generic \
 	mostlyclean mostlyclean-compile mostlyclean-generic \
 	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
-	uninstall-am uninstall-info-am uninstall-libLTLIBRARIES
+	uninstall-am uninstall-libLTLIBRARIES
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- kdelibs-3.5.7.orig/kabc/addressee.h
+++ kdelibs-3.5.7/kabc/addressee.h
@@ -0,0 +1,824 @@
+/*** Warning! This file has been generated by the script makeaddressee ***/
+/*
+    This file is part of libkabc.
+    Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Library General Public
+    License as published by the Free Software Foundation; either
+    version 2 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Library General Public License for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to
+    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+    Boston, MA 02110-1301, USA.
+*/
+
+#ifndef KABC_ADDRESSEE_H
+#define KABC_ADDRESSEE_H
+
+#include <qdatetime.h>
+#include <qstring.h>
+#include <qstringlist.h>
+#include <qvaluelist.h>
+
+#include <ksharedptr.h>
+#include <kurl.h>
+
+#include "address.h"
+#include "agent.h"
+#include "geo.h"
+#include "key.h"
+#include "phonenumber.h"
+#include "picture.h"
+#include "secrecy.h"
+#include "sound.h"
+#include "timezone.h"
+
+namespace KABC {
+
+class Resource;
+class Field;
+class SortMode;
+
+/**
+  @short address book entry
+
+  This class represents an entry in the address book.
+
+  The data of this class is implicitly shared. You can pass this class by value.
+
+  If you need the name of a field for presenting it to the user you should use
+  the functions ending in Label(). They return a translated string which can be
+  used as label for the corresponding field.
+
+  About the name fields:
+
+  givenName() is the first name and familyName() the last name. In some
+  countries the family name comes first, that's the reason for the
+  naming. formattedName() is the full name with the correct formatting.
+  It is used as an override, when the correct formatting can't be generated
+  from the other name fields automatically.
+
+  realName() returns a fully formatted name(). It uses formattedName, if set,
+  otherwise it constucts the name from the name fields. As fallback, if
+  nothing else is set it uses name().
+
+  name() is the NAME type of RFC2426. It can be used as internal name for the
+  data enty, but shouldn't be used for displaying the data to the user.
+ */
+class KABC_EXPORT Addressee
+{
+  friend KABC_EXPORT QDataStream &operator<<( QDataStream &, const Addressee & );
+  friend KABC_EXPORT QDataStream &operator>>( QDataStream &, Addressee & );
+
+  public:
+    typedef QValueList<Addressee> List;
+    typedef QMap<QString, Addressee> Map;
+
+    /**
+      Construct an empty address book entry.
+     */
+    Addressee();
+    ~Addressee();
+
+    Addressee( const Addressee & );
+    Addressee &operator=( const Addressee & );
+
+    bool operator==( const Addressee & ) const;
+    bool operator!=( const Addressee & ) const;
+
+    /**
+      Return, if the address book entry is empty.
+     */
+    bool isEmpty() const;
+
+    /**
+      Set unique identifier.
+     */
+    void setUid( const QString &uid );
+    /**
+      Return unique identifier.
+     */
+    QString uid() const;
+    /**
+      Return translated label for uid field.
+     */
+    static QString uidLabel();
+
+    /**
+      Set name.
+     */
+    void setName( const QString &name );
+    /**
+      Return name.
+     */
+    QString name() const;
+    /**
+      Return translated label for name field.
+     */
+    static QString nameLabel();
+
+    /**
+      Set formatted name.
+     */
+    void setFormattedName( const QString &formattedName );
+    /**
+      Return formatted name.
+     */
+    QString formattedName() const;
+    /**
+      Return translated label for formattedName field.
+     */
+    static QString formattedNameLabel();
+
+    /**
+      Set family name.
+     */
+    void setFamilyName( const QString &familyName );
+    /**
+      Return family name.
+     */
+    QString familyName() const;
+    /**
+      Return translated label for familyName field.
+     */
+    static QString familyNameLabel();
+
+    /**
+      Set given name.
+     */
+    void setGivenName( const QString &givenName );
+    /**
+      Return given name.
+     */
+    QString givenName() const;
+    /**
+      Return translated label for givenName field.
+     */
+    static QString givenNameLabel();
+
+    /**
+      Set additional names.
+     */
+    void setAdditionalName( const QString &additionalName );
+    /**
+      Return additional names.
+     */
+    QString additionalName() const;
+    /**
+      Return translated label for additionalName field.
+     */
+    static QString additionalNameLabel();
+
+    /**
+      Set honorific prefixes.
+     */
+    void setPrefix( const QString &prefix );
+    /**
+      Return honorific prefixes.
+     */
+    QString prefix() const;
+    /**
+      Return translated label for prefix field.
+     */
+    static QString prefixLabel();
+
+    /**
+      Set honorific suffixes.
+     */
+    void setSuffix( const QString &suffix );
+    /**
+      Return honorific suffixes.
+     */
+    QString suffix() const;
+    /**
+      Return translated label for suffix field.
+     */
+    static QString suffixLabel();
+
+    /**
+      Set nick name.
+     */
+    void setNickName( const QString &nickName );
+    /**
+      Return nick name.
+     */
+    QString nickName() const;
+    /**
+      Return translated label for nickName field.
+     */
+    static QString nickNameLabel();
+
+    /**
+      Set birthday.
+     */
+    void setBirthday( const QDateTime &birthday );
+    /**
+      Return birthday.
+     */
+    QDateTime birthday() const;
+    /**
+      Return translated label for birthday field.
+     */
+    static QString birthdayLabel();
+
+    /**
+      Return translated label for homeAddressStreet field.
+     */
+    static QString homeAddressStreetLabel();
+
+    /**
+      Return translated label for homeAddressLocality field.
+     */
+    static QString homeAddressLocalityLabel();
+
+    /**
+      Return translated label for homeAddressRegion field.
+     */
+    static QString homeAddressRegionLabel();
+
+    /**
+      Return translated label for homeAddressPostalCode field.
+     */
+    static QString homeAddressPostalCodeLabel();
+
+    /**
+      Return translated label for homeAddressCountry field.
+     */
+    static QString homeAddressCountryLabel();
+
+    /**
+      Return translated label for homeAddressLabel field.
+     */
+    static QString homeAddressLabelLabel();
+
+    /**
+      Return translated label for businessAddressStreet field.
+     */
+    static QString businessAddressStreetLabel();
+
+    /**
+      Return translated label for businessAddressLocality field.
+     */
+    static QString businessAddressLocalityLabel();
+
+    /**
+      Return translated label for businessAddressRegion field.
+     */
+    static QString businessAddressRegionLabel();
+
+    /**
+      Return translated label for businessAddressPostalCode field.
+     */
+    static QString businessAddressPostalCodeLabel();
+
+    /**
+      Return translated label for businessAddressCountry field.
+     */
+    static QString businessAddressCountryLabel();
+
+    /**
+      Return translated label for businessAddressLabel field.
+     */
+    static QString businessAddressLabelLabel();
+
+    /**
+      Return translated label for homePhone field.
+     */
+    static QString homePhoneLabel();
+
+    /**
+      Return translated label for businessPhone field.
+     */
+    static QString businessPhoneLabel();
+
+    /**
+      Return translated label for mobilePhone field.
+     */
+    static QString mobilePhoneLabel();
+
+    /**
+      Return translated label for homeFax field.
+     */
+    static QString homeFaxLabel();
+
+    /**
+      Return translated label for businessFax field.
+     */
+    static QString businessFaxLabel();
+
+    /**
+      Return translated label for carPhone field.
+     */
+    static QString carPhoneLabel();
+
+    /**
+      Return translated label for isdn field.
+     */
+    static QString isdnLabel();
+
+    /**
+      Return translated label for pager field.
+     */
+    static QString pagerLabel();
+
+    /**
+      Return translated label for email field.
+     */
+    static QString emailLabel();
+
+    /**
+      Set mail client.
+     */
+    void setMailer( const QString &mailer );
+    /**
+      Return mail client.
+     */
+    QString mailer() const;
+    /**
+      Return translated label for mailer field.
+     */
+    static QString mailerLabel();
+
+    /**
+      Set time zone.
+     */
+    void setTimeZone( const TimeZone &timeZone );
+    /**
+      Return time zone.
+     */
+    TimeZone timeZone() const;
+    /**
+      Return translated label for timeZone field.
+     */
+    static QString timeZoneLabel();
+
+    /**
+      Set geographic position.
+     */
+    void setGeo( const Geo &geo );
+    /**
+      Return geographic position.
+     */
+    Geo geo() const;
+    /**
+      Return translated label for geo field.
+     */
+    static QString geoLabel();
+
+    /**
+      Set title.
+     */
+    void setTitle( const QString &title );
+    /**
+      Return title.
+     */
+    QString title() const;
+    /**
+      Return translated label for title field.
+     */
+    static QString titleLabel();
+
+    /**
+      Set role.
+     */
+    void setRole( const QString &role );
+    /**
+      Return role.
+     */
+    QString role() const;
+    /**
+      Return translated label for role field.
+     */
+    static QString roleLabel();
+
+    /**
+      Set organization.
+     */
+    void setOrganization( const QString &organization );
+    /**
+      Return organization.
+     */
+    QString organization() const;
+    /**
+      Return translated label for organization field.
+     */
+    static QString organizationLabel();
+
+    /**
+      Set note.
+     */
+    void setNote( const QString &note );
+    /**
+      Return note.
+     */
+    QString note() const;
+    /**
+      Return translated label for note field.
+     */
+    static QString noteLabel();
+
+    /**
+      Set product identifier.
+     */
+    void setProductId( const QString &productId );
+    /**
+      Return product identifier.
+     */
+    QString productId() const;
+    /**
+      Return translated label for productId field.
+     */
+    static QString productIdLabel();
+
+    /**
+      Set revision date.
+     */
+    void setRevision( const QDateTime &revision );
+    /**
+      Return revision date.
+     */
+    QDateTime revision() const;
+    /**
+      Return translated label for revision field.
+     */
+    static QString revisionLabel();
+
+    /**
+      Set sort string.
+     */
+    void setSortString( const QString &sortString );
+    /**
+      Return sort string.
+     */
+    QString sortString() const;
+    /**
+      Return translated label for sortString field.
+     */
+    static QString sortStringLabel();
+
+    /**
+      Set homepage.
+     */
+    void setUrl( const KURL &url );
+    /**
+      Return homepage.
+     */
+    KURL url() const;
+    /**
+      Return translated label for url field.
+     */
+    static QString urlLabel();
+
+    /**
+      Set security class.
+     */
+    void setSecrecy( const Secrecy &secrecy );
+    /**
+      Return security class.
+     */
+    Secrecy secrecy() const;
+    /**
+      Return translated label for secrecy field.
+     */
+    static QString secrecyLabel();
+
+    /**
+      Set logo.
+     */
+    void setLogo( const Picture &logo );
+    /**
+      Return logo.
+     */
+    Picture logo() const;
+    /**
+      Return translated label for logo field.
+     */
+    static QString logoLabel();
+
+    /**
+      Set photo.
+     */
+    void setPhoto( const Picture &photo );
+    /**
+      Return photo.
+     */
+    Picture photo() const;
+    /**
+      Return translated label for photo field.
+     */
+    static QString photoLabel();
+
+    /**
+      Set sound.
+     */
+    void setSound( const Sound &sound );
+    /**
+      Return sound.
+     */
+    Sound sound() const;
+    /**
+      Return translated label for sound field.
+     */
+    static QString soundLabel();
+
+    /**
+      Set agent.
+     */
+    void setAgent( const Agent &agent );
+    /**
+      Return agent.
+     */
+    Agent agent() const;
+    /**
+      Return translated label for agent field.
+     */
+    static QString agentLabel();
+
+    /**
+      Set name fields by parsing the given string and trying to associate the
+      parts of the string with according fields. This function should probably
+      be a bit more clever.
+     */
+    void setNameFromString( const QString & );
+
+    /**
+      Return the name of the addressee. This is calculated from all the name
+      fields.
+     */
+    QString realName() const;
+
+    /**
+      Return the name that consists of all name parts.
+     */
+    QString assembledName() const;
+
+    /**
+      Return email address including real name.
+
+      @param email Email address to be used to construct the full email string.
+                   If this is QString::null the preferred email address is used.
+     */
+    QString fullEmail( const QString &email=QString::null ) const;
+
+    /**
+      Insert an email address. If the email address already exists in this
+      addressee it is not duplicated.
+
+      @param email Email address
+      @param preferred Set to true, if this is the preferred email address of
+                       the addressee.
+     */
+    void insertEmail( const QString &email, bool preferred=false );
+
+    /**
+      Remove email address. If the email address doesn't exist, nothing happens.
+     */
+    void removeEmail( const QString &email );
+
+    /**
+      Return preferred email address. This is the first email address or the
+      last one added with insertEmail() with a set preferred parameter.
+     */
+    QString preferredEmail() const;
+
+    /**
+      Return list of all email addresses.
+     */
+    QStringList emails() const;
+
+    /**
+       Set the emails to @p list.
+       The first email address gets the preferred one!
+       @param list The list of email addresses.
+     */
+    void setEmails( const QStringList& list);
+
+    /**
+      Insert a phone number. If a phone number with the same id already exists
+      in this addressee it is not duplicated.
+     */
+    void insertPhoneNumber( const PhoneNumber &phoneNumber );
+
+    /**
+      Remove phone number. If no phone number with the given id exists for this
+      addresse nothing happens.
+     */
+    void removePhoneNumber( const PhoneNumber &phoneNumber );
+
+    /**
+      Return phone number, which matches the given type.
+     */
+    PhoneNumber phoneNumber( int type ) const;
+
+    /**
+      Return list of all phone numbers.
+     */
+    PhoneNumber::List phoneNumbers() const;
+
+    /**
+      Return list of phone numbers with a special type.
+     */
+    PhoneNumber::List phoneNumbers( int type ) const;
+
+    /**
+      Return phone number with the given id.
+     */
+    PhoneNumber findPhoneNumber( const QString &id ) const;
+
+    /**
+      Insert a key. If a key with the same id already exists
+      in this addressee it is not duplicated.
+     */
+    void insertKey( const Key &key );
+
+    /**
+      Remove a key. If no key with the given id exists for this
+      addresse nothing happens.
+     */
+    void removeKey( const Key &key );
+
+    /**
+      Return key, which matches the given type.
+      If @p type == Key::Custom you can specify a string
+      that should match. If you leave the string empty, the first
+      key with a custom value is returned.
+     */
+    Key key( int type, QString customTypeString = QString::null ) const;
+
+    /**
+      Return list of all keys.
+     */
+    Key::List keys() const;
+
+    /**
+       Set the list of keys
+       @param keys The keys to be set.
+     */
+    void setKeys( const Key::List& keys);
+
+    /**
+      Return list of keys with a special type.
+      If @p type == Key::Custom you can specify a string
+      that should match. If you leave the string empty, all custom
+      keys will be returned.
+     */
+    Key::List keys( int type, QString customTypeString = QString::null  ) const;
+
+    /**
+      Return key with the given id.
+     */
+    Key findKey( const QString &id ) const;
+
+    /**
+      Insert an address. If an address with the same id already exists
+      in this addressee it is not duplicated.
+     */
+    void insertAddress( const Address &address );
+
+    /**
+      Remove address. If no address with the given id exists for this
+      addresse nothing happens.
+     */
+    void removeAddress( const Address &address );
+
+    /**
+      Return address, which matches the given type.
+     */
+    Address address( int type ) const;
+
+    /**
+      Return list of all addresses.
+     */
+    Address::List addresses() const;
+
+    /**
+      Return list of addresses with a special type.
+     */
+    Address::List addresses( int type ) const;
+
+    /**
+      Return address with the given id.
+     */
+    Address findAddress( const QString &id ) const;
+
+    /**
+      Insert category. If the category already exists it is not duplicated.
+     */
+    void insertCategory( const QString & );
+
+    /**
+      Remove category.
+     */
+    void removeCategory( const QString & );
+
+    /**
+      Return, if addressee has the given category.
+     */
+    bool hasCategory( const QString & ) const;
+
+    /**
+      Set categories to given value.
+     */
+    void setCategories( const QStringList & );
+
+    /**
+      Return list of all set categories.
+     */
+    QStringList categories() const;
+
+    /**
+      Insert custom entry. The entry is identified by the name of the inserting
+      application and a unique name. If an entry with the given app and name
+      already exists its value is replaced with the new given value.
+
+      An empty value isn't allowed (nothing happens if this is called with
+      any of the three arguments being empty)
+     */
+    void insertCustom( const QString &app, const QString &name,
+                       const QString &value );
+
+    /**
+      Remove custom entry.
+     */
+    void removeCustom( const QString &app, const QString &name );
+
+    /**
+      Return value of custom entry, identified by app and entry name.
+     */
+    QString custom( const QString &app, const QString &name ) const;
+
+    /**
+      Set all custom entries.
+     */
+    void setCustoms( const QStringList & );
+
+    /**
+      Return list of all custom entries.
+     */
+    QStringList customs() const;
+
+    /**
+      Parse full email address. The result is given back in fullName and email.
+     */
+    static void parseEmailAddress( const QString &rawEmail, QString &fullName,
+                                   QString &email );
+
+    /**
+      Debug output.
+     */
+    void dump() const;
+
+    /**
+      Returns string representation of the addressee.
+     */
+    QString asString() const;
+
+    /**
+      Set resource where the addressee is from.
+     */
+    void setResource( Resource *resource );
+
+    /**
+      Return pointer to resource.
+     */
+    Resource *resource() const;
+
+    /**
+      Mark addressee as changed.
+     */
+    void setChanged( bool value );
+
+    /**
+      Return whether the addressee is changed.
+     */
+    bool changed() const;
+
+    static void setSortMode( KABC::SortMode *mode );
+
+    bool operator< ( const Addressee &addr );
+
+  private:
+    void detach();
+
+    struct AddresseeData;
+    mutable KSharedPtr<AddresseeData> mData;
+
+  private:
+    static AddresseeData* shared_null;
+    static AddresseeData* makeSharedNull();
+    static KABC::SortMode *mSortMode;
+};
+
+KABC_EXPORT QDataStream &operator<<( QDataStream &, const Addressee & );
+KABC_EXPORT QDataStream &operator>>( QDataStream &, Addressee & );
+
+}
+
+#endif
--- kdelibs-3.5.7.orig/kabc/addressee.cpp
+++ kdelibs-3.5.7/kabc/addressee.cpp
@@ -0,0 +1,1909 @@
+/*** Warning! This file has been generated by the script makeaddressee ***/
+/*
+    This file is part of libkabc.
+    Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org>
+    Copyright (c) 2003 Carsten Pfeiffer <pfeiffer@kde.org>
+    Copyright (c) 2005 Ingo Kloecker <kloecker@kde.org>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Library General Public
+    License as published by the Free Software Foundation; either
+    version 2 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Library General Public License for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to
+    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+    Boston, MA 02110-1301, USA.
+*/
+
+#include <qregexp.h>
+
+#include <ksharedptr.h>
+#include <kdebug.h>
+#include <kapplication.h>
+#include <klocale.h>
+
+#include "addresseehelper.h"
+#include "field.h"
+#include "resource.h"
+#include "sortmode.h"
+
+#include "addressee.h"
+
+using namespace KABC;
+
+static bool matchBinaryPattern( int value, int pattern );
+
+template <class L>
+static bool listEquals( const QValueList<L>&, const QValueList<L>& );
+static bool emailsEquals( const QStringList&, const QStringList& );
+
+KABC::SortMode *Addressee::mSortMode = 0;
+
+struct Addressee::AddresseeData : public KShared
+{
+  QString uid;
+  QString name;
+  QString formattedName;
+  QString familyName;
+  QString givenName;
+  QString additionalName;
+  QString prefix;
+  QString suffix;
+  QString nickName;
+  QDateTime birthday;
+  QString mailer;
+  TimeZone timeZone;
+  Geo geo;
+  QString title;
+  QString role;
+  QString organization;
+  QString note;
+  QString productId;
+  QDateTime revision;
+  QString sortString;
+  KURL url;
+  Secrecy secrecy;
+  Picture logo;
+  Picture photo;
+  Sound sound;
+  Agent agent;
+
+  PhoneNumber::List phoneNumbers;
+  Address::List addresses;
+  Key::List keys;
+  QStringList emails;
+  QStringList categories;
+  QStringList custom;
+
+  Resource *resource;
+
+  bool empty    :1;
+  bool changed  :1;
+};
+
+Addressee::AddresseeData* Addressee::shared_null = 0;
+
+Addressee::AddresseeData* Addressee::makeSharedNull()
+{
+  Addressee::shared_null = new AddresseeData;
+  shared_null->_KShared_ref(); //just in case (we should add KSD)
+  shared_null->empty = true;
+  shared_null->changed = false;
+  shared_null->resource = 0;
+  return shared_null;
+}
+
+Addressee::Addressee()
+{
+  mData = shared_null ? shared_null : makeSharedNull();
+}
+
+Addressee::~Addressee()
+{
+}
+
+Addressee::Addressee( const Addressee &a )
+{
+  mData = a.mData;
+}
+
+Addressee &Addressee::operator=( const Addressee &a )
+{
+  if ( this == &a )
+    return (*this);
+
+  mData = a.mData;
+  return (*this);
+}
+
+void Addressee::detach()
+{
+  if ( mData.data() == shared_null ) {
+    mData = new AddresseeData;
+    mData->empty = true;
+    mData->changed = false;
+    mData->resource = 0;
+    mData->uid = KApplication::randomString( 10 );
+    return;
+  } else if ( mData.count() == 1 ) return;
+
+  AddresseeData data = *mData;
+  mData = new AddresseeData( data );
+}
+
+bool Addressee::operator==( const Addressee &a ) const
+{
+  if ( uid() != a.uid() ) {
+    kdDebug(5700) << "uid differs" << endl;
+    return false;
+  }
+  if ( mData->name != a.mData->name &&
+     !( mData->name.isEmpty() && a.mData->name.isEmpty() ) ) {
+    kdDebug(5700) << "name differs" << endl;
+    return false;
+  }
+  if ( mData->formattedName != a.mData->formattedName &&
+     !( mData->formattedName.isEmpty() && a.mData->formattedName.isEmpty() ) ) {
+    kdDebug(5700) << "formattedName differs" << endl;
+    return false;
+  }
+  if ( mData->familyName != a.mData->familyName &&
+     !( mData->familyName.isEmpty() && a.mData->familyName.isEmpty() ) ) {
+    kdDebug(5700) << "familyName differs" << endl;
+    return false;
+  }
+  if ( mData->givenName != a.mData->givenName &&
+     !( mData->givenName.isEmpty() && a.mData->givenName.isEmpty() ) ) {
+    kdDebug(5700) << "givenName differs" << endl;
+    return false;
+  }
+  if ( mData->additionalName != a.mData->additionalName &&
+     !( mData->additionalName.isEmpty() && a.mData->additionalName.isEmpty() ) ) {
+    kdDebug(5700) << "additionalName differs" << endl;
+    return false;
+  }
+  if ( mData->prefix != a.mData->prefix &&
+     !( mData->prefix.isEmpty() && a.mData->prefix.isEmpty() ) ) {
+    kdDebug(5700) << "prefix differs" << endl;
+    return false;
+  }
+  if ( mData->suffix != a.mData->suffix &&
+     !( mData->suffix.isEmpty() && a.mData->suffix.isEmpty() ) ) {
+    kdDebug(5700) << "suffix differs" << endl;
+    return false;
+  }
+  if ( mData->nickName != a.mData->nickName &&
+     !( mData->nickName.isEmpty() && a.mData->nickName.isEmpty() ) ) {
+    kdDebug(5700) << "nickName differs" << endl;
+    return false;
+  }
+  if ( mData->birthday != a.mData->birthday ) {
+    kdDebug(5700) << "birthday differs" << endl;
+    return false;
+  }
+  if ( mData->mailer != a.mData->mailer &&
+     !( mData->mailer.isEmpty() && a.mData->mailer.isEmpty() ) ) {
+    kdDebug(5700) << "mailer differs" << endl;
+    return false;
+  }
+  if ( mData->timeZone != a.mData->timeZone ) {
+    kdDebug(5700) << "timeZone differs" << endl;
+    return false;
+  }
+  if ( mData->geo != a.mData->geo ) {
+    kdDebug(5700) << "geo differs" << endl;
+    return false;
+  }
+  if ( mData->title != a.mData->title &&
+     !( mData->title.isEmpty() && a.mData->title.isEmpty() ) ) {
+    kdDebug(5700) << "title differs" << endl;
+    return false;
+  }
+  if ( mData->role != a.mData->role &&
+     !( mData->role.isEmpty() && a.mData->role.isEmpty() ) ) {
+    kdDebug(5700) << "role differs" << endl;
+    return false;
+  }
+  if ( mData->organization != a.mData->organization &&
+     !( mData->organization.isEmpty() && a.mData->organization.isEmpty() ) ) {
+    kdDebug(5700) << "organization differs" << endl;
+    return false;
+  }
+  if ( mData->note != a.mData->note &&
+     !( mData->note.isEmpty() && a.mData->note.isEmpty() ) ) {
+    kdDebug(5700) << "note differs" << endl;
+    return false;
+  }
+  if ( mData->productId != a.mData->productId &&
+     !( mData->productId.isEmpty() && a.mData->productId.isEmpty() ) ) {
+    kdDebug(5700) << "productId differs" << endl;
+    return false;
+  }
+  if ( mData->sortString != a.mData->sortString &&
+     !( mData->sortString.isEmpty() && a.mData->sortString.isEmpty() ) ) {
+    kdDebug(5700) << "sortString differs" << endl;
+    return false;
+  }
+  if ( mData->secrecy != a.mData->secrecy ) {
+    kdDebug(5700) << "secrecy differs" << endl;
+    return false;
+  }
+  if ( mData->logo != a.mData->logo ) {
+    kdDebug(5700) << "logo differs" << endl;
+    return false;
+  }
+  if ( mData->photo != a.mData->photo ) {
+    kdDebug(5700) << "photo differs" << endl;
+    return false;
+  }
+  if ( mData->sound != a.mData->sound ) {
+    kdDebug(5700) << "sound differs" << endl;
+    return false;
+  }
+  if ( mData->agent != a.mData->agent ) {
+    kdDebug(5700) << "agent differs" << endl;
+    return false;
+  }
+  if ( ( mData->url.isValid() || a.mData->url.isValid() ) &&
+       ( mData->url != a.mData->url ) ) {
+    kdDebug(5700) << "url differs" << endl;
+    return false;
+  }
+  if ( !listEquals( mData->phoneNumbers, a.mData->phoneNumbers ) ) {
+    kdDebug(5700) << "phoneNumbers differs" << endl;
+    return false;
+  }
+  if ( !listEquals( mData->addresses, a.mData->addresses ) ) {
+    kdDebug(5700) << "addresses differs" << endl;
+    return false;
+  }
+  if ( !listEquals( mData->keys, a.mData->keys ) ) {
+    kdDebug(5700) << "keys differs" << endl;
+    return false;
+  }
+  if ( !emailsEquals( mData->emails, a.mData->emails ) ) {
+    kdDebug(5700) << "emails differs" << endl;
+    return false;
+  }
+  if ( !listEquals( mData->categories, a.mData->categories ) ) {
+    kdDebug(5700) << "categories differs" << endl;
+    return false;
+  }
+  if ( !listEquals( mData->custom, a.mData->custom ) ) {
+    kdDebug(5700) << "custom differs" << endl;
+    return false;
+  }
+
+  return true;
+}
+
+bool Addressee::operator!=( const Addressee &a ) const
+{
+  return !( a == *this );
+}
+
+bool Addressee::isEmpty() const
+{
+  return mData->empty;
+}
+
+void Addressee::setUid( const QString &id )
+{
+  if ( id == mData->uid ) return;
+  detach();
+  mData->empty = false;
+  mData->uid = id;
+}
+
+QString Addressee::uid() const
+{
+  return mData->uid;
+}
+
+QString Addressee::uidLabel()
+{
+  return i18n("Unique Identifier");
+}
+
+void Addressee::setName( const QString &name )
+{
+  if ( name == mData->name ) return;
+  detach();
+  mData->empty = false;
+  mData->name = name;
+}
+
+QString Addressee::name() const
+{
+  return mData->name;
+}
+
+QString Addressee::nameLabel()
+{
+  return i18n("Name");
+}
+
+
+void Addressee::setFormattedName( const QString &formattedName )
+{
+  if ( formattedName == mData->formattedName ) return;
+  detach();
+  mData->empty = false;
+  mData->formattedName = formattedName;
+}
+
+QString Addressee::formattedName() const
+{
+  return mData->formattedName;
+}
+
+QString Addressee::formattedNameLabel()
+{
+  return i18n("Formatted Name");
+}
+
+
+void Addressee::setFamilyName( const QString &familyName )
+{
+  if ( familyName == mData->familyName ) return;
+  detach();
+  mData->empty = false;
+  mData->familyName = familyName;
+}
+
+QString Addressee::familyName() const
+{
+  return mData->familyName;
+}
+
+QString Addressee::familyNameLabel()
+{
+  return i18n("Family Name");
+}
+
+
+void Addressee::setGivenName( const QString &givenName )
+{
+  if ( givenName == mData->givenName ) return;
+  detach();
+  mData->empty = false;
+  mData->givenName = givenName;
+}
+
+QString Addressee::givenName() const
+{
+  return mData->givenName;
+}
+
+QString Addressee::givenNameLabel()
+{
+  return i18n("Given Name");
+}
+
+
+void Addressee::setAdditionalName( const QString &additionalName )
+{
+  if ( additionalName == mData->additionalName ) return;
+  detach();
+  mData->empty = false;
+  mData->additionalName = additionalName;
+}
+
+QString Addressee::additionalName() const
+{
+  return mData->additionalName;
+}
+
+QString Addressee::additionalNameLabel()
+{
+  return i18n("Additional Names");
+}
+
+
+void Addressee::setPrefix( const QString &prefix )
+{
+  if ( prefix == mData->prefix ) return;
+  detach();
+  mData->empty = false;
+  mData->prefix = prefix;
+}
+
+QString Addressee::prefix() const
+{
+  return mData->prefix;
+}
+
+QString Addressee::prefixLabel()
+{
+  return i18n("Honorific Prefixes");
+}
+
+
+void Addressee::setSuffix( const QString &suffix )
+{
+  if ( suffix == mData->suffix ) return;
+  detach();
+  mData->empty = false;
+  mData->suffix = suffix;
+}
+
+QString Addressee::suffix() const
+{
+  return mData->suffix;
+}
+
+QString Addressee::suffixLabel()
+{
+  return i18n("Honorific Suffixes");
+}
+
+
+void Addressee::setNickName( const QString &nickName )
+{
+  if ( nickName == mData->nickName ) return;
+  detach();
+  mData->empty = false;
+  mData->nickName = nickName;
+}
+
+QString Addressee::nickName() const
+{
+  return mData->nickName;
+}
+
+QString Addressee::nickNameLabel()
+{
+  return i18n("Nick Name");
+}
+
+
+void Addressee::setBirthday( const QDateTime &birthday )
+{
+  if ( birthday == mData->birthday ) return;
+  detach();
+  mData->empty = false;
+  mData->birthday = birthday;
+}
+
+QDateTime Addressee::birthday() const
+{
+  return mData->birthday;
+}
+
+QString Addressee::birthdayLabel()
+{
+  return i18n("Birthday");
+}
+
+
+QString Addressee::homeAddressStreetLabel()
+{
+  return i18n("Home Address Street");
+}
+
+
+QString Addressee::homeAddressLocalityLabel()
+{
+  return i18n("Home Address City");
+}
+
+
+QString Addressee::homeAddressRegionLabel()
+{
+  return i18n("Home Address State");
+}
+
+
+QString Addressee::homeAddressPostalCodeLabel()
+{
+  return i18n("Home Address Zip Code");
+}
+
+
+QString Addressee::homeAddressCountryLabel()
+{
+  return i18n("Home Address Country");
+}
+
+
+QString Addressee::homeAddressLabelLabel()
+{
+  return i18n("Home Address Label");
+}
+
+
+QString Addressee::businessAddressStreetLabel()
+{
+  return i18n("Business Address Street");
+}
+
+
+QString Addressee::businessAddressLocalityLabel()
+{
+  return i18n("Business Address City");
+}
+
+
+QString Addressee::businessAddressRegionLabel()
+{
+  return i18n("Business Address State");
+}
+
+
+QString Addressee::businessAddressPostalCodeLabel()
+{
+  return i18n("Business Address Zip Code");
+}
+
+
+QString Addressee::businessAddressCountryLabel()
+{
+  return i18n("Business Address Country");
+}
+
+
+QString Addressee::businessAddressLabelLabel()
+{
+  return i18n("Business Address Label");
+}
+
+
+QString Addressee::homePhoneLabel()
+{
+  return i18n("Home Phone");
+}
+
+
+QString Addressee::businessPhoneLabel()
+{
+  return i18n("Business Phone");
+}
+
+
+QString Addressee::mobilePhoneLabel()
+{
+  return i18n("Mobile Phone");
+}
+
+
+QString Addressee::homeFaxLabel()
+{
+  return i18n("Home Fax");
+}
+
+
+QString Addressee::businessFaxLabel()
+{
+  return i18n("Business Fax");
+}
+
+
+QString Addressee::carPhoneLabel()
+{
+  return i18n("Car Phone");
+}
+
+
+QString Addressee::isdnLabel()
+{
+  return i18n("ISDN");
+}
+
+
+QString Addressee::pagerLabel()
+{
+  return i18n("Pager");
+}
+
+
+QString Addressee::emailLabel()
+{
+  return i18n("Email Address");
+}
+
+
+void Addressee::setMailer( const QString &mailer )
+{
+  if ( mailer == mData->mailer ) return;
+  detach();
+  mData->empty = false;
+  mData->mailer = mailer;
+}
+
+QString Addressee::mailer() const
+{
+  return mData->mailer;
+}
+
+QString Addressee::mailerLabel()
+{
+  return i18n("Mail Client");
+}
+
+
+void Addressee::setTimeZone( const TimeZone &timeZone )
+{
+  if ( timeZone == mData->timeZone ) return;
+  detach();
+  mData->empty = false;
+  mData->timeZone = timeZone;
+}
+
+TimeZone Addressee::timeZone() const
+{
+  return mData->timeZone;
+}
+
+QString Addressee::timeZoneLabel()
+{
+  return i18n("Time Zone");
+}
+
+
+void Addressee::setGeo( const Geo &geo )
+{
+  if ( geo == mData->geo ) return;
+  detach();
+  mData->empty = false;
+  mData->geo = geo;
+}
+
+Geo Addressee::geo() const
+{
+  return mData->geo;
+}
+
+QString Addressee::geoLabel()
+{
+  return i18n("Geographic Position");
+}
+
+
+void Addressee::setTitle( const QString &title )
+{
+  if ( title == mData->title ) return;
+  detach();
+  mData->empty = false;
+  mData->title = title;
+}
+
+QString Addressee::title() const
+{
+  return mData->title;
+}
+
+QString Addressee::titleLabel()
+{
+  return i18n("person","Title");
+}
+
+
+void Addressee::setRole( const QString &role )
+{
+  if ( role == mData->role ) return;
+  detach();
+  mData->empty = false;
+  mData->role = role;
+}
+
+QString Addressee::role() const
+{
+  return mData->role;
+}
+
+QString Addressee::roleLabel()
+{
+  return i18n("person in organization","Role");
+}
+
+
+void Addressee::setOrganization( const QString &organization )
+{
+  if ( organization == mData->organization ) return;
+  detach();
+  mData->empty = false;
+  mData->organization = organization;
+}
+
+QString Addressee::organization() const
+{
+  return mData->organization;
+}
+
+QString Addressee::organizationLabel()
+{
+  return i18n("Organization");
+}
+
+
+void Addressee::setNote( const QString &note )
+{
+  if ( note == mData->note ) return;
+  detach();
+  mData->empty = false;
+  mData->note = note;
+}
+
+QString Addressee::note() const
+{
+  return mData->note;
+}
+
+QString Addressee::noteLabel()
+{
+  return i18n("Note");
+}
+
+
+void Addressee::setProductId( const QString &productId )
+{
+  if ( productId == mData->productId ) return;
+  detach();
+  mData->empty = false;
+  mData->productId = productId;
+}
+
+QString Addressee::productId() const
+{
+  return mData->productId;
+}
+
+QString Addressee::productIdLabel()
+{
+  return i18n("Product Identifier");
+}
+
+
+void Addressee::setRevision( const QDateTime &revision )
+{
+  if ( revision == mData->revision ) return;
+  detach();
+  mData->empty = false;
+  mData->revision = revision;
+}
+
+QDateTime Addressee::revision() const
+{
+  return mData->revision;
+}
+
+QString Addressee::revisionLabel()
+{
+  return i18n("Revision Date");
+}
+
+
+void Addressee::setSortString( const QString &sortString )
+{
+  if ( sortString == mData->sortString ) return;
+  detach();
+  mData->empty = false;
+  mData->sortString = sortString;
+}
+
+QString Addressee::sortString() const
+{
+  return mData->sortString;
+}
+
+QString Addressee::sortStringLabel()
+{
+  return i18n("Sort String");
+}
+
+
+void Addressee::setUrl( const KURL &url )
+{
+  if ( url == mData->url ) return;
+  detach();
+  mData->empty = false;
+  mData->url = url;
+}
+
+KURL Addressee::url() const
+{
+  return mData->url;
+}
+
+QString Addressee::urlLabel()
+{
+  return i18n("Homepage");
+}
+
+
+void Addressee::setSecrecy( const Secrecy &secrecy )
+{
+  if ( secrecy == mData->secrecy ) return;
+  detach();
+  mData->empty = false;
+  mData->secrecy = secrecy;
+}
+
+Secrecy Addressee::secrecy() const
+{
+  return mData->secrecy;
+}
+
+QString Addressee::secrecyLabel()
+{
+  return i18n("Security Class");
+}
+
+
+void Addressee::setLogo( const Picture &logo )
+{
+  if ( logo == mData->logo ) return;
+  detach();
+  mData->empty = false;
+  mData->logo = logo;
+}
+
+Picture Addressee::logo() const
+{
+  return mData->logo;
+}
+
+QString Addressee::logoLabel()
+{
+  return i18n("Logo");
+}
+
+
+void Addressee::setPhoto( const Picture &photo )
+{
+  if ( photo == mData->photo ) return;
+  detach();
+  mData->empty = false;
+  mData->photo = photo;
+}
+
+Picture Addressee::photo() const
+{
+  return mData->photo;
+}
+
+QString Addressee::photoLabel()
+{
+  return i18n("Photo");
+}
+
+
+void Addressee::setSound( const Sound &sound )
+{
+  if ( sound == mData->sound ) return;
+  detach();
+  mData->empty = false;
+  mData->sound = sound;
+}
+
+Sound Addressee::sound() const
+{
+  return mData->sound;
+}
+
+QString Addressee::soundLabel()
+{
+  return i18n("Sound");
+}
+
+
+void Addressee::setAgent( const Agent &agent )
+{
+  if ( agent == mData->agent ) return;
+  detach();
+  mData->empty = false;
+  mData->agent = agent;
+}
+
+Agent Addressee::agent() const
+{
+  return mData->agent;
+}
+
+QString Addressee::agentLabel()
+{
+  return i18n("Agent");
+}
+
+
+
+void Addressee::setNameFromString( const QString &s )
+{
+  QString str = s;
+  //remove enclosing quotes from string
+  if ( str.length() > 1  && s[ 0 ] == '"' && s[ s.length() - 1 ] == '"' )
+    str = s.mid( 1, s.length() - 2 );
+
+  setFormattedName( str );
+  setName( str );
+
+  // clear all name parts
+  setPrefix( QString::null );
+  setGivenName( QString::null );
+  setAdditionalName( QString::null );
+  setFamilyName( QString::null );
+  setSuffix( QString::null );
+
+  if ( str.isEmpty() )
+    return;
+
+  QString spaceStr = " ";
+  QString emptyStr = "";
+  AddresseeHelper *helper = AddresseeHelper::self();
+
+  int i = str.find( ',' );
+  if( i < 0 ) {
+    QStringList parts = QStringList::split( spaceStr, str );
+    int leftOffset = 0;
+    int rightOffset = parts.count() - 1;
+
+    QString suffix;
+    while ( rightOffset >= 0 ) {
+      if ( helper->containsSuffix( parts[ rightOffset ] ) ) {
+        suffix.prepend(parts[ rightOffset ] + (suffix.isEmpty() ? emptyStr : spaceStr));
+        rightOffset--;
+      } else
+        break;
+    }
+    setSuffix( suffix );
+
+    if ( rightOffset < 0 )
+      return;
+
+    QStringList inclusionList;
+    for ( int n = 1; (rightOffset - n >= 0) && (n < 4); ++n ) {
+      if ( helper->containsPrefix( parts[ rightOffset - n ].lower() ) ) {
+        inclusionList.prepend( parts[ rightOffset - n ] );
+      } else
+        break;
+    }
+
+    if ( !inclusionList.isEmpty() ) {
+      setFamilyName( inclusionList.join( " " ) + spaceStr + parts[ rightOffset ] );
+      rightOffset -= inclusionList.count();
+    } else {
+      if ( helper->tradeAsFamilyName() )
+        setFamilyName( parts[ rightOffset ] );
+      else
+        setGivenName( parts[ rightOffset ] );
+    }
+
+    QString prefix;
+    while ( leftOffset < rightOffset ) {
+      if ( helper->containsTitle( parts[ leftOffset ] ) ) {
+        prefix.append( ( prefix.isEmpty() ? emptyStr : spaceStr) + parts[ leftOffset ] );
+        leftOffset++;
+      } else
+        break;
+    }
+    setPrefix( prefix );
+
+    if ( leftOffset < rightOffset ) {
+      setGivenName( parts[ leftOffset ] );
+      leftOffset++;
+    }
+
+    QString additionalName;
+    while ( leftOffset < rightOffset ) {
+      additionalName.append( ( additionalName.isEmpty() ? emptyStr : spaceStr) + parts[ leftOffset ] );
+      leftOffset++;
+    }
+    setAdditionalName( additionalName );
+  } else {
+    QString part1 = str.left( i );
+    QString part2 = str.mid( i + 1 );
+
+    QStringList parts = QStringList::split( spaceStr, part1 );
+    int leftOffset = 0;
+    int rightOffset = parts.count() - 1;
+
+    if ( parts.count() > 0 ) {
+
+      QString suffix;
+      while ( rightOffset >= 0 ) {
+        if ( helper->containsSuffix( parts[ rightOffset ] ) ) {
+          suffix.prepend(parts[ rightOffset ] + (suffix.isEmpty() ? emptyStr : spaceStr));
+          rightOffset--;
+        } else
+          break;
+      }
+      setSuffix( suffix );
+
+      if ( rightOffset - 1 >= 0 && helper->containsPrefix( parts[ rightOffset - 1 ].lower() ) ) {
+        setFamilyName( parts[ rightOffset - 1 ] + spaceStr + parts[ rightOffset ] );
+        rightOffset--;
+      } else
+        setFamilyName( parts[ rightOffset ] );
+
+      QString prefix;
+      while ( leftOffset < rightOffset ) {
+        if ( helper->containsTitle( parts[ leftOffset ] ) ) {
+          prefix.append( ( prefix.isEmpty() ? emptyStr : spaceStr) + parts[ leftOffset ] );
+          leftOffset++;
+        } else
+          break;
+      }
+    } else {
+      setPrefix( "" );
+      setFamilyName( "" );
+      setSuffix( "" );
+    }
+
+    parts = QStringList::split( spaceStr, part2 );
+
+    leftOffset = 0;
+    rightOffset = parts.count();
+
+    if ( parts.count() > 0 ) {
+
+      QString prefix;
+      while ( leftOffset < rightOffset ) {
+        if ( helper->containsTitle( parts[ leftOffset ] ) ) {
+          prefix.append( ( prefix.isEmpty() ? emptyStr : spaceStr) + parts[ leftOffset ] );
+          leftOffset++;
+        } else
+          break;
+      }
+      setPrefix( prefix );
+
+      if ( leftOffset < rightOffset ) {
+        setGivenName( parts[ leftOffset ] );
+        leftOffset++;
+      }
+
+      QString additionalName;
+      while ( leftOffset < rightOffset ) {
+        additionalName.append( ( additionalName.isEmpty() ? emptyStr : spaceStr) + parts[ leftOffset ] );
+        leftOffset++;
+      }
+      setAdditionalName( additionalName );
+    } else {
+      setGivenName( "" );
+      setAdditionalName( "" );
+    }
+  }
+}
+
+QString Addressee::realName() const
+{
+  QString n( formattedName() );
+  if ( !n.isEmpty() )
+	return n;
+
+  n = assembledName();
+  if ( !n.isEmpty() )
+	return n;
+
+  n = name();
+  if ( !n.isEmpty() )
+	return n;
+
+  return organization();
+}
+
+QString Addressee::assembledName() const
+{
+  QString name = prefix() + " " + givenName() + " " + additionalName() + " " +
+              familyName() + " " + suffix();
+
+  return name.simplifyWhiteSpace();
+}
+
+QString Addressee::fullEmail( const QString &email ) const
+{
+  QString e;
+  if ( email.isNull() ) {
+    e = preferredEmail();
+  } else {
+    e = email;
+  }
+  if ( e.isEmpty() ) return QString::null;
+
+  QString text;
+  if ( realName().isEmpty() )
+    text = e;
+  else {
+    QRegExp needQuotes( "[^ 0-9A-Za-z\\x0080-\\xFFFF]" );
+    if ( realName().find( needQuotes ) != -1 )
+      text = "\"" + realName() + "\" <" + e + ">";
+    else
+      text = realName() + " <" + e + ">";
+  }
+
+  return text;
+}
+
+void Addressee::insertEmail( const QString &email, bool preferred )
+{
+  if ( email.simplifyWhiteSpace().isEmpty() )
+    return;
+
+  detach();
+  mData->empty = false;
+
+  QStringList::Iterator it = mData->emails.find( email );
+
+  if ( it != mData->emails.end() ) {
+    if ( !preferred || it == mData->emails.begin() ) return;
+    mData->emails.remove( it );
+    mData->emails.prepend( email );
+  } else {
+    if ( preferred ) {
+      mData->emails.prepend( email );
+    } else {
+      mData->emails.append( email );
+    }
+  }
+}
+
+void Addressee::removeEmail( const QString &email )
+{
+  detach();
+
+  QStringList::Iterator it = mData->emails.find( email );
+  if ( it == mData->emails.end() ) return;
+
+  mData->emails.remove( it );
+}
+
+QString Addressee::preferredEmail() const
+{
+  if ( mData->emails.count() == 0 ) return QString::null;
+  else return mData->emails.first();
+}
+
+QStringList Addressee::emails() const
+{
+  return mData->emails;
+}
+void Addressee::setEmails( const QStringList& emails ) {
+  detach();
+
+  mData->emails = emails;
+}
+void Addressee::insertPhoneNumber( const PhoneNumber &phoneNumber )
+{
+  detach();
+  mData->empty = false;
+
+  PhoneNumber::List::Iterator it;
+  for( it = mData->phoneNumbers.begin(); it != mData->phoneNumbers.end(); ++it ) {
+    if ( (*it).id() == phoneNumber.id() ) {
+      *it = phoneNumber;
+      return;
+    }
+  }
+  if ( !phoneNumber.number().simplifyWhiteSpace().isEmpty() )
+    mData->phoneNumbers.append( phoneNumber );
+}
+
+void Addressee::removePhoneNumber( const PhoneNumber &phoneNumber )
+{
+  detach();
+
+  PhoneNumber::List::Iterator it;
+  for( it = mData->phoneNumbers.begin(); it != mData->phoneNumbers.end(); ++it ) {
+    if ( (*it).id() == phoneNumber.id() ) {
+      mData->phoneNumbers.remove( it );
+      return;
+    }
+  }
+}
+
+PhoneNumber Addressee::phoneNumber( int type ) const
+{
+  PhoneNumber phoneNumber( "", type );
+  PhoneNumber::List::ConstIterator it;
+  for( it = mData->phoneNumbers.constBegin(); it != mData->phoneNumbers.constEnd(); ++it ) {
+    if ( matchBinaryPattern( (*it).type(), type ) ) {
+      if ( (*it).type() & PhoneNumber::Pref )
+        return (*it);
+      else if ( phoneNumber.number().isEmpty() )
+        phoneNumber = (*it);
+    }
+  }
+
+  return phoneNumber;
+}
+
+PhoneNumber::List Addressee::phoneNumbers() const
+{
+  return mData->phoneNumbers;
+}
+
+PhoneNumber::List Addressee::phoneNumbers( int type ) const
+{
+  PhoneNumber::List list;
+
+  PhoneNumber::List::ConstIterator it;
+  for( it = mData->phoneNumbers.constBegin(); it != mData->phoneNumbers.constEnd(); ++it ) {
+    if ( matchBinaryPattern( (*it).type(), type ) ) {
+      list.append( *it );
+    }
+  }
+  return list;
+}
+
+PhoneNumber Addressee::findPhoneNumber( const QString &id ) const
+{
+  PhoneNumber::List::ConstIterator it;
+  for( it = mData->phoneNumbers.constBegin(); it != mData->phoneNumbers.constEnd(); ++it ) {
+    if ( (*it).id() == id ) {
+      return *it;
+    }
+  }
+  return PhoneNumber();
+}
+
+void Addressee::insertKey( const Key &key )
+{
+  detach();
+  mData->empty = false;
+
+  Key::List::Iterator it;
+  for( it = mData->keys.begin(); it != mData->keys.end(); ++it ) {
+    if ( (*it).id() == key.id() ) {
+      *it = key;
+      return;
+    }
+  }
+  mData->keys.append( key );
+}
+
+void Addressee::removeKey( const Key &key )
+{
+  detach();
+
+  Key::List::Iterator it;
+  for( it = mData->keys.begin(); it != mData->keys.end(); ++it ) {
+    if ( (*it).id() == key.id() ) {
+      mData->keys.remove( key );
+      return;
+    }
+  }
+}
+
+Key Addressee::key( int type, QString customTypeString ) const
+{
+  Key::List::ConstIterator it;
+  for( it = mData->keys.constBegin(); it != mData->keys.constEnd(); ++it ) {
+    if ( (*it).type() == type ) {
+      if ( type == Key::Custom ) {
+        if ( customTypeString.isEmpty() ) {
+          return *it;
+        } else {
+          if ( (*it).customTypeString() == customTypeString )
+            return (*it);
+        }
+      } else {
+        return *it;
+      }
+    }
+  }
+  return Key( QString(), type );
+}
+
+void Addressee::setKeys( const Key::List& list )
+{
+  detach();
+  mData->keys = list;
+}
+
+Key::List Addressee::keys() const
+{
+  return mData->keys;
+}
+
+Key::List Addressee::keys( int type, QString customTypeString ) const
+{
+  Key::List list;
+
+  Key::List::ConstIterator it;
+  for( it = mData->keys.constBegin(); it != mData->keys.constEnd(); ++it ) {
+    if ( (*it).type() == type ) {
+      if ( type == Key::Custom ) {
+        if ( customTypeString.isEmpty() ) {
+          list.append( *it );
+        } else {
+          if ( (*it).customTypeString() == customTypeString )
+            list.append( *it );
+        }
+      } else {
+        list.append( *it );
+      }
+    }
+  }
+  return list;
+}
+
+Key Addressee::findKey( const QString &id ) const
+{
+  Key::List::ConstIterator it;
+  for( it = mData->keys.constBegin(); it != mData->keys.constEnd(); ++it ) {
+    if ( (*it).id() == id ) {
+      return *it;
+    }
+  }
+  return Key();
+}
+
+QString Addressee::asString() const
+{
+  return "Smith, agent Smith...";
+}
+
+void Addressee::dump() const
+{
+  kdDebug(5700) << "Addressee {" << endl;
+
+  kdDebug(5700) << "  Uid: '" << uid() << "'" << endl;
+
+  kdDebug(5700) << "  Name: '" << name() << "'" << endl;
+  kdDebug(5700) << "  FormattedName: '" << formattedName() << "'" << endl;
+  kdDebug(5700) << "  FamilyName: '" << familyName() << "'" << endl;
+  kdDebug(5700) << "  GivenName: '" << givenName() << "'" << endl;
+  kdDebug(5700) << "  AdditionalName: '" << additionalName() << "'" << endl;
+  kdDebug(5700) << "  Prefix: '" << prefix() << "'" << endl;
+  kdDebug(5700) << "  Suffix: '" << suffix() << "'" << endl;
+  kdDebug(5700) << "  NickName: '" << nickName() << "'" << endl;
+  kdDebug(5700) << "  Birthday: '" << birthday().toString() << "'" << endl;
+  kdDebug(5700) << "  Mailer: '" << mailer() << "'" << endl;
+  kdDebug(5700) << "  TimeZone: '" << timeZone().asString() << "'" << endl;
+  kdDebug(5700) << "  Geo: '" << geo().asString() << "'" << endl;
+  kdDebug(5700) << "  Title: '" << title() << "'" << endl;
+  kdDebug(5700) << "  Role: '" << role() << "'" << endl;
+  kdDebug(5700) << "  Organization: '" << organization() << "'" << endl;
+  kdDebug(5700) << "  Note: '" << note() << "'" << endl;
+  kdDebug(5700) << "  ProductId: '" << productId() << "'" << endl;
+  kdDebug(5700) << "  Revision: '" << revision().toString() << "'" << endl;
+  kdDebug(5700) << "  SortString: '" << sortString() << "'" << endl;
+  kdDebug(5700) << "  Url: '" << url().url() << "'" << endl;
+  kdDebug(5700) << "  Secrecy: '" << secrecy().asString() << "'" << endl;
+  kdDebug(5700) << "  Logo: '" << logo().asString() << "'" << endl;
+  kdDebug(5700) << "  Photo: '" << photo().asString() << "'" << endl;
+  kdDebug(5700) << "  Sound: '" << sound().asString() << "'" << endl;
+  kdDebug(5700) << "  Agent: '" << agent().asString() << "'" << endl;
+
+  kdDebug(5700) << "  Emails {" << endl;
+  const QStringList e = emails();
+  QStringList::ConstIterator it;
+  for( it = e.begin(); it != e.end(); ++it ) {
+    kdDebug(5700) << "    " << (*it) << endl;
+  }
+  kdDebug(5700) << "  }" << endl;
+
+  kdDebug(5700) << "  PhoneNumbers {" << endl;
+  const PhoneNumber::List p = phoneNumbers();
+  PhoneNumber::List::ConstIterator it2;
+  for( it2 = p.begin(); it2 != p.end(); ++it2 ) {
+    kdDebug(5700) << "    Type: " << int((*it2).type()) << " Number: " << (*it2).number() << endl;
+  }
+  kdDebug(5700) << "  }" << endl;
+
+  const Address::List a = addresses();
+  Address::List::ConstIterator it3;
+  for( it3 = a.begin(); it3 != a.end(); ++it3 ) {
+    (*it3).dump();
+  }
+
+  kdDebug(5700) << "  Keys {" << endl;
+  const Key::List k = keys();
+  Key::List::ConstIterator it4;
+  for( it4 = k.begin(); it4 != k.end(); ++it4 ) {
+    kdDebug(5700) << "    Type: " << int((*it4).type()) <<
+                     " Key: " << (*it4).textData() <<
+                     " CustomString: " << (*it4).customTypeString() << endl;
+  }
+  kdDebug(5700) << "  }" << endl;
+
+  kdDebug(5700) << "}" << endl;
+}
+
+
+void Addressee::insertAddress( const Address &address )
+{
+  if ( address.isEmpty() )
+    return;
+
+  detach();
+  mData->empty = false;
+
+  Address::List::Iterator it;
+  for( it = mData->addresses.begin(); it != mData->addresses.end(); ++it ) {
+    if ( (*it).id() == address.id() ) {
+      *it = address;
+      return;
+    }
+  }
+
+  mData->addresses.append( address );
+}
+
+void Addressee::removeAddress( const Address &address )
+{
+  detach();
+
+  Address::List::Iterator it;
+  for( it = mData->addresses.begin(); it != mData->addresses.end(); ++it ) {
+    if ( (*it).id() == address.id() ) {
+      mData->addresses.remove( it );
+      return;
+    }
+  }
+}
+
+Address Addressee::address( int type ) const
+{
+  Address address( type );
+  Address::List::ConstIterator it;
+  for( it = mData->addresses.constBegin(); it != mData->addresses.constEnd(); ++it ) {
+    if ( matchBinaryPattern( (*it).type(), type ) ) {
+      if ( (*it).type() & Address::Pref )
+        return (*it);
+      else if ( address.isEmpty() )
+        address = (*it);
+    }
+  }
+
+  return address;
+}
+
+Address::List Addressee::addresses() const
+{
+  return mData->addresses;
+}
+
+Address::List Addressee::addresses( int type ) const
+{
+  Address::List list;
+
+  Address::List::ConstIterator it;
+  for( it = mData->addresses.constBegin(); it != mData->addresses.constEnd(); ++it ) {
+    if ( matchBinaryPattern( (*it).type(), type ) ) {
+      list.append( *it );
+    }
+  }
+
+  return list;
+}
+
+Address Addressee::findAddress( const QString &id ) const
+{
+  Address::List::ConstIterator it;
+  for( it = mData->addresses.constBegin(); it != mData->addresses.constEnd(); ++it ) {
+    if ( (*it).id() == id ) {
+      return *it;
+    }
+  }
+  return Address();
+}
+
+void Addressee::insertCategory( const QString &c )
+{
+  detach();
+  mData->empty = false;
+
+  if ( mData->categories.findIndex( c ) != -1 ) return;
+
+  mData->categories.append( c );
+}
+
+void Addressee::removeCategory( const QString &c )
+{
+  detach();
+
+  QStringList::Iterator it = mData->categories.find( c );
+  if ( it == mData->categories.end() ) return;
+
+  mData->categories.remove( it );
+}
+
+bool Addressee::hasCategory( const QString &c ) const
+{
+  return ( mData->categories.findIndex( c ) != -1 );
+}
+
+void Addressee::setCategories( const QStringList &c )
+{
+  detach();
+  mData->empty = false;
+
+  mData->categories = c;
+}
+
+QStringList Addressee::categories() const
+{
+  return mData->categories;
+}
+
+void Addressee::insertCustom( const QString &app, const QString &name,
+                              const QString &value )
+{
+  if ( value.isEmpty() || name.isEmpty() || app.isEmpty() ) return;
+
+  detach();
+  mData->empty = false;
+
+  QString qualifiedName = app + "-" + name + ":";
+
+  QStringList::Iterator it;
+  for( it = mData->custom.begin(); it != mData->custom.end(); ++it ) {
+    if ( (*it).startsWith( qualifiedName ) ) {
+      (*it) = qualifiedName + value;
+      return;
+    }
+  }
+
+  mData->custom.append( qualifiedName + value );
+}
+
+void Addressee::removeCustom( const QString &app, const QString &name)
+{
+  detach();
+
+  QString qualifiedName = app + "-" + name + ":";
+
+  QStringList::Iterator it;
+  for( it = mData->custom.begin(); it != mData->custom.end(); ++it ) {
+    if ( (*it).startsWith( qualifiedName ) ) {
+      mData->custom.remove( it );
+      return;
+    }
+  }
+}
+
+QString Addressee::custom( const QString &app, const QString &name ) const
+{
+  QString qualifiedName = app + "-" + name + ":";
+  QString value;
+
+  QStringList::ConstIterator it;
+  for( it = mData->custom.constBegin(); it != mData->custom.constEnd(); ++it ) {
+    if ( (*it).startsWith( qualifiedName ) ) {
+      value = (*it).mid( (*it).find( ":" ) + 1 );
+      break;
+    }
+  }
+
+  return value;
+}
+
+void Addressee::setCustoms( const QStringList &l )
+{
+  detach();
+  mData->empty = false;
+
+  mData->custom = l;
+}
+
+QStringList Addressee::customs() const
+{
+  return mData->custom;
+}
+
+void Addressee::parseEmailAddress( const QString &rawEmail, QString &fullName,
+                                   QString &email)
+{
+  // This is a simplified version of KPIM::splitAddress().
+
+  fullName = "";
+  email = "";
+  if ( rawEmail.isEmpty() )
+    return; // KPIM::AddressEmpty;
+
+  // The code works on 8-bit strings, so convert the input to UTF-8.
+  QCString address = rawEmail.utf8();
+
+  QCString displayName;
+  QCString addrSpec;
+  QCString comment;
+
+  // The following is a primitive parser for a mailbox-list (cf. RFC 2822).
+  // The purpose is to extract a displayable string from the mailboxes.
+  // Comments in the addr-spec are not handled. No error checking is done.
+
+  enum { TopLevel, InComment, InAngleAddress } context = TopLevel;
+  bool inQuotedString = false;
+  int commentLevel = 0;
+  bool stop = false;
+
+  for ( char* p = address.data(); *p && !stop; ++p ) {
+    switch ( context ) {
+    case TopLevel : {
+      switch ( *p ) {
+      case '"' : inQuotedString = !inQuotedString;
+                 displayName += *p;
+                 break;
+      case '(' : if ( !inQuotedString ) {
+                   context = InComment;
+                   commentLevel = 1;
+                 }
+                 else
+                   displayName += *p;
+                 break;
+      case '<' : if ( !inQuotedString ) {
+                   context = InAngleAddress;
+                 }
+                 else
+                   displayName += *p;
+                 break;
+      case '\\' : // quoted character
+                 displayName += *p;
+                 ++p; // skip the '\'
+                 if ( *p )
+                   displayName += *p;
+                 else
+                   //return KPIM::UnexpectedEnd;
+                   goto ABORT_PARSING;
+                 break;
+      case ',' : if ( !inQuotedString ) {
+                   //if ( allowMultipleAddresses )
+                   //  stop = true;
+                   //else
+                   //  return KPIM::UnexpectedComma;
+                   goto ABORT_PARSING;
+                 }
+                 else
+                   displayName += *p;
+                 break;
+      default :  displayName += *p;
+      }
+      break;
+    }
+    case InComment : {
+      switch ( *p ) {
+      case '(' : ++commentLevel;
+                 comment += *p;
+                 break;
+      case ')' : --commentLevel;
+                 if ( commentLevel == 0 ) {
+                   context = TopLevel;
+                   comment += ' '; // separate the text of several comments
+                 }
+                 else
+                   comment += *p;
+                 break;
+      case '\\' : // quoted character
+                 comment += *p;
+                 ++p; // skip the '\'
+                 if ( *p )
+                   comment += *p;
+                 else
+                   //return KPIM::UnexpectedEnd;
+                   goto ABORT_PARSING;
+                 break;
+      default :  comment += *p;
+      }
+      break;
+    }
+    case InAngleAddress : {
+      switch ( *p ) {
+      case '"' : inQuotedString = !inQuotedString;
+                 addrSpec += *p;
+                 break;
+      case '>' : if ( !inQuotedString ) {
+                   context = TopLevel;
+                 }
+                 else
+                   addrSpec += *p;
+                 break;
+      case '\\' : // quoted character
+                 addrSpec += *p;
+                 ++p; // skip the '\'
+                 if ( *p )
+                   addrSpec += *p;
+                 else
+                   //return KPIM::UnexpectedEnd;
+                   goto ABORT_PARSING;
+                 break;
+      default :  addrSpec += *p;
+      }
+      break;
+    }
+    } // switch ( context )
+  }
+
+ABORT_PARSING:
+  displayName = displayName.stripWhiteSpace();
+  comment = comment.stripWhiteSpace();
+  addrSpec = addrSpec.stripWhiteSpace();
+
+  fullName = QString::fromUtf8( displayName );
+  email = QString::fromUtf8( addrSpec );
+
+  // check for errors
+  if ( inQuotedString )
+    return; // KPIM::UnbalancedQuote;
+  if ( context == InComment )
+    return; // KPIM::UnbalancedParens;
+  if ( context == InAngleAddress )
+    return; // KPIM::UnclosedAngleAddr;
+
+  if ( addrSpec.isEmpty() ) {
+    if ( displayName.isEmpty() )
+      return; // KPIM::NoAddressSpec;
+    else {
+      //addrSpec = displayName;
+      //displayName.truncate( 0 );
+      // Address of the form "foo@bar" or "foo@bar (Name)".
+      email = fullName;
+      fullName = QString::fromUtf8( comment );
+    }
+  }
+
+  // Check that we do not have any extra characters on the end of the
+  // strings
+  unsigned int len = fullName.length();
+  if ( fullName[ 0 ] == '"' && fullName[ len - 1 ] == '"' )
+    fullName = fullName.mid( 1, len - 2 );
+}
+
+void Addressee::setResource( Resource *resource )
+{
+  detach();
+  mData->resource = resource;
+}
+
+Resource *Addressee::resource() const
+{
+  return mData->resource;
+}
+
+void Addressee::setChanged( bool value )
+{
+  detach();
+  mData->changed = value;
+}
+
+bool Addressee::changed() const
+{
+  return mData->changed;
+}
+
+void Addressee::setSortMode( KABC::SortMode *mode )
+{
+  mSortMode = mode;
+}
+
+bool Addressee::operator< ( const Addressee &addr )
+{
+  if ( !mSortMode )
+    return false;
+  else
+    return mSortMode->lesser( *this, addr );
+}
+
+QDataStream &KABC::operator<<( QDataStream &s, const Addressee &a )
+{
+  if (!a.mData) return s;
+
+  s << a.uid();
+
+  s << a.mData->name;
+  s << a.mData->formattedName;
+  s << a.mData->familyName;
+  s << a.mData->givenName;
+  s << a.mData->additionalName;
+  s << a.mData->prefix;
+  s << a.mData->suffix;
+  s << a.mData->nickName;
+  s << a.mData->birthday;
+  s << a.mData->mailer;
+  s << a.mData->timeZone;
+  s << a.mData->geo;
+  s << a.mData->title;
+  s << a.mData->role;
+  s << a.mData->organization;
+  s << a.mData->note;
+  s << a.mData->productId;
+  s << a.mData->revision;
+  s << a.mData->sortString;
+  s << a.mData->url;
+  s << a.mData->secrecy;
+  s << a.mData->logo;
+  s << a.mData->photo;
+  s << a.mData->sound;
+  s << a.mData->agent;
+  s << a.mData->phoneNumbers;
+  s << a.mData->addresses;
+  s << a.mData->emails;
+  s << a.mData->categories;
+  s << a.mData->custom;
+  s << a.mData->keys;
+  return s;
+}
+
+QDataStream &KABC::operator>>( QDataStream &s, Addressee &a )
+{
+  if (!a.mData)
+    return s;
+
+  a.detach();
+
+  s >> a.mData->uid;
+
+  s >> a.mData->name;
+  s >> a.mData->formattedName;
+  s >> a.mData->familyName;
+  s >> a.mData->givenName;
+  s >> a.mData->additionalName;
+  s >> a.mData->prefix;
+  s >> a.mData->suffix;
+  s >> a.mData->nickName;
+  s >> a.mData->birthday;
+  s >> a.mData->mailer;
+  s >> a.mData->timeZone;
+  s >> a.mData->geo;
+  s >> a.mData->title;
+  s >> a.mData->role;
+  s >> a.mData->organization;
+  s >> a.mData->note;
+  s >> a.mData->productId;
+  s >> a.mData->revision;
+  s >> a.mData->sortString;
+  s >> a.mData->url;
+  s >> a.mData->secrecy;
+  s >> a.mData->logo;
+  s >> a.mData->photo;
+  s >> a.mData->sound;
+  s >> a.mData->agent;
+  s >> a.mData->phoneNumbers;
+  s >> a.mData->addresses;
+  s >> a.mData->emails;
+  s >> a.mData->categories;
+  s >> a.mData->custom;
+  s >> a.mData->keys;
+
+  a.mData->empty = false;
+
+  return s;
+}
+
+bool matchBinaryPattern( int value, int pattern )
+{
+  /**
+    We want to match all telephonnumbers/addresses which have the bits in the
+    pattern set. More are allowed.
+    if pattern == 0 we have a special handling, then we want only those with
+    exactly no bit set.
+   */
+  if ( pattern == 0 )
+    return ( value == 0 );
+  else
+    return ( pattern == ( pattern & value ) );
+}
+
+template <class L>
+bool listEquals( const QValueList<L> &list, const QValueList<L> &pattern )
+{
+  if ( list.count() != pattern.count() )
+    return false;
+
+  for ( uint i = 0; i < list.count(); ++i )
+    if ( pattern.find( list[ i ] ) == pattern.end() )
+      return false;
+
+  return true;
+}
+
+bool emailsEquals( const QStringList &list, const QStringList &pattern )
+{
+  if ( list.count() != pattern.count() )
+    return false;
+
+  if ( list.first() != pattern.first() )
+    return false;
+
+  QStringList::ConstIterator it;
+  for ( it = list.begin(); it != list.end(); ++it )
+    if ( pattern.find( *it ) == pattern.end() )
+      return false;
+
+  return true;
+}
--- kdelibs-3.5.7.orig/kabc/field.cpp
+++ kdelibs-3.5.7/kabc/field.cpp
@@ -0,0 +1,731 @@
+/*** Warning! This file has been generated by the script makeaddressee ***/
+/*
+    This file is part of libkabc.
+    Copyright (c) 2002 Cornelius Schumacher <schumacher@kde.org>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Library General Public
+    License as published by the Free Software Foundation; either
+    version 2 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Library General Public License for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to
+    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+    Boston, MA 02110-1301, USA.
+*/
+
+#include <klocale.h>
+#include <kconfig.h>
+#include <kglobal.h>
+
+#include "field.h"
+#include "address.h"
+
+using namespace KABC;
+
+class Field::FieldImpl
+{
+  public:
+    FieldImpl( int fieldId, int category = 0,
+               const QString &label = QString::null,
+               const QString &key = QString::null,
+               const QString &app = QString::null )
+      : mFieldId( fieldId ), mCategory( category ), mLabel( label ),
+        mKey( key ), mApp( app ) {}
+  
+    enum FieldId
+    {
+      CustomField,
+      FormattedName,
+      FamilyName,
+      GivenName,
+      AdditionalName,
+      Prefix,
+      Suffix,
+      NickName,
+      Birthday,
+      HomeAddressStreet,
+      HomeAddressLocality,
+      HomeAddressRegion,
+      HomeAddressPostalCode,
+      HomeAddressCountry,
+      HomeAddressLabel,
+      BusinessAddressStreet,
+      BusinessAddressLocality,
+      BusinessAddressRegion,
+      BusinessAddressPostalCode,
+      BusinessAddressCountry,
+      BusinessAddressLabel,
+      HomePhone,
+      BusinessPhone,
+      MobilePhone,
+      HomeFax,
+      BusinessFax,
+      CarPhone,
+      Isdn,
+      Pager,
+      Email,
+      Mailer,
+      Title,
+      Role,
+      Organization,
+      Note,
+      Url
+    };
+
+    int fieldId() { return mFieldId; }
+    int category() { return mCategory; }
+    
+    QString label() { return mLabel; }
+    QString key() { return mKey; }
+    QString app() { return mApp; }
+    
+  private:
+    int mFieldId;
+    int mCategory;
+
+    QString mLabel;
+    QString mKey;
+    QString mApp;
+};
+
+
+Field::List Field::mAllFields;
+Field::List Field::mDefaultFields;
+Field::List Field::mCustomFields;
+
+
+Field::Field( FieldImpl *impl )
+{
+  mImpl = impl;
+}
+
+Field::~Field()
+{
+  delete mImpl;
+}
+
+QString Field::label()
+{
+  switch ( mImpl->fieldId() ) {
+    case FieldImpl::FormattedName:
+      return Addressee::formattedNameLabel();
+    case FieldImpl::FamilyName:
+      return Addressee::familyNameLabel();
+    case FieldImpl::GivenName:
+      return Addressee::givenNameLabel();
+    case FieldImpl::AdditionalName:
+      return Addressee::additionalNameLabel();
+    case FieldImpl::Prefix:
+      return Addressee::prefixLabel();
+    case FieldImpl::Suffix:
+      return Addressee::suffixLabel();
+    case FieldImpl::NickName:
+      return Addressee::nickNameLabel();
+    case FieldImpl::Birthday:
+      return Addressee::birthdayLabel();
+    case FieldImpl::HomeAddressStreet:
+      return Addressee::homeAddressStreetLabel();
+    case FieldImpl::HomeAddressLocality:
+      return Addressee::homeAddressLocalityLabel();
+    case FieldImpl::HomeAddressRegion:
+      return Addressee::homeAddressRegionLabel();
+    case FieldImpl::HomeAddressPostalCode:
+      return Addressee::homeAddressPostalCodeLabel();
+    case FieldImpl::HomeAddressCountry:
+      return Addressee::homeAddressCountryLabel();
+    case FieldImpl::HomeAddressLabel:
+      return Addressee::homeAddressLabelLabel();
+    case FieldImpl::BusinessAddressStreet:
+      return Addressee::businessAddressStreetLabel();
+    case FieldImpl::BusinessAddressLocality:
+      return Addressee::businessAddressLocalityLabel();
+    case FieldImpl::BusinessAddressRegion:
+      return Addressee::businessAddressRegionLabel();
+    case FieldImpl::BusinessAddressPostalCode:
+      return Addressee::businessAddressPostalCodeLabel();
+    case FieldImpl::BusinessAddressCountry:
+      return Addressee::businessAddressCountryLabel();
+    case FieldImpl::BusinessAddressLabel:
+      return Addressee::businessAddressLabelLabel();
+    case FieldImpl::HomePhone:
+      return Addressee::homePhoneLabel();
+    case FieldImpl::BusinessPhone:
+      return Addressee::businessPhoneLabel();
+    case FieldImpl::MobilePhone:
+      return Addressee::mobilePhoneLabel();
+    case FieldImpl::HomeFax:
+      return Addressee::homeFaxLabel();
+    case FieldImpl::BusinessFax:
+      return Addressee::businessFaxLabel();
+    case FieldImpl::CarPhone:
+      return Addressee::carPhoneLabel();
+    case FieldImpl::Isdn:
+      return Addressee::isdnLabel();
+    case FieldImpl::Pager:
+      return Addressee::pagerLabel();
+    case FieldImpl::Email:
+      return Addressee::emailLabel();
+    case FieldImpl::Mailer:
+      return Addressee::mailerLabel();
+    case FieldImpl::Title:
+      return Addressee::titleLabel();
+    case FieldImpl::Role:
+      return Addressee::roleLabel();
+    case FieldImpl::Organization:
+      return Addressee::organizationLabel();
+    case FieldImpl::Note:
+      return Addressee::noteLabel();
+    case FieldImpl::Url:
+      return Addressee::urlLabel();
+    case FieldImpl::CustomField:
+      return mImpl->label();
+    default:
+      return i18n("Unknown Field");
+  }
+}
+
+int Field::category()
+{
+  return mImpl->category();
+}
+
+QString Field::categoryLabel( int category )
+{
+  switch ( category ) {
+    case All:
+      return i18n("All");
+    case Frequent:
+      return i18n("Frequent");
+    case Address:
+      return i18n("street/postal","Address");
+    case Email:
+      return i18n("Email");
+    case Personal:
+      return i18n("Personal");
+    case Organization:
+      return i18n("Organization");
+    case CustomCategory:
+      return i18n("Custom");
+    default:
+      return i18n("Undefined");
+  }
+}
+
+QString Field::value( const KABC::Addressee &a )
+{
+  switch ( mImpl->fieldId() ) {
+    case FieldImpl::FormattedName:
+      return a.formattedName();
+    case FieldImpl::FamilyName:
+      return a.familyName();
+    case FieldImpl::GivenName:
+      return a.givenName();
+    case FieldImpl::AdditionalName:
+      return a.additionalName();
+    case FieldImpl::Prefix:
+      return a.prefix();
+    case FieldImpl::Suffix:
+      return a.suffix();
+    case FieldImpl::NickName:
+      return a.nickName();
+    case FieldImpl::Mailer:
+      return a.mailer();
+    case FieldImpl::Title:
+      return a.title();
+    case FieldImpl::Role:
+      return a.role();
+    case FieldImpl::Organization:
+      return a.organization();
+    case FieldImpl::Note:
+      return a.note();
+    case FieldImpl::Email:
+      return a.preferredEmail();
+    case FieldImpl::Birthday:
+      if ( a.birthday().isValid() )
+        return a.birthday().date().toString( Qt::ISODate );
+      else
+        return QString::null;
+    case FieldImpl::Url:
+      return a.url().prettyURL();
+    case FieldImpl::HomePhone:
+    {
+      PhoneNumber::List::ConstIterator it;
+
+      {
+        // check for preferred number
+        const PhoneNumber::List list = a.phoneNumbers( PhoneNumber::Home | PhoneNumber::Pref );
+        for ( it = list.begin(); it != list.end(); ++it )
+          if ( ((*it).type() & ~(PhoneNumber::Pref)) == PhoneNumber::Home )
+            return (*it).number();
+      }
+
+      {
+        // check for normal home number
+        const PhoneNumber::List list = a.phoneNumbers( PhoneNumber::Home );
+        for ( it = list.begin(); it != list.end(); ++it )
+          if ( ((*it).type() & ~(PhoneNumber::Pref)) == PhoneNumber::Home )
+            return (*it).number();
+      }
+
+      return QString::null;
+    }
+    case FieldImpl::BusinessPhone:
+    {
+      PhoneNumber::List::ConstIterator it;
+
+      {
+        // check for preferred number
+        const PhoneNumber::List list = a.phoneNumbers( PhoneNumber::Work | PhoneNumber::Pref );
+        for ( it = list.begin(); it != list.end(); ++it )
+          if ( ((*it).type() & ~(PhoneNumber::Pref)) == PhoneNumber::Work )
+            return (*it).number();
+      }
+
+      {
+        // check for normal work number
+        const PhoneNumber::List list = a.phoneNumbers( PhoneNumber::Work );
+        for ( it = list.begin(); it != list.end(); ++it )
+          if ( ((*it).type() & ~(PhoneNumber::Pref)) == PhoneNumber::Work )
+            return (*it).number();
+      }
+
+      return QString::null;
+    }
+    case FieldImpl::MobilePhone:
+      return a.phoneNumber( PhoneNumber::Cell ).number();
+    case FieldImpl::HomeFax:
+      return a.phoneNumber( PhoneNumber::Home | PhoneNumber::Fax ).number();
+    case FieldImpl::BusinessFax:
+      return a.phoneNumber( PhoneNumber::Work | PhoneNumber::Fax ).number();
+    case FieldImpl::CarPhone:
+      return a.phoneNumber( PhoneNumber::Car ).number();
+    case FieldImpl::Isdn:
+      return a.phoneNumber( PhoneNumber::Isdn ).number();
+    case FieldImpl::Pager:
+      return a.phoneNumber( PhoneNumber::Pager ).number();
+    case FieldImpl::HomeAddressStreet:
+      return a.address( Address::Home ).street();
+    case FieldImpl::HomeAddressLocality:
+      return a.address( Address::Home ).locality();
+    case FieldImpl::HomeAddressRegion:
+      return a.address( Address::Home ).region();
+    case FieldImpl::HomeAddressPostalCode:
+      return a.address( Address::Home ).postalCode();
+    case FieldImpl::HomeAddressCountry:
+      return a.address( Address::Home ).country();
+    case FieldImpl::HomeAddressLabel:
+      return a.address( Address::Home ).label();
+    case FieldImpl::BusinessAddressStreet:
+      return a.address( Address::Work ).street();
+    case FieldImpl::BusinessAddressLocality:
+      return a.address( Address::Work ).locality();
+    case FieldImpl::BusinessAddressRegion:
+      return a.address( Address::Work ).region();
+    case FieldImpl::BusinessAddressPostalCode:
+      return a.address( Address::Work ).postalCode();
+    case FieldImpl::BusinessAddressCountry:
+      return a.address( Address::Work ).country();
+    case FieldImpl::BusinessAddressLabel:
+      return a.address( Address::Work ).label();
+    case FieldImpl::CustomField:
+      return a.custom( mImpl->app(), mImpl->key() );
+    default:
+      return QString::null;
+  }
+}
+
+bool Field::setValue( KABC::Addressee &a, const QString &value )
+{
+  switch ( mImpl->fieldId() ) {
+    case FieldImpl::FormattedName:
+      a.setFormattedName( value );
+      return true;
+    case FieldImpl::FamilyName:
+      a.setFamilyName( value );
+      return true;
+    case FieldImpl::GivenName:
+      a.setGivenName( value );
+      return true;
+    case FieldImpl::AdditionalName:
+      a.setAdditionalName( value );
+      return true;
+    case FieldImpl::Prefix:
+      a.setPrefix( value );
+      return true;
+    case FieldImpl::Suffix:
+      a.setSuffix( value );
+      return true;
+    case FieldImpl::NickName:
+      a.setNickName( value );
+      return true;
+    case FieldImpl::Mailer:
+      a.setMailer( value );
+      return true;
+    case FieldImpl::Title:
+      a.setTitle( value );
+      return true;
+    case FieldImpl::Role:
+      a.setRole( value );
+      return true;
+    case FieldImpl::Organization:
+      a.setOrganization( value );
+      return true;
+    case FieldImpl::Note:
+      a.setNote( value );
+      return true;
+    case FieldImpl::MobilePhone:
+      {
+        PhoneNumber number = a.phoneNumber( PhoneNumber::Cell );
+        number.setNumber( value );
+        a.insertPhoneNumber( number );
+        return true;
+      }
+    case FieldImpl::HomeFax:
+      {
+        PhoneNumber number = a.phoneNumber( PhoneNumber::Home | PhoneNumber::Fax );
+        number.setNumber( value );
+        a.insertPhoneNumber( number );
+        return true;
+      }
+    case FieldImpl::BusinessFax:
+      {
+        PhoneNumber number = a.phoneNumber( PhoneNumber::Work | PhoneNumber::Fax );
+        number.setNumber( value );
+        a.insertPhoneNumber( number );
+        return true;
+      }
+    case FieldImpl::CarPhone:
+      {
+        PhoneNumber number = a.phoneNumber( PhoneNumber::Car );
+        number.setNumber( value );
+        a.insertPhoneNumber( number );
+        return true;
+      }
+    case FieldImpl::Isdn:
+      {
+        PhoneNumber number = a.phoneNumber( PhoneNumber::Isdn );
+        number.setNumber( value );
+        a.insertPhoneNumber( number );
+        return true;
+      }
+    case FieldImpl::Pager:
+      {
+        PhoneNumber number = a.phoneNumber( PhoneNumber::Pager );
+        number.setNumber( value );
+        a.insertPhoneNumber( number );
+        return true;
+      }
+    case FieldImpl::HomeAddressStreet:
+      {
+        KABC::Address address = a.address( Address::Home );
+        address.setStreet( value );
+        a.insertAddress( address );
+        return true;
+      }
+    case FieldImpl::HomeAddressLocality:
+      {
+        KABC::Address address = a.address( Address::Home );
+        address.setLocality( value );
+        a.insertAddress( address );
+        return true;
+      }
+    case FieldImpl::HomeAddressRegion:
+      {
+        KABC::Address address = a.address( Address::Home );
+        address.setRegion( value );
+        a.insertAddress( address );
+        return true;
+      }
+    case FieldImpl::HomeAddressPostalCode:
+      {
+        KABC::Address address = a.address( Address::Home );
+        address.setPostalCode( value );
+        a.insertAddress( address );
+        return true;
+      }
+    case FieldImpl::HomeAddressCountry:
+      {
+        KABC::Address address = a.address( Address::Home );
+        address.setCountry( value );
+        a.insertAddress( address );
+        return true;
+      }
+    case FieldImpl::HomeAddressLabel:
+      {
+        KABC::Address address = a.address( Address::Home );
+        address.setLabel( value );
+        a.insertAddress( address );
+        return true;
+      }
+    case FieldImpl::BusinessAddressStreet:
+      {
+        KABC::Address address = a.address( Address::Work );
+        address.setStreet( value );
+        a.insertAddress( address );
+        return true;
+      }
+    case FieldImpl::BusinessAddressLocality:
+      {
+        KABC::Address address = a.address( Address::Work );
+        address.setLocality( value );
+        a.insertAddress( address );
+        return true;
+      }
+    case FieldImpl::BusinessAddressRegion:
+      {
+        KABC::Address address = a.address( Address::Work );
+        address.setRegion( value );
+        a.insertAddress( address );
+        return true;
+      }
+    case FieldImpl::BusinessAddressPostalCode:
+      {
+        KABC::Address address = a.address( Address::Work );
+        address.setPostalCode( value );
+        a.insertAddress( address );
+        return true;
+      }
+    case FieldImpl::BusinessAddressCountry:
+      {
+        KABC::Address address = a.address( Address::Work );
+        address.setCountry( value );
+        a.insertAddress( address );
+        return true;
+      }
+    case FieldImpl::BusinessAddressLabel:
+      {
+        KABC::Address address = a.address( Address::Work );
+        address.setLabel( value );
+        a.insertAddress( address );
+        return true;
+      }
+    case FieldImpl::Birthday:
+      a.setBirthday( QDate::fromString( value, Qt::ISODate ) );
+      return true;
+    case FieldImpl::CustomField:
+      a.insertCustom( mImpl->app(), mImpl->key(), value );
+      return true;
+    default:
+      return false;
+  }
+}
+
+QString Field::sortKey( const KABC::Addressee &a )
+{
+  switch ( mImpl->fieldId() ) {
+    case FieldImpl::FormattedName:
+      return a.formattedName();
+    case FieldImpl::FamilyName:
+      return a.familyName();
+    case FieldImpl::GivenName:
+      return a.givenName();
+    case FieldImpl::AdditionalName:
+      return a.additionalName();
+    case FieldImpl::Prefix:
+      return a.prefix();
+    case FieldImpl::Suffix:
+      return a.suffix();
+    case FieldImpl::NickName:
+      return a.nickName();
+    case FieldImpl::Mailer:
+      return a.mailer();
+    case FieldImpl::Title:
+      return a.title();
+    case FieldImpl::Role:
+      return a.role();
+    case FieldImpl::Organization:
+      return a.organization();
+    case FieldImpl::Note:
+      return a.note();
+    case FieldImpl::Birthday:
+      if ( a.birthday().isValid() ) {
+        QDate date = a.birthday().date();
+        QString key;
+        key.sprintf( "%02d-%02d", date.month(), date.day() );
+        return key;
+      } else
+        return QString( "00-00" );
+    default:
+      return value( a ).lower();
+  }
+}
+
+bool Field::isCustom()
+{
+  return mImpl->fieldId() == FieldImpl::CustomField;
+}
+
+Field::List Field::allFields()
+{
+  if ( mAllFields.isEmpty() ) {
+    createField( FieldImpl::FormattedName, Frequent );
+    createField( FieldImpl::FamilyName, Frequent );
+    createField( FieldImpl::GivenName, Frequent );
+    createField( FieldImpl::AdditionalName );
+    createField( FieldImpl::Prefix );
+    createField( FieldImpl::Suffix );
+    createField( FieldImpl::NickName, Personal );
+    createField( FieldImpl::Birthday, Personal );
+    createField( FieldImpl::HomeAddressStreet, Address|Personal );
+    createField( FieldImpl::HomeAddressLocality, Address|Personal );
+    createField( FieldImpl::HomeAddressRegion, Address|Personal );
+    createField( FieldImpl::HomeAddressPostalCode, Address|Personal );
+    createField( FieldImpl::HomeAddressCountry, Address|Personal );
+    createField( FieldImpl::HomeAddressLabel, Address|Personal );
+    createField( FieldImpl::BusinessAddressStreet, Address|Organization );
+    createField( FieldImpl::BusinessAddressLocality, Address|Organization );
+    createField( FieldImpl::BusinessAddressRegion, Address|Organization );
+    createField( FieldImpl::BusinessAddressPostalCode, Address|Organization );
+    createField( FieldImpl::BusinessAddressCountry, Address|Organization );
+    createField( FieldImpl::BusinessAddressLabel, Address|Organization );
+    createField( FieldImpl::HomePhone, Personal|Frequent );
+    createField( FieldImpl::BusinessPhone, Organization|Frequent );
+    createField( FieldImpl::MobilePhone, Frequent );
+    createField( FieldImpl::HomeFax );
+    createField( FieldImpl::BusinessFax );
+    createField( FieldImpl::CarPhone );
+    createField( FieldImpl::Isdn );
+    createField( FieldImpl::Pager );
+    createField( FieldImpl::Email, Email|Frequent );
+    createField( FieldImpl::Mailer, Email );
+    createField( FieldImpl::Title, Organization );
+    createField( FieldImpl::Role, Organization );
+    createField( FieldImpl::Organization, Organization );
+    createField( FieldImpl::Note );
+    createField( FieldImpl::Url );
+  }
+
+  return mAllFields;
+}
+
+Field::List Field::defaultFields()
+{
+  if ( mDefaultFields.isEmpty() ) {
+    createDefaultField( FieldImpl::FormattedName );
+    createDefaultField( FieldImpl::Email );
+  }
+
+  return mDefaultFields;
+}
+
+void Field::createField( int id, int category )
+{
+  mAllFields.append( new Field( new FieldImpl( id, category ) ) );
+}
+
+void Field::createDefaultField( int id, int category )
+{
+  mDefaultFields.append( new Field( new FieldImpl( id, category ) ) );
+}
+
+void Field::deleteFields()
+{
+  Field::List::ConstIterator it;
+
+  for ( it = mAllFields.constBegin(); it != mAllFields.constEnd(); ++it ) {
+    delete (*it);
+  }
+  mAllFields.clear();
+
+  for ( it = mDefaultFields.constBegin(); it != mDefaultFields.constEnd(); ++it ) {
+    delete (*it);
+  }
+  mDefaultFields.clear();
+
+  for ( it = mCustomFields.constBegin(); it != mCustomFields.constEnd(); ++it ) {
+    delete (*it);
+  }
+  mCustomFields.clear();
+}
+
+void Field::saveFields( const QString &identifier,
+                        const Field::List &fields )
+{
+  KConfig *cfg = KGlobal::config();
+  KConfigGroupSaver( cfg, "KABCFields" );
+
+  saveFields( cfg, identifier, fields );
+}
+
+void Field::saveFields( KConfig *cfg, const QString &identifier,
+                        const Field::List &fields )
+{
+  QValueList<int> fieldIds;
+  
+  int custom = 0;
+  Field::List::ConstIterator it;
+  for( it = fields.begin(); it != fields.end(); ++it ) {
+    fieldIds.append( (*it)->mImpl->fieldId() );
+    if( (*it)->isCustom() ) {
+      QStringList customEntry;
+      customEntry << (*it)->mImpl->label();
+      customEntry << (*it)->mImpl->key();
+      customEntry << (*it)->mImpl->app();
+      cfg->writeEntry( "KABC_CustomEntry_" + identifier + "_" +
+                       QString::number( custom++ ), customEntry );
+    }
+  }
+  
+  cfg->writeEntry( identifier, fieldIds );
+}
+
+Field::List Field::restoreFields( const QString &identifier )
+{
+  KConfig *cfg = KGlobal::config();
+  KConfigGroupSaver( cfg, "KABCFields" );
+ 
+  return restoreFields( cfg, identifier );
+}
+
+Field::List Field::restoreFields( KConfig *cfg, const QString &identifier )
+{
+  const QValueList<int> fieldIds = cfg->readIntListEntry( identifier );
+
+  Field::List fields;
+
+  int custom = 0;
+  QValueList<int>::ConstIterator it;
+  for( it = fieldIds.begin(); it != fieldIds.end(); ++it ) {
+    FieldImpl *f = 0;
+    if ( (*it) == FieldImpl::CustomField ) {
+      QStringList customEntry = cfg->readListEntry( "KABC_CustomEntry_" +
+                                                 identifier + "_" +
+                                                 QString::number( custom++ ) );
+      f = new FieldImpl( *it, CustomCategory, customEntry[ 0 ],
+                         customEntry[ 1 ], customEntry[ 2 ] );
+    } else {
+      f = new FieldImpl( *it );
+    }
+    fields.append( new Field( f ) );
+  }
+  
+  return fields;
+}
+
+bool Field::equals( Field *field )
+{
+  bool sameId = ( mImpl->fieldId() == field->mImpl->fieldId() );
+
+  if ( !sameId ) return false;
+
+  if ( mImpl->fieldId() != FieldImpl::CustomField ) return true;
+  
+  return mImpl->key() == field->mImpl->key();
+}
+
+Field *Field::createCustomField( const QString &label, int category,
+                                 const QString &key, const QString &app )
+{
+  Field *field = new Field( new FieldImpl( FieldImpl::CustomField,
+                                           category | CustomCategory,
+                                           label, key, app ) );
+  mCustomFields.append( field );
+
+  return field;
+}
--- kdelibs-3.5.7.orig/kmdi/test/Makefile.in
+++ kdelibs-3.5.7/kmdi/test/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,15 +14,11 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -63,7 +59,14 @@
 @KDE_USE_FINAL_TRUE@kfourchildren_OBJECTS = $(kfourchildren_final_OBJECTS)
 kfourchildren_DEPENDENCIES = $(top_builddir)/kmdi/libkmdi.la \
 	$(top_builddir)/kutils/libkutils.la
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+#>- kfourchildren_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(kfourchildren_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+kfourchildren_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(kfourchildren_LDFLAGS) $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -71,19 +74,21 @@
 #>+ 2
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
-#>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+#>+ 3
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
 CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 3
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(kfourchildren_SOURCES)
 DIST_SOURCES = $(kfourchildren_SOURCES)
 ETAGS = etags
@@ -94,8 +99,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -103,13 +106,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -123,8 +126,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -145,17 +146,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -224,7 +222,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -261,12 +258,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -311,87 +310,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -415,75 +370,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -491,16 +388,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -519,7 +415,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -557,9 +453,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 clean-checkPROGRAMS:
@@ -570,7 +466,7 @@
 	done
 kfourchildren$(EXEEXT): $(kfourchildren_OBJECTS) $(kfourchildren_DEPENDENCIES) 
 	@rm -f kfourchildren$(EXEEXT)
-	$(CXXLINK) $(kfourchildren_LDFLAGS) $(kfourchildren_OBJECTS) $(kfourchildren_LDADD) $(LIBS)
+	$(kfourchildren_LINK) $(kfourchildren_OBJECTS) $(kfourchildren_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -583,22 +479,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mainwidget.Po@am__quote@
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -609,10 +505,6 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -662,22 +554,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -731,7 +622,7 @@
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
@@ -745,12 +636,20 @@
 
 install-data-am:
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -771,19 +670,23 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am
+uninstall-am:
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean \
 	clean-checkPROGRAMS clean-generic clean-libtool ctags \
 	distclean distclean-compile distclean-generic \
 	distclean-libtool distclean-tags distdir dvi dvi-am html \
 	html-am info info-am install install-am install-data \
-	install-data-am install-exec install-exec-am install-info \
-	install-info-am install-man install-strip installcheck \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
 	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-info-am
+	tags uninstall uninstall-am
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- kdelibs-3.5.7.orig/kmdi/Makefile.in
+++ kdelibs-3.5.7/kmdi/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,15 +16,11 @@
 @SET_MAKE@
 
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -79,7 +75,14 @@
 	kmdiguiclient.lo kmdidocumentviewtabwidget.lo kmdifocuslist.lo
 @KDE_USE_FINAL_FALSE@libkmdi_la_OBJECTS = $(libkmdi_la_nofinal_OBJECTS)
 @KDE_USE_FINAL_TRUE@libkmdi_la_OBJECTS = $(libkmdi_la_final_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+#>- libkmdi_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(libkmdi_la_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+libkmdi_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(libkmdi_la_LDFLAGS) $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -87,36 +90,42 @@
 #>+ 2
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
-#>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+#>+ 3
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
 CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 3
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(libkmdi_la_SOURCES)
 DIST_SOURCES = $(libkmdi_la_SOURCES)
 #>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 #>- 	html-recursive info-recursive install-data-recursive \
-#>- 	install-exec-recursive install-info-recursive \
-#>- 	install-recursive installcheck-recursive installdirs-recursive \
-#>- 	pdf-recursive ps-recursive uninstall-info-recursive \
-#>- 	uninstall-recursive
-#>+ 6
+#>- 	install-dvi-recursive install-exec-recursive \
+#>- 	install-html-recursive install-info-recursive \
+#>- 	install-pdf-recursive install-ps-recursive install-recursive \
+#>- 	installcheck-recursive installdirs-recursive pdf-recursive \
+#>- 	ps-recursive uninstall-recursive
+#>+ 7
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	html-recursive info-recursive install-data-recursive \
-	install-exec-recursive install-info-recursive \
-	install-recursive installcheck-recursive installdirs-recursive \
-	pdf-recursive ps-recursive uninstall-info-recursive \
-	uninstall-recursive nmcheck-recursive bcheck-recursive
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive nmcheck-recursive bcheck-recursive
 includeHEADERS_INSTALL = $(INSTALL_HEADER)
 HEADERS = $(include_HEADERS)
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
@@ -126,8 +135,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -135,13 +142,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -155,8 +162,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -177,17 +182,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -256,7 +258,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -293,12 +294,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -343,87 +346,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -447,75 +406,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -523,16 +424,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -559,7 +459,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(srcdir)/../admin/Doxyfile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../admin/Doxyfile.am $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -597,13 +497,13 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
@@ -614,7 +514,7 @@
 
 uninstall-libLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
@@ -629,7 +529,7 @@
 	  rm -f "$${dir}/so_locations"; \
 	done
 libkmdi.la: $(libkmdi_la_OBJECTS) $(libkmdi_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(libdir) $(libkmdi_la_LDFLAGS) $(libkmdi_la_OBJECTS) $(libkmdi_la_LIBADD) $(LIBS)
+	$(libkmdi_la_LINK) -rpath $(libdir) $(libkmdi_la_OBJECTS) $(libkmdi_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -650,22 +550,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kmditoolviewaccessor.Plo@am__quote@
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -675,13 +575,9 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 install-includeHEADERS: $(include_HEADERS)
 	@$(NORMAL_INSTALL)
-	test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"
+	test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)"
 	@list='$(include_HEADERS)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -728,8 +624,7 @@
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
+$(RECURSIVE_CLEAN_TARGETS):
 	@failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
@@ -830,23 +725,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	$(mkdir_p) $(distdir)/../admin
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -860,7 +753,7 @@
 	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
-	    || $(mkdir_p) "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 	    || exit 1; \
 	    distdir=`$(am__cd) $(distdir) && pwd`; \
 	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
@@ -868,6 +761,8 @@
 	      $(MAKE) $(AM_MAKEFLAGS) \
 	        top_distdir="$$top_distdir" \
 	        distdir="$$distdir/$$subdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -878,7 +773,7 @@
 installdirs: installdirs-recursive
 installdirs-am:
 	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-recursive
 install-exec: install-exec-recursive
@@ -918,7 +813,7 @@
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-recursive
 
@@ -932,12 +827,20 @@
 
 install-data-am: install-data-local install-includeHEADERS
 
+install-dvi: install-dvi-recursive
+
 install-exec-am: install-libLTLIBRARIES
 
+install-html: install-html-recursive
+
 install-info: install-info-recursive
 
 install-man:
 
+install-pdf: install-pdf-recursive
+
+install-ps: install-ps-recursive
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
@@ -958,27 +861,29 @@
 
 ps-am:
 
-uninstall-am: uninstall-includeHEADERS uninstall-info-am \
-	uninstall-libLTLIBRARIES uninstall-local
+uninstall-am: uninstall-includeHEADERS uninstall-libLTLIBRARIES \
+	uninstall-local
 
-uninstall-info: uninstall-info-recursive
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+	install-strip
 
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-	clean clean-generic clean-libLTLIBRARIES clean-libtool \
-	clean-recursive ctags ctags-recursive distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-recursive distclean-tags distdir dvi dvi-am html \
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+	all all-am check check-am clean clean-generic \
+	clean-libLTLIBRARIES clean-libtool ctags ctags-recursive \
+	distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
 	html-am info info-am install install-am install-data \
-	install-data-am install-data-local install-exec \
-	install-exec-am install-includeHEADERS install-info \
-	install-info-am install-libLTLIBRARIES install-man \
-	install-strip installcheck installcheck-am installdirs \
-	installdirs-am maintainer-clean maintainer-clean-generic \
-	maintainer-clean-recursive mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
-	pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
-	uninstall-includeHEADERS uninstall-info-am \
-	uninstall-libLTLIBRARIES uninstall-local
+	install-data-am install-data-local install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-includeHEADERS install-info install-info-am \
+	install-libLTLIBRARIES install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs installdirs-am maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags tags-recursive uninstall uninstall-am \
+	uninstall-includeHEADERS uninstall-libLTLIBRARIES \
+	uninstall-local
 
 apidox-am-yes:
 	@if test \! -d "$(top_srcdir)/doc/common/" && test -z "$$DOXDATA" ; then \
--- kdelibs-3.5.7.orig/kmdi/kmdi/Makefile.in
+++ kdelibs-3.5.7/kmdi/kmdi/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,15 +16,11 @@
 @SET_MAKE@
 
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -75,7 +71,14 @@
 	toolviewaccessor.lo guiclient.lo tabwidget.lo
 @KDE_USE_FINAL_FALSE@libkmdi2_la_OBJECTS = $(libkmdi2_la_nofinal_OBJECTS)
 @KDE_USE_FINAL_TRUE@libkmdi2_la_OBJECTS = $(libkmdi2_la_final_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+#>- libkmdi2_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(libkmdi2_la_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+libkmdi2_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(libkmdi2_la_LDFLAGS) $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -83,19 +86,21 @@
 #>+ 2
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 #>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
 CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 3
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(libkmdi2_la_SOURCES)
 DIST_SOURCES = $(libkmdi2_la_SOURCES)
 kmdiincludeHEADERS_INSTALL = $(INSTALL_HEADER)
@@ -108,8 +113,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -117,13 +120,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -137,8 +140,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -159,17 +160,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -238,7 +236,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -275,12 +272,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -325,87 +324,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -429,75 +384,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -505,16 +402,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -534,7 +430,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(srcdir)/../../admin/Doxyfile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../admin/Doxyfile.am $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -572,13 +468,13 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
@@ -589,7 +485,7 @@
 
 uninstall-libLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
@@ -604,7 +500,7 @@
 	  rm -f "$${dir}/so_locations"; \
 	done
 libkmdi2.la: $(libkmdi2_la_OBJECTS) $(libkmdi2_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(libdir) $(libkmdi2_la_LDFLAGS) $(libkmdi2_la_OBJECTS) $(libkmdi2_la_LIBADD) $(LIBS)
+	$(libkmdi2_la_LINK) -rpath $(libdir) $(libkmdi2_la_OBJECTS) $(libkmdi2_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -619,22 +515,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/toolviewaccessor.Plo@am__quote@
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -644,13 +540,9 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 install-kmdiincludeHEADERS: $(kmdiinclude_HEADERS)
 	@$(NORMAL_INSTALL)
-	test -z "$(kmdiincludedir)" || $(mkdir_p) "$(DESTDIR)$(kmdiincludedir)"
+	test -z "$(kmdiincludedir)" || $(MKDIR_P) "$(DESTDIR)$(kmdiincludedir)"
 	@list='$(kmdiinclude_HEADERS)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -715,23 +607,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	$(mkdir_p) $(distdir)/../../admin
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -747,7 +637,7 @@
 all-am: Makefile $(LTLIBRARIES) $(HEADERS)
 installdirs:
 	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(kmdiincludedir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -787,7 +677,7 @@
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
@@ -801,12 +691,20 @@
 
 install-data-am: install-data-local install-kmdiincludeHEADERS
 
+install-dvi: install-dvi-am
+
 install-exec-am: install-libLTLIBRARIES
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -827,23 +725,26 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-kmdiincludeHEADERS \
-	uninstall-libLTLIBRARIES uninstall-local
+uninstall-am: uninstall-kmdiincludeHEADERS uninstall-libLTLIBRARIES \
+	uninstall-local
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-libLTLIBRARIES clean-libtool ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
 	distclean-tags distdir dvi dvi-am html html-am info info-am \
 	install install-am install-data install-data-am \
-	install-data-local install-exec install-exec-am install-info \
+	install-data-local install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
 	install-info-am install-kmdiincludeHEADERS \
-	install-libLTLIBRARIES install-man install-strip installcheck \
+	install-libLTLIBRARIES install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
 	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-info-am \
-	uninstall-kmdiincludeHEADERS uninstall-libLTLIBRARIES \
-	uninstall-local
+	tags uninstall uninstall-am uninstall-kmdiincludeHEADERS \
+	uninstall-libLTLIBRARIES uninstall-local
 
 apidox-am-yes:
 	@if test \! -d "$(top_srcdir)/doc/common/" && test -z "$$DOXDATA" ; then \
--- kdelibs-3.5.7.orig/configure.in
+++ kdelibs-3.5.7/configure.in
@@ -23,6 +23,8 @@
 dnl Automake doc recommends to do this only here. (Janos)
 AM_INIT_AUTOMAKE(kdelibs, "3.5.7") dnl searches for some needed programs
 
+AM_MAINTAINER_MODE
+
 AC_PROG_INSTALL
 
 dnl generate the config header
@@ -50,7 +52,7 @@
 KDE_CHECK_STL
 AC_HEADER_DIRENT
 AC_HEADER_STDC
-AC_CHECK_HEADERS(sys/param.h sys/mman.h sys/time.h sysent.h strings.h sys/stat.h sys/select.h paths.h malloc.h limits.h sys/soundcard.h dlfcn.h termios.h)
+AC_CHECK_HEADERS(sys/param.h sys/mman.h sys/time.h sysent.h strings.h sys/stat.h sys/select.h paths.h malloc.h limits.h sys/soundcard.h dlfcn.h termios.h sys/prctl.h)
 
 AC_ARG_WITH(acl,
   [AC_HELP_STRING(--with-acl,
@@ -166,7 +168,7 @@
 AC_CHECK_MKSTEMPS
 AC_CHECK_MKSTEMP
 AC_CHECK_MKDTEMP
-AC_CHECK_FUNCS(strtoll socket seteuid setegid strfmon stpcpy gettimeofday readdir_r setpriority)
+AC_CHECK_FUNCS(strtoll socket seteuid setegid strfmon stpcpy gettimeofday readdir_r setpriority tcgetattr tcsetattr)
 
 AH_BOTTOM([
 /* provide a definition for a 32 bit entity, usable as a typedef, possibly
@@ -509,42 +511,21 @@
 
 #MIN_CONFIG
 
-AC_ARG_ENABLE(dnssd, [  --disable-dnssd     don't require libdns_sd (browsing and publishing DNS-SD services will not be possible) ],  with_dnssd=$enableval, with_dnssd=yes)
-if test "$with_dnssd" = "yes"; then
-AC_MSG_CHECKING(for DNS-SD support)
-save_dnssdtest_LIBS="$LIBS"
-save_dnssdtest_LDFLAGS="$LDFLAGS"
-save_dnssdtest_CPPFLAGS="$CPPFLAGS"
-LDFLAGS="$all_libraries $LDFLAGS"
-CPPFLAGS="$CPPFLAGS $all_includes"
-case $host_os in
-  darwin*) LIBS="" ;;
-  *) LIBS="-ldns_sd" ;;
-esac
-have_libdns_sd="no"
-AC_TRY_LINK(	[
-			#include <dns_sd.h>
-		],[
-			DNSServiceRefDeallocate( (DNSServiceRef) 0);
-			TXTRecordDeallocate( (TXTRecordRef*) 0);
-		],[
-			AC_DEFINE(HAVE_DNSSD,1,[Define if dns-sd is available])
-			case $host_os in
-				darwin*) LIB_DNSSD="" ;;
-				*) LIB_DNSSD="-ldns_sd" ;;
-			esac
-			have_libdns_sd="yes"
-			AC_MSG_RESULT(yes)
-		],[
-			AC_MSG_RESULT(no)
-                        LIB_DNSSD=""
-])
-CPPFLAGS=$save_dnssdtest_CPPFLAGS
-LDFLAGS=$save_dnssdtest_LDFLAGS
-LIBS=$save_dnssdtest_LIBS
+# Check for pkg-config manually first, as if its not installed the
+# PKG_PROG_PKG_CONFIG macro won't be defined.
+m4_pattern_allow(PKG_CONFIG_MIN_VERSION)
+AC_CHECK_PROG(have_pkg_config, pkg-config, yes, no)
+
+if test x"$have_pkg_config" == xno; then
+    AC_MSG_ERROR(pkg-config is required to install this program)
 fi
-AC_SUBST(LIB_DNSSD)
-AM_CONDITIONAL(HAVE_DNSSD, test "$have_libdns_sd" = "yes")
+
+PKG_PROG_PKG_CONFIG
+
+PKG_CHECK_MODULES( AVAHI, [ avahi-qt3 >= 0.4 , avahi-client >= 0.4 ])
+AC_SUBST(AVAHI_CFLAGS)
+AC_SUBST(AVAHI_LIBS)
+PKG_CHECK_EXISTS( [ avahi-client >= 0.6], AC_DEFINE(AVAHI_API_0_6,1,[Avahi API 0.6] ) )
 dnl =======================================================
 dnl FILE: ./kate/part/configure.in.in
 dnl =======================================================
--- kdelibs-3.5.7.orig/dnssd/Makefile.in
+++ kdelibs-3.5.7/dnssd/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,15 +16,11 @@
 @SET_MAKE@
 
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -76,7 +72,14 @@
 	publicservice.lo query.lo domainbrowser.lo servicebrowser.lo settings.lo
 @KDE_USE_FINAL_FALSE@libkdnssd_la_OBJECTS = $(libkdnssd_la_nofinal_OBJECTS)
 @KDE_USE_FINAL_TRUE@libkdnssd_la_OBJECTS = $(libkdnssd_la_final_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+#>- libkdnssd_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(libkdnssd_la_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+libkdnssd_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(libkdnssd_la_LDFLAGS) $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -84,19 +87,21 @@
 #>+ 2
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 #>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
 CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 3
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(libkdnssd_la_SOURCES)
 DIST_SOURCES = $(libkdnssd_la_SOURCES)
 dnssdincludeHEADERS_INSTALL = $(INSTALL_HEADER)
@@ -109,8 +114,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -118,13 +121,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -138,8 +141,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -160,17 +161,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -239,7 +237,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -276,12 +273,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -326,87 +325,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -430,75 +385,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -506,16 +403,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -523,7 +419,7 @@
 xdg_menudir = @xdg_menudir@
 
 # set the include path for X, qt and KDE
-INCLUDES = -I$(top_srcdir) $(all_includes)
+INCLUDES = -I$(top_srcdir) $(all_includes) $(AVAHI_CFLAGS)
 
 # these are the headers for your project
 noinst_HEADERS = sdevent.h
@@ -541,7 +437,7 @@
 dnssdinclude_HEADERS = domainbrowser.h query.h remoteservice.h \
 	publicservice.h servicebase.h servicebrowser.h settings.h
 
-libkdnssd_la_LIBADD = ../kdecore/libkdecore.la $(LIB_DNSSD)
+libkdnssd_la_LIBADD = ../kdecore/libkdecore.la $(AVAHI_LIBS)
 libkdnssd_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -version-info 1:0
 #>- all: all-am
 #>+ 1
@@ -549,7 +445,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(srcdir)/../admin/Doxyfile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../admin/Doxyfile.am $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -587,13 +483,13 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
@@ -604,7 +500,7 @@
 
 uninstall-libLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
@@ -619,7 +515,7 @@
 	  rm -f "$${dir}/so_locations"; \
 	done
 libkdnssd.la: $(libkdnssd_la_OBJECTS) $(libkdnssd_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(libdir) $(libkdnssd_la_LDFLAGS) $(libkdnssd_la_OBJECTS) $(libkdnssd_la_LIBADD) $(LIBS)
+	$(libkdnssd_la_LINK) -rpath $(libdir) $(libkdnssd_la_OBJECTS) $(libkdnssd_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -636,22 +532,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/servicebrowser.Plo@am__quote@
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -661,13 +557,9 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 install-dnssdincludeHEADERS: $(dnssdinclude_HEADERS)
 	@$(NORMAL_INSTALL)
-	test -z "$(dnssdincludedir)" || $(mkdir_p) "$(DESTDIR)$(dnssdincludedir)"
+	test -z "$(dnssdincludedir)" || $(MKDIR_P) "$(DESTDIR)$(dnssdincludedir)"
 	@list='$(dnssdinclude_HEADERS)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -732,23 +624,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	$(mkdir_p) $(distdir)/../admin
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -764,7 +654,7 @@
 all-am: Makefile $(LTLIBRARIES) $(HEADERS)
 installdirs:
 	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(dnssdincludedir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -804,7 +694,7 @@
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
@@ -818,12 +708,20 @@
 
 install-data-am: install-data-local install-dnssdincludeHEADERS
 
+install-dvi: install-dvi-am
+
 install-exec-am: install-libLTLIBRARIES
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -844,22 +742,26 @@
 
 ps-am:
 
-uninstall-am: uninstall-dnssdincludeHEADERS uninstall-info-am \
-	uninstall-libLTLIBRARIES uninstall-local
+uninstall-am: uninstall-dnssdincludeHEADERS uninstall-libLTLIBRARIES \
+	uninstall-local
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-libLTLIBRARIES clean-libtool ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
 	distclean-tags distdir dvi dvi-am html html-am info info-am \
 	install install-am install-data install-data-am \
-	install-data-local install-dnssdincludeHEADERS install-exec \
-	install-exec-am install-info install-info-am \
-	install-libLTLIBRARIES install-man install-strip installcheck \
+	install-data-local install-dnssdincludeHEADERS install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am \
+	install-libLTLIBRARIES install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
 	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 	tags uninstall uninstall-am uninstall-dnssdincludeHEADERS \
-	uninstall-info-am uninstall-libLTLIBRARIES uninstall-local
+	uninstall-libLTLIBRARIES uninstall-local
 
 apidox-am-yes:
 	@if test \! -d "$(top_srcdir)/doc/common/" && test -z "$$DOXDATA" ; then \
--- kdelibs-3.5.7.orig/knewstuff/Makefile.in
+++ kdelibs-3.5.7/knewstuff/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -18,15 +18,11 @@
 
 
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -85,6 +81,13 @@
 	security.lo
 @KDE_USE_FINAL_FALSE@libknewstuff_la_OBJECTS = $(libknewstuff_la_nofinal_OBJECTS)
 @KDE_USE_FINAL_TRUE@libknewstuff_la_OBJECTS = $(libknewstuff_la_final_OBJECTS)
+#>- libknewstuff_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(libknewstuff_la_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+libknewstuff_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(libknewstuff_la_LDFLAGS) $(LDFLAGS) -o $@
 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(bin_PROGRAMS)
 am_ghns_OBJECTS = ghns.$(OBJEXT)
@@ -92,17 +95,38 @@
 #>+ 1
 ghns_OBJECTS = ghns.$(OBJEXT)
 ghns_DEPENDENCIES = libknewstuff.la
+#>- ghns_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
+#>- 	$(ghns_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+ghns_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
+	$(ghns_LDFLAGS) $(LDFLAGS) -o $@
 am_khotnewstuff_OBJECTS = khotnewstuff.$(OBJEXT)
 #>- khotnewstuff_OBJECTS = $(am_khotnewstuff_OBJECTS)
 #>+ 1
 khotnewstuff_OBJECTS = khotnewstuff.$(OBJEXT)
 khotnewstuff_DEPENDENCIES = libknewstuff.la
+#>- khotnewstuff_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(khotnewstuff_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+khotnewstuff_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(khotnewstuff_LDFLAGS) $(LDFLAGS) -o $@
 am_testnewstuff_OBJECTS = testnewstuff.$(OBJEXT)
 #>- testnewstuff_OBJECTS = $(am_testnewstuff_OBJECTS)
 #>+ 1
 testnewstuff_OBJECTS = testnewstuff.$(OBJEXT)
 testnewstuff_DEPENDENCIES = libknewstuff.la
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+#>- testnewstuff_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(testnewstuff_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+testnewstuff_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(testnewstuff_LDFLAGS) $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -110,19 +134,21 @@
 #>+ 2
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
-#>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+#>+ 3
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
 CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 3
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(libknewstuff_la_SOURCES) $(ghns_SOURCES) \
 	$(khotnewstuff_SOURCES) $(testnewstuff_SOURCES)
 DIST_SOURCES = $(libknewstuff_la_SOURCES) $(ghns_SOURCES) \
@@ -140,8 +166,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -149,13 +173,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -169,8 +193,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -191,17 +213,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -270,7 +289,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -307,12 +325,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -357,87 +377,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -461,75 +437,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -537,16 +455,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -583,7 +500,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(srcdir)/../admin/Doxyfile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../admin/Doxyfile.am $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -621,13 +538,13 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
@@ -638,7 +555,7 @@
 
 uninstall-libLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
@@ -653,10 +570,10 @@
 	  rm -f "$${dir}/so_locations"; \
 	done
 libknewstuff.la: $(libknewstuff_la_OBJECTS) $(libknewstuff_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(libdir) $(libknewstuff_la_LDFLAGS) $(libknewstuff_la_OBJECTS) $(libknewstuff_la_LIBADD) $(LIBS)
+	$(libknewstuff_la_LINK) -rpath $(libdir) $(libknewstuff_la_OBJECTS) $(libknewstuff_la_LIBADD) $(LIBS)
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
+	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
 	  if test -f $$p \
@@ -684,13 +601,13 @@
 	done
 ghns$(EXEEXT): $(ghns_OBJECTS) $(ghns_DEPENDENCIES) 
 	@rm -f ghns$(EXEEXT)
-	$(CXXLINK) $(ghns_LDFLAGS) $(ghns_OBJECTS) $(ghns_LDADD) $(LIBS)
+	$(ghns_LINK) $(ghns_OBJECTS) $(ghns_LDADD) $(LIBS)
 khotnewstuff$(EXEEXT): $(khotnewstuff_OBJECTS) $(khotnewstuff_DEPENDENCIES) 
 	@rm -f khotnewstuff$(EXEEXT)
-	$(CXXLINK) $(khotnewstuff_LDFLAGS) $(khotnewstuff_OBJECTS) $(khotnewstuff_LDADD) $(LIBS)
+	$(khotnewstuff_LINK) $(khotnewstuff_OBJECTS) $(khotnewstuff_LDADD) $(LIBS)
 testnewstuff$(EXEEXT): $(testnewstuff_OBJECTS) $(testnewstuff_DEPENDENCIES) 
 	@rm -f testnewstuff$(EXEEXT)
-	$(CXXLINK) $(testnewstuff_LDFLAGS) $(testnewstuff_OBJECTS) $(testnewstuff_LDADD) $(LIBS)
+	$(testnewstuff_LINK) $(testnewstuff_OBJECTS) $(testnewstuff_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -714,22 +631,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/uploaddialog.Plo@am__quote@
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -739,13 +656,9 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 install-kde_confDATA: $(kde_conf_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(kde_confdir)" || $(mkdir_p) "$(DESTDIR)$(kde_confdir)"
+	test -z "$(kde_confdir)" || $(MKDIR_P) "$(DESTDIR)$(kde_confdir)"
 	@list='$(kde_conf_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -762,7 +675,7 @@
 	done
 install-knewstuffDATA: $(knewstuff_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(knewstuffdir)" || $(mkdir_p) "$(DESTDIR)$(knewstuffdir)"
+	test -z "$(knewstuffdir)" || $(MKDIR_P) "$(DESTDIR)$(knewstuffdir)"
 	@list='$(knewstuff_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -779,7 +692,7 @@
 	done
 install-knsHEADERS: $(kns_HEADERS)
 	@$(NORMAL_INSTALL)
-	test -z "$(knsdir)" || $(mkdir_p) "$(DESTDIR)$(knsdir)"
+	test -z "$(knsdir)" || $(MKDIR_P) "$(DESTDIR)$(knsdir)"
 	@list='$(kns_HEADERS)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -844,23 +757,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	$(mkdir_p) $(distdir)/../admin
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -878,7 +789,7 @@
 
 installdirs:
 	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(kde_confdir)" "$(DESTDIR)$(knewstuffdir)" "$(DESTDIR)$(knsdir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -918,7 +829,7 @@
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
@@ -936,12 +847,20 @@
 install-data-am: install-kde-icons  install-data-local install-kde_confDATA \
 	install-knewstuffDATA install-knsHEADERS
 
+install-dvi: install-dvi-am
+
 install-exec-am: install-binPROGRAMS install-libLTLIBRARIES
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -962,30 +881,33 @@
 
 ps-am:
 
-#>- uninstall-am: uninstall-binPROGRAMS uninstall-info-am \
-#>- 	uninstall-kde_confDATA uninstall-knewstuffDATA \
-#>- 	uninstall-knsHEADERS uninstall-libLTLIBRARIES uninstall-local
+#>- uninstall-am: uninstall-binPROGRAMS uninstall-kde_confDATA \
+#>- 	uninstall-knewstuffDATA uninstall-knsHEADERS \
+#>- 	uninstall-libLTLIBRARIES uninstall-local
 #>+ 3
-uninstall-am: uninstall-kde-icons  uninstall-binPROGRAMS uninstall-info-am \
-	uninstall-kde_confDATA uninstall-knewstuffDATA \
-	uninstall-knsHEADERS uninstall-libLTLIBRARIES uninstall-local
+uninstall-am: uninstall-kde-icons  uninstall-binPROGRAMS uninstall-kde_confDATA \
+	uninstall-knewstuffDATA uninstall-knsHEADERS \
+	uninstall-libLTLIBRARIES uninstall-local
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
 	clean-generic clean-libLTLIBRARIES clean-libtool ctags \
 	distclean distclean-compile distclean-generic \
 	distclean-libtool distclean-tags distdir dvi dvi-am html \
 	html-am info info-am install install-am install-binPROGRAMS \
-	install-data install-data-am install-data-local install-exec \
-	install-exec-am install-info install-info-am \
+	install-data install-data-am install-data-local install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am \
 	install-kde_confDATA install-knewstuffDATA install-knsHEADERS \
-	install-libLTLIBRARIES install-man install-strip installcheck \
+	install-libLTLIBRARIES install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
 	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 	tags uninstall uninstall-am uninstall-binPROGRAMS \
-	uninstall-info-am uninstall-kde_confDATA \
-	uninstall-knewstuffDATA uninstall-knsHEADERS \
-	uninstall-libLTLIBRARIES uninstall-local
+	uninstall-kde_confDATA uninstall-knewstuffDATA \
+	uninstall-knsHEADERS uninstall-libLTLIBRARIES uninstall-local
 
 apidox-am-yes:
 	@if test \! -d "$(top_srcdir)/doc/common/" && test -z "$$DOXDATA" ; then \
--- kdelibs-3.5.7.orig/kjs/Makefile.in
+++ kdelibs-3.5.7/kjs/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -34,15 +34,11 @@
 #    Boston, MA 02110-1301, USA.
 
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -106,6 +102,13 @@
 	reference_list.lo scope_chain.lo dtoa.lo
 @KDE_USE_FINAL_FALSE@libkjs_la_OBJECTS = $(libkjs_la_nofinal_OBJECTS)
 @KDE_USE_FINAL_TRUE@libkjs_la_OBJECTS = $(libkjs_la_final_OBJECTS)
+#>- libkjs_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(libkjs_la_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+libkjs_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(libkjs_la_LDFLAGS) $(LDFLAGS) -o $@
 am_testkjs_OBJECTS = testkjs.$(OBJEXT)
 #>- testkjs_OBJECTS = $(am_testkjs_OBJECTS)
 #>+ 1
@@ -116,7 +119,14 @@
 #>+ 1
 testkjs_static_OBJECTS = testkjs.$(OBJEXT)
 testkjs_static_DEPENDENCIES = $(am__DEPENDENCIES_1) libkjs.la
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I.
+#>- testkjs_static_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(testkjs_static_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+testkjs_static_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(testkjs_static_LDFLAGS) $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -124,19 +134,21 @@
 #>+ 2
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 #>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
 CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 3
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(libkjs_la_SOURCES) $(testkjs_SOURCES) \
 	$(testkjs_static_SOURCES)
 DIST_SOURCES = $(libkjs_la_SOURCES) $(testkjs_SOURCES) \
@@ -151,8 +163,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -160,13 +170,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -180,8 +190,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -202,17 +210,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -281,7 +286,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -318,12 +322,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -368,87 +374,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -472,75 +434,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -548,16 +452,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -590,10 +493,7 @@
 		 debugger.h array_instance.h context.h dtoa.h regexp.h
 
 @include_VERSION_SCRIPT_TRUE@VSCRIPT = -Wl,--version-script=$(srcdir)/libkjs.map
-#>- libkjs_la_LDFLAGS = -version-info 3:0:2 -no-undefined $(VSCRIPT) \
-#>-           $(USER_LDFLAGS) $(all_libraries)
-#>+ 2
-libkjs_la_LDFLAGS = -version-info 3:0:2 -no-undefined $(KDE_NO_UNDEFINED) $(VSCRIPT) \
+libkjs_la_LDFLAGS = -version-info 3:0:2 -no-undefined $(VSCRIPT) \
           $(USER_LDFLAGS) $(all_libraries)
 
 libkjs_la_LIBADD = -lm $(LIBPCRE)
@@ -614,7 +514,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(srcdir)/../admin/Doxyfile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../admin/Doxyfile.am $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -652,21 +552,21 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 global.h: stamp-h5
 	@if test ! -f $@; then \
 	  rm -f stamp-h5; \
-	  $(MAKE) stamp-h5; \
+	  $(MAKE) $(AM_MAKEFLAGS) stamp-h5; \
 	else :; fi
 
 stamp-h5: $(srcdir)/global.h.in $(top_builddir)/config.status
 	@rm -f stamp-h5
 	cd $(top_builddir) && $(SHELL) ./config.status kjs/global.h
-$(srcdir)/global.h.in:  $(am__configure_deps) 
+$(srcdir)/global.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) 
 	cd $(top_srcdir) && $(AUTOHEADER)
 	rm -f stamp-h5
 	touch $@
@@ -675,7 +575,7 @@
 	-rm -f global.h stamp-h5
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
@@ -686,7 +586,7 @@
 
 uninstall-libLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
@@ -700,11 +600,8 @@
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
-#>- libkjs.la: $(libkjs_la_OBJECTS) $(libkjs_la_DEPENDENCIES) 
-#>+ 2
-@KDE_USE_CLOSURE_TRUE@libkjs.la: libkjs.la.closure $(libkjs_la_OBJECTS) $(libkjs_la_DEPENDENCIES) 
-@KDE_USE_CLOSURE_FALSE@libkjs.la: $(libkjs_la_OBJECTS) $(libkjs_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(libdir) $(libkjs_la_LDFLAGS) $(libkjs_la_OBJECTS) $(libkjs_la_LIBADD) $(LIBS)
+libkjs.la: $(libkjs_la_OBJECTS) $(libkjs_la_DEPENDENCIES) 
+	$(libkjs_la_LINK) -rpath $(libdir) $(libkjs_la_OBJECTS) $(libkjs_la_LIBADD) $(LIBS)
 
 clean-checkPROGRAMS:
 	@list='$(check_PROGRAMS)'; for p in $$list; do \
@@ -714,10 +611,10 @@
 	done
 testkjs$(EXEEXT): $(testkjs_OBJECTS) $(testkjs_DEPENDENCIES) 
 	@rm -f testkjs$(EXEEXT)
-	$(CXXLINK) $(testkjs_LDFLAGS) $(testkjs_OBJECTS) $(testkjs_LDADD) $(LIBS)
+	$(CXXLINK) $(testkjs_OBJECTS) $(testkjs_LDADD) $(LIBS)
 testkjs_static$(EXEEXT): $(testkjs_static_OBJECTS) $(testkjs_static_DEPENDENCIES) 
 	@rm -f testkjs_static$(EXEEXT)
-	$(CXXLINK) $(testkjs_static_LDFLAGS) $(testkjs_static_OBJECTS) $(testkjs_static_LDADD) $(LIBS)
+	$(testkjs_static_LINK) $(testkjs_static_OBJECTS) $(testkjs_static_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -760,22 +657,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/value.Plo@am__quote@
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -785,13 +682,9 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 install-kjsincludeHEADERS: $(kjsinclude_HEADERS)
 	@$(NORMAL_INSTALL)
-	test -z "$(kjsincludedir)" || $(mkdir_p) "$(DESTDIR)$(kjsincludedir)"
+	test -z "$(kjsincludedir)" || $(MKDIR_P) "$(DESTDIR)$(kjsincludedir)"
 	@list='$(kjsinclude_HEADERS)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -856,23 +749,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	$(mkdir_p) $(distdir)/../admin
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -889,7 +780,7 @@
 all-am: Makefile $(LTLIBRARIES) $(HEADERS) global.h
 installdirs:
 	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(kjsincludedir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -923,14 +814,14 @@
 #>- clean-am: clean-checkPROGRAMS clean-generic clean-libLTLIBRARIES \
 #>- 	clean-libtool mostlyclean-am
 #>+ 2
-clean-am: clean-closures clean-bcheck clean-final  clean-checkPROGRAMS clean-generic clean-libLTLIBRARIES \
+clean-am: clean-bcheck clean-final  clean-checkPROGRAMS clean-generic clean-libLTLIBRARIES \
 	clean-libtool mostlyclean-am
 
 distclean: distclean-am
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-hdr distclean-libtool distclean-tags
+	distclean-hdr distclean-tags
 
 dvi: dvi-am
 
@@ -944,12 +835,20 @@
 
 install-data-am: install-data-local install-kjsincludeHEADERS
 
+install-dvi: install-dvi-am
+
 install-exec-am: install-libLTLIBRARIES
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -970,8 +869,10 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-kjsincludeHEADERS \
-	uninstall-libLTLIBRARIES uninstall-local
+uninstall-am: uninstall-kjsincludeHEADERS uninstall-libLTLIBRARIES \
+	uninstall-local
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean \
 	clean-checkPROGRAMS clean-generic clean-libLTLIBRARIES \
@@ -979,15 +880,16 @@
 	distclean-generic distclean-hdr distclean-libtool \
 	distclean-tags distdir dvi dvi-am html html-am info info-am \
 	install install-am install-data install-data-am \
-	install-data-local install-exec install-exec-am install-info \
+	install-data-local install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
 	install-info-am install-kjsincludeHEADERS \
-	install-libLTLIBRARIES install-man install-strip installcheck \
+	install-libLTLIBRARIES install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
 	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-info-am \
-	uninstall-kjsincludeHEADERS uninstall-libLTLIBRARIES \
-	uninstall-local
+	tags uninstall uninstall-am uninstall-kjsincludeHEADERS \
+	uninstall-libLTLIBRARIES uninstall-local
 
 
 parser: $(srcdir)/grammar.y
@@ -1117,22 +1019,9 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
-#>+ 8
-libkjs.la.closure: $(libkjs_la_OBJECTS) $(libkjs_la_DEPENDENCIES)
-	@echo "int main() {return 0;}" > libkjs_la_closure.cpp
-	@$(LTCXXCOMPILE) -c libkjs_la_closure.cpp
-	$(CXXLINK) libkjs_la_closure.lo $(libkjs_la_LDFLAGS) $(libkjs_la_OBJECTS) $(libkjs_la_LIBADD) $(LIBS)
-	@rm -f libkjs_la_closure.* libkjs.la.closure
-	@echo "timestamp" > libkjs.la.closure
-
-
 #>+ 2
 KDE_DIST=test.js create_hash_table Makefile.in global.h.in configure.in.in kjs-devel-gdb keywords.table DESIGN.ideas libkjs.map Makefile.am 
 
-#>+ 3
-clean-closures:
-	-rm -f  libkjs.la.closure
-
 #>+ 2
 docs-am:
 
--- kdelibs-3.5.7.orig/kdesu/Makefile.in
+++ kdelibs-3.5.7/kdesu/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -17,15 +17,11 @@
 
 
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -77,6 +73,13 @@
 	stub.lo kdesu_pty.lo
 @KDE_USE_FINAL_FALSE@libkdesu_la_OBJECTS = $(libkdesu_la_nofinal_OBJECTS)
 @KDE_USE_FINAL_TRUE@libkdesu_la_OBJECTS = $(libkdesu_la_final_OBJECTS)
+#>- libkdesu_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(libkdesu_la_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+libkdesu_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(libkdesu_la_LDFLAGS) $(LDFLAGS) -o $@
 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(bin_PROGRAMS)
 am_kdesu_stub_OBJECTS = kdesu_stub.$(OBJEXT)
@@ -84,35 +87,41 @@
 #>+ 1
 kdesu_stub_OBJECTS = kdesu_stub.$(OBJEXT)
 kdesu_stub_DEPENDENCIES = ../kdecore/libkdefakes.la
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+kdesu_stub_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(kdesu_stub_LDFLAGS) $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 #>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 #>+ 2
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 #>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
 CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 3
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(libkdesu_la_SOURCES) $(kdesu_stub_SOURCES)
 DIST_SOURCES = $(libkdesu_la_SOURCES) $(kdesu_stub_SOURCES)
 kdesuHEADERS_INSTALL = $(INSTALL_HEADER)
@@ -125,8 +134,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -134,13 +141,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -154,8 +161,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -176,17 +181,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -255,7 +257,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -292,12 +293,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -342,87 +345,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -446,75 +405,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -522,16 +423,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -540,9 +440,7 @@
 INCLUDES = -I$(top_srcdir)/kio/ $(all_includes)
 lib_LTLIBRARIES = libkdesu.la
 libkdesu_la_SOURCES = client.cpp process.cpp kcookie.cpp su.cpp ssh.cpp stub.cpp kdesu_pty.cpp
-#>- libkdesu_la_LDFLAGS = -version-info 6:0:2 -no-undefined $(all_libraries) 
-#>+ 1
-libkdesu_la_LDFLAGS = -version-info 6:0:2 -no-undefined $(KDE_NO_UNDEFINED) $(all_libraries) 
+libkdesu_la_LDFLAGS = -version-info 6:0:2 -no-undefined $(all_libraries) 
 libkdesu_la_LIBADD = $(LIB_KDECORE) $(LIBUTIL)
 libkdesu_la_NMCHECK = $(srcdir)/libkdesu.nmcheck
 libkdesu_la_NMCHECKWEAK = $(srcdir)/libkdesu_weak.nmcheck $(top_srcdir)/kdecore/libkdecore_weak.nmcheck \
@@ -559,7 +457,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .c .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -597,13 +495,13 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
@@ -614,7 +512,7 @@
 
 uninstall-libLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
@@ -628,17 +526,11 @@
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
-#>- libkdesu.la: $(libkdesu_la_OBJECTS) $(libkdesu_la_DEPENDENCIES) 
-#>+ 2
-@KDE_USE_CLOSURE_TRUE@libkdesu.la: libkdesu.la.closure $(libkdesu_la_OBJECTS) $(libkdesu_la_DEPENDENCIES) 
-@KDE_USE_CLOSURE_FALSE@libkdesu.la: $(libkdesu_la_OBJECTS) $(libkdesu_la_DEPENDENCIES) 
-#>- 	$(CXXLINK) -rpath $(libdir) $(libkdesu_la_LDFLAGS) $(libkdesu_la_OBJECTS) $(libkdesu_la_LIBADD) $(LIBS)
-#>+ 2
-	$(CXXLINK) -rpath $(libdir) $(libkdesu_la_LDFLAGS) $(libkdesu_la_OBJECTS) $(libkdesu_la_LIBADD) $(LIBS)
-@KDE_USE_NMCHECK_TRUE@	@$(MAKE) $(AM_MAKEFLAGS) nmcheck_libkdesu.la || ( rm -f libkdesu.la; exit 1 )
+libkdesu.la: $(libkdesu_la_OBJECTS) $(libkdesu_la_DEPENDENCIES) 
+	$(libkdesu_la_LINK) -rpath $(libdir) $(libkdesu_la_OBJECTS) $(libkdesu_la_LIBADD) $(LIBS)
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
+	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
 	  if test -f $$p \
@@ -666,7 +558,7 @@
 	done
 kdesu_stub$(EXEEXT): $(kdesu_stub_OBJECTS) $(kdesu_stub_DEPENDENCIES) 
 	@rm -f kdesu_stub$(EXEEXT)
-	$(LINK) $(kdesu_stub_LDFLAGS) $(kdesu_stub_OBJECTS) $(kdesu_stub_LDADD) $(LIBS)
+	$(kdesu_stub_LINK) $(kdesu_stub_OBJECTS) $(kdesu_stub_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -684,43 +576,43 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/su.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -730,13 +622,9 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 install-kdesuHEADERS: $(kdesu_HEADERS)
 	@$(NORMAL_INSTALL)
-	test -z "$(kdesudir)" || $(mkdir_p) "$(DESTDIR)$(kdesudir)"
+	test -z "$(kdesudir)" || $(MKDIR_P) "$(DESTDIR)$(kdesudir)"
 	@list='$(kdesu_HEADERS)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -801,23 +689,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	$(mkdir_p) $(distdir)/../admin
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -835,7 +721,7 @@
 
 installdirs:
 	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(kdesudir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -868,14 +754,14 @@
 #>- clean-am: clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \
 #>- 	clean-libtool mostlyclean-am
 #>+ 2
-clean-am: clean-closures clean-bcheck clean-final  clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \
+clean-am: clean-bcheck clean-final  clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \
 	clean-libtool mostlyclean-am
 
 distclean: distclean-am
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
@@ -891,12 +777,20 @@
 	@$(NORMAL_INSTALL)
 	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
 
+install-dvi: install-dvi-am
+
 install-exec-am: install-binPROGRAMS install-libLTLIBRARIES
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -917,9 +811,10 @@
 
 ps-am:
 
-uninstall-am: uninstall-binPROGRAMS uninstall-info-am \
-	uninstall-kdesuHEADERS uninstall-libLTLIBRARIES \
-	uninstall-local
+uninstall-am: uninstall-binPROGRAMS uninstall-kdesuHEADERS \
+	uninstall-libLTLIBRARIES uninstall-local
+
+.MAKE: install-am install-data-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
 	clean-generic clean-libLTLIBRARIES clean-libtool ctags \
@@ -927,15 +822,16 @@
 	distclean-libtool distclean-tags distdir dvi dvi-am html \
 	html-am info info-am install install-am install-binPROGRAMS \
 	install-data install-data-am install-data-hook \
-	install-data-local install-exec install-exec-am install-info \
+	install-data-local install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
 	install-info-am install-kdesuHEADERS install-libLTLIBRARIES \
-	install-man install-strip installcheck installcheck-am \
+	install-man install-pdf install-pdf-am install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
 	installdirs maintainer-clean maintainer-clean-generic \
 	mostlyclean mostlyclean-compile mostlyclean-generic \
 	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
-	uninstall-am uninstall-binPROGRAMS uninstall-info-am \
-	uninstall-kdesuHEADERS uninstall-libLTLIBRARIES \
-	uninstall-local
+	uninstall-am uninstall-binPROGRAMS uninstall-kdesuHEADERS \
+	uninstall-libLTLIBRARIES uninstall-local
 
 
 install-data-hook:
@@ -1041,15 +937,6 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
-#>+ 8
-libkdesu.la.closure: $(libkdesu_la_OBJECTS) $(libkdesu_la_DEPENDENCIES)
-	@echo "int main() {return 0;}" > libkdesu_la_closure.cpp
-	@$(LTCXXCOMPILE) -c libkdesu_la_closure.cpp
-	$(CXXLINK) libkdesu_la_closure.lo $(libkdesu_la_LDFLAGS) $(libkdesu_la_OBJECTS) $(libkdesu_la_LIBADD) $(LIBS)
-	@rm -f libkdesu_la_closure.* libkdesu.la.closure
-	@echo "timestamp" > libkdesu.la.closure
-
-
 #>+ 5
 
 nmcheck_libkdesu.la: libkdesu.la 
@@ -1059,10 +946,6 @@
 #>+ 2
 KDE_DIST=Makefile.in libkdesu_weak.nmcheck configure.in.in libkdesu.nmcheck Makefile.am 
 
-#>+ 3
-clean-closures:
-	-rm -f  libkdesu.la.closure
-
 #>+ 2
 docs-am:
 
--- kdelibs-3.5.7.orig/kate/plugins/isearch/Makefile.in
+++ kdelibs-3.5.7/kate/plugins/isearch/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,15 +16,11 @@
 @SET_MAKE@
 
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -69,7 +65,14 @@
 #>- ktexteditor_isearch_la_OBJECTS = $(am_ktexteditor_isearch_la_OBJECTS)
 #>+ 1
 ktexteditor_isearch_la_OBJECTS = ISearchPlugin.lo
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+#>- ktexteditor_isearch_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(ktexteditor_isearch_la_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+ktexteditor_isearch_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(ktexteditor_isearch_la_LDFLAGS) $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -77,19 +80,21 @@
 #>+ 2
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 #>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
 CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 3
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(ktexteditor_isearch_la_SOURCES)
 DIST_SOURCES = $(ktexteditor_isearch_la_SOURCES)
 isearchdataDATA_INSTALL = $(INSTALL_DATA)
@@ -103,8 +108,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -112,13 +115,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -132,8 +135,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -154,17 +155,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -233,7 +231,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -270,12 +267,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -320,87 +319,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -424,75 +379,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -500,16 +397,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -532,7 +428,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -570,13 +466,13 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
+	test -z "$(kde_moduledir)" || $(MKDIR_P) "$(DESTDIR)$(kde_moduledir)"
 	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
@@ -587,7 +483,7 @@
 
 uninstall-kde_moduleLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
@@ -601,11 +497,8 @@
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
-#>- ktexteditor_isearch.la: $(ktexteditor_isearch_la_OBJECTS) $(ktexteditor_isearch_la_DEPENDENCIES) 
-#>+ 2
-@KDE_USE_CLOSURE_TRUE@ktexteditor_isearch.la: ktexteditor_isearch.la.closure $(ktexteditor_isearch_la_OBJECTS) $(ktexteditor_isearch_la_DEPENDENCIES) 
-@KDE_USE_CLOSURE_FALSE@ktexteditor_isearch.la: $(ktexteditor_isearch_la_OBJECTS) $(ktexteditor_isearch_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(kde_moduledir) $(ktexteditor_isearch_la_LDFLAGS) $(ktexteditor_isearch_la_OBJECTS) $(ktexteditor_isearch_la_LIBADD) $(LIBS)
+ktexteditor_isearch.la: $(ktexteditor_isearch_la_OBJECTS) $(ktexteditor_isearch_la_DEPENDENCIES) 
+	$(ktexteditor_isearch_la_LINK) -rpath $(kde_moduledir) $(ktexteditor_isearch_la_OBJECTS) $(ktexteditor_isearch_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -616,22 +509,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ISearchPlugin.Plo@am__quote@
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -641,13 +534,9 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 install-isearchdataDATA: $(isearchdata_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(isearchdatadir)" || $(mkdir_p) "$(DESTDIR)$(isearchdatadir)"
+	test -z "$(isearchdatadir)" || $(MKDIR_P) "$(DESTDIR)$(isearchdatadir)"
 	@list='$(isearchdata_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -664,7 +553,7 @@
 	done
 install-kde_servicesDATA: $(kde_services_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(kde_servicesdir)" || $(mkdir_p) "$(DESTDIR)$(kde_servicesdir)"
+	test -z "$(kde_servicesdir)" || $(MKDIR_P) "$(DESTDIR)$(kde_servicesdir)"
 	@list='$(kde_services_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -729,22 +618,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -760,7 +648,7 @@
 all-am: Makefile $(LTLIBRARIES) $(DATA)
 installdirs:
 	for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(isearchdatadir)" "$(DESTDIR)$(kde_servicesdir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -793,14 +681,14 @@
 #>- clean-am: clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
 #>- 	mostlyclean-am
 #>+ 2
-clean-am: clean-metasources clean-closures clean-bcheck  clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
+clean-am: clean-metasources clean-bcheck  clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
 	mostlyclean-am
 
 distclean: distclean-am
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
@@ -818,14 +706,22 @@
 install-data-am:   install-isearchdataDATA \
 	install-kde_servicesDATA
 
+install-dvi: install-dvi-am
+
 #>- install-exec-am:
 #>+ 1
 install-exec-am:  install-kde_moduleLTLIBRARIES
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -846,23 +742,26 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-isearchdataDATA \
+uninstall-am: uninstall-isearchdataDATA \
 	uninstall-kde_moduleLTLIBRARIES uninstall-kde_servicesDATA
 
+.MAKE: install-am install-strip
+
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-kde_moduleLTLIBRARIES clean-libtool ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
 	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-exec \
-	install-exec-am install-info install-info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am \
 	install-isearchdataDATA install-kde_moduleLTLIBRARIES \
-	install-kde_servicesDATA install-man install-strip \
+	install-kde_servicesDATA install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
 	installcheck installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-info-am \
-	uninstall-isearchdataDATA uninstall-kde_moduleLTLIBRARIES \
-	uninstall-kde_servicesDATA
+	tags uninstall uninstall-am uninstall-isearchdataDATA \
+	uninstall-kde_moduleLTLIBRARIES uninstall-kde_servicesDATA
 
 
 messages: rc.cpp
@@ -871,15 +770,6 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
-#>+ 8
-ktexteditor_isearch.la.closure: $(ktexteditor_isearch_la_OBJECTS) $(ktexteditor_isearch_la_DEPENDENCIES)
-	@echo "int main() {return 0;}" > ktexteditor_isearch_la_closure.cpp
-	@$(LTCXXCOMPILE) -c ktexteditor_isearch_la_closure.cpp
-	$(CXXLINK) ktexteditor_isearch_la_closure.lo $(ktexteditor_isearch_la_LDFLAGS) $(ktexteditor_isearch_la_OBJECTS) $(ktexteditor_isearch_la_LIBADD) $(LIBS)
-	@rm -f ktexteditor_isearch_la_closure.* ktexteditor_isearch.la.closure
-	@echo "timestamp" > ktexteditor_isearch.la.closure
-
-
 #>+ 3
 ISearchPlugin.moc: $(srcdir)/ISearchPlugin.h
 	$(MOC) $(srcdir)/ISearchPlugin.h -o ISearchPlugin.moc
@@ -894,10 +784,6 @@
 #>+ 2
 KDE_DIST=ISearchPlugin.h Makefile.in ktexteditor_isearchui.rc ktexteditor_isearch.desktop Makefile.am 
 
-#>+ 3
-clean-closures:
-	-rm -f  ktexteditor_isearch.la.closure
-
 #>+ 2
 docs-am:
 
--- kdelibs-3.5.7.orig/kate/plugins/Makefile.in
+++ kdelibs-3.5.7/kate/plugins/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,15 +14,11 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -55,17 +51,21 @@
 DIST_SOURCES =
 #>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 #>- 	html-recursive info-recursive install-data-recursive \
-#>- 	install-exec-recursive install-info-recursive \
-#>- 	install-recursive installcheck-recursive installdirs-recursive \
-#>- 	pdf-recursive ps-recursive uninstall-info-recursive \
-#>- 	uninstall-recursive
-#>+ 6
+#>- 	install-dvi-recursive install-exec-recursive \
+#>- 	install-html-recursive install-info-recursive \
+#>- 	install-pdf-recursive install-ps-recursive install-recursive \
+#>- 	installcheck-recursive installdirs-recursive pdf-recursive \
+#>- 	ps-recursive uninstall-recursive
+#>+ 7
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	html-recursive info-recursive install-data-recursive \
-	install-exec-recursive install-info-recursive \
-	install-recursive installcheck-recursive installdirs-recursive \
-	pdf-recursive ps-recursive uninstall-info-recursive \
-	uninstall-recursive nmcheck-recursive bcheck-recursive
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive nmcheck-recursive bcheck-recursive
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
@@ -75,8 +75,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -84,13 +82,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -104,8 +102,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -126,17 +122,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -205,7 +198,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -242,12 +234,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -292,87 +286,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -396,75 +346,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -472,16 +364,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -493,7 +384,7 @@
 all: docs-am  all-recursive
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -531,9 +422,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 mostlyclean-libtool:
@@ -542,10 +433,6 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
 # To change the values of `make' variables: instead of editing Makefiles,
@@ -577,8 +464,7 @@
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
+$(RECURSIVE_CLEAN_TARGETS):
 	@failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
@@ -679,22 +565,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -708,7 +593,7 @@
 	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
-	    || $(mkdir_p) "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 	    || exit 1; \
 	    distdir=`$(am__cd) $(distdir) && pwd`; \
 	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
@@ -716,6 +601,8 @@
 	      $(MAKE) $(AM_MAKEFLAGS) \
 	        top_distdir="$$top_distdir" \
 	        distdir="$$distdir/$$subdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -759,8 +646,7 @@
 
 distclean: distclean-recursive
 	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool \
-	distclean-tags
+distclean-am: clean-am distclean-generic distclean-tags
 
 dvi: dvi-recursive
 
@@ -774,12 +660,20 @@
 
 install-data-am:
 
+install-dvi: install-dvi-recursive
+
 install-exec-am:
 
+install-html: install-html-recursive
+
 install-info: install-info-recursive
 
 install-man:
 
+install-pdf: install-pdf-recursive
+
+install-ps: install-ps-recursive
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
@@ -798,22 +692,24 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am
+uninstall-am:
 
-uninstall-info: uninstall-info-recursive
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+	install-strip
 
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-	clean clean-generic clean-libtool clean-recursive ctags \
-	ctags-recursive distclean distclean-generic distclean-libtool \
-	distclean-recursive distclean-tags distdir dvi dvi-am html \
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+	all all-am check check-am clean clean-generic clean-libtool \
+	ctags ctags-recursive distclean distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
 	html-am info info-am install install-am install-data \
-	install-data-am install-exec install-exec-am install-info \
-	install-info-am install-man install-strip installcheck \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
 	installcheck-am installdirs installdirs-am maintainer-clean \
-	maintainer-clean-generic maintainer-clean-recursive \
-	mostlyclean mostlyclean-generic mostlyclean-libtool \
-	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
-	uninstall uninstall-am uninstall-info-am
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
+	uninstall uninstall-am
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- kdelibs-3.5.7.orig/kate/plugins/autobookmarker/Makefile.in
+++ kdelibs-3.5.7/kate/plugins/autobookmarker/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,15 +16,11 @@
 @SET_MAKE@
 
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -70,7 +66,16 @@
 #>- 	$(am_ktexteditor_autobookmarker_la_OBJECTS)
 #>+ 1
 ktexteditor_autobookmarker_la_OBJECTS = autobookmarker.lo
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+#>- ktexteditor_autobookmarker_la_LINK = $(LIBTOOL) --tag=CXX \
+#>- 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
+#>- 	$(AM_CXXFLAGS) $(CXXFLAGS) \
+#>- 	$(ktexteditor_autobookmarker_la_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 4
+ktexteditor_autobookmarker_la_LINK = $(LIBTOOL) --tag=CXX \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
+	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
+	$(ktexteditor_autobookmarker_la_LDFLAGS) $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -78,19 +83,21 @@
 #>+ 2
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 #>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
 CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 3
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(ktexteditor_autobookmarker_la_SOURCES)
 DIST_SOURCES = $(ktexteditor_autobookmarker_la_SOURCES)
 confDATA_INSTALL = $(INSTALL_DATA)
@@ -104,8 +111,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -113,13 +118,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -133,8 +138,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -155,17 +158,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -234,7 +234,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -271,12 +270,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -321,87 +322,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -425,75 +382,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -501,16 +400,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -533,7 +431,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -571,13 +469,13 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
+	test -z "$(kde_moduledir)" || $(MKDIR_P) "$(DESTDIR)$(kde_moduledir)"
 	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
@@ -588,7 +486,7 @@
 
 uninstall-kde_moduleLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
@@ -602,11 +500,8 @@
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
-#>- ktexteditor_autobookmarker.la: $(ktexteditor_autobookmarker_la_OBJECTS) $(ktexteditor_autobookmarker_la_DEPENDENCIES) 
-#>+ 2
-@KDE_USE_CLOSURE_TRUE@ktexteditor_autobookmarker.la: ktexteditor_autobookmarker.la.closure $(ktexteditor_autobookmarker_la_OBJECTS) $(ktexteditor_autobookmarker_la_DEPENDENCIES) 
-@KDE_USE_CLOSURE_FALSE@ktexteditor_autobookmarker.la: $(ktexteditor_autobookmarker_la_OBJECTS) $(ktexteditor_autobookmarker_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(kde_moduledir) $(ktexteditor_autobookmarker_la_LDFLAGS) $(ktexteditor_autobookmarker_la_OBJECTS) $(ktexteditor_autobookmarker_la_LIBADD) $(LIBS)
+ktexteditor_autobookmarker.la: $(ktexteditor_autobookmarker_la_OBJECTS) $(ktexteditor_autobookmarker_la_DEPENDENCIES) 
+	$(ktexteditor_autobookmarker_la_LINK) -rpath $(kde_moduledir) $(ktexteditor_autobookmarker_la_OBJECTS) $(ktexteditor_autobookmarker_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -617,22 +512,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/autobookmarker.Plo@am__quote@
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -642,13 +537,9 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 install-confDATA: $(conf_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(confdir)" || $(mkdir_p) "$(DESTDIR)$(confdir)"
+	test -z "$(confdir)" || $(MKDIR_P) "$(DESTDIR)$(confdir)"
 	@list='$(conf_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -665,7 +556,7 @@
 	done
 install-kde_servicesDATA: $(kde_services_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(kde_servicesdir)" || $(mkdir_p) "$(DESTDIR)$(kde_servicesdir)"
+	test -z "$(kde_servicesdir)" || $(MKDIR_P) "$(DESTDIR)$(kde_servicesdir)"
 	@list='$(kde_services_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -730,22 +621,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -761,7 +651,7 @@
 all-am: Makefile $(LTLIBRARIES) $(DATA)
 installdirs:
 	for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(confdir)" "$(DESTDIR)$(kde_servicesdir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -794,14 +684,14 @@
 #>- clean-am: clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
 #>- 	mostlyclean-am
 #>+ 2
-clean-am: clean-metasources clean-closures clean-bcheck  clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
+clean-am: clean-metasources clean-bcheck  clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
 	mostlyclean-am
 
 distclean: distclean-am
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
@@ -819,14 +709,22 @@
 install-data-am:   install-confDATA \
 	install-kde_servicesDATA
 
+install-dvi: install-dvi-am
+
 #>- install-exec-am:
 #>+ 1
 install-exec-am:  install-kde_moduleLTLIBRARIES
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -847,23 +745,26 @@
 
 ps-am:
 
-uninstall-am: uninstall-confDATA uninstall-info-am \
-	uninstall-kde_moduleLTLIBRARIES uninstall-kde_servicesDATA
+uninstall-am: uninstall-confDATA uninstall-kde_moduleLTLIBRARIES \
+	uninstall-kde_servicesDATA
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-kde_moduleLTLIBRARIES clean-libtool ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
 	distclean-tags distdir dvi dvi-am html html-am info info-am \
 	install install-am install-confDATA install-data \
-	install-data-am install-exec install-exec-am install-info \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
 	install-info-am install-kde_moduleLTLIBRARIES \
-	install-kde_servicesDATA install-man install-strip \
+	install-kde_servicesDATA install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
 	installcheck installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 	tags uninstall uninstall-am uninstall-confDATA \
-	uninstall-info-am uninstall-kde_moduleLTLIBRARIES \
-	uninstall-kde_servicesDATA
+	uninstall-kde_moduleLTLIBRARIES uninstall-kde_servicesDATA
 
 
 messages: rc.cpp
@@ -872,15 +773,6 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
-#>+ 8
-ktexteditor_autobookmarker.la.closure: $(ktexteditor_autobookmarker_la_OBJECTS) $(ktexteditor_autobookmarker_la_DEPENDENCIES)
-	@echo "int main() {return 0;}" > ktexteditor_autobookmarker_la_closure.cpp
-	@$(LTCXXCOMPILE) -c ktexteditor_autobookmarker_la_closure.cpp
-	$(CXXLINK) ktexteditor_autobookmarker_la_closure.lo $(ktexteditor_autobookmarker_la_LDFLAGS) $(ktexteditor_autobookmarker_la_OBJECTS) $(ktexteditor_autobookmarker_la_LIBADD) $(LIBS)
-	@rm -f ktexteditor_autobookmarker_la_closure.* ktexteditor_autobookmarker.la.closure
-	@echo "timestamp" > ktexteditor_autobookmarker.la.closure
-
-
 #>+ 3
 autobookmarker.moc: $(srcdir)/autobookmarker.h
 	$(MOC) $(srcdir)/autobookmarker.h -o autobookmarker.moc
@@ -895,10 +787,6 @@
 #>+ 2
 KDE_DIST=Makefile.in ktexteditor_autobookmarker.desktop autobookmarker.h ktexteditor_autobookmarkerrc Makefile.am 
 
-#>+ 3
-clean-closures:
-	-rm -f  ktexteditor_autobookmarker.la.closure
-
 #>+ 2
 docs-am:
 
--- kdelibs-3.5.7.orig/kate/plugins/wordcompletion/Makefile.in
+++ kdelibs-3.5.7/kate/plugins/wordcompletion/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,15 +16,11 @@
 @SET_MAKE@
 
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -71,7 +67,16 @@
 #>- 	$(am_ktexteditor_docwordcompletion_la_OBJECTS)
 #>+ 1
 ktexteditor_docwordcompletion_la_OBJECTS = docwordcompletion.lo
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+#>- ktexteditor_docwordcompletion_la_LINK = $(LIBTOOL) --tag=CXX \
+#>- 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
+#>- 	$(AM_CXXFLAGS) $(CXXFLAGS) \
+#>- 	$(ktexteditor_docwordcompletion_la_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 4
+ktexteditor_docwordcompletion_la_LINK = $(LIBTOOL) --tag=CXX \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
+	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
+	$(ktexteditor_docwordcompletion_la_LDFLAGS) $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -79,19 +84,21 @@
 #>+ 2
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 #>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
 CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 3
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(ktexteditor_docwordcompletion_la_SOURCES)
 DIST_SOURCES = $(ktexteditor_docwordcompletion_la_SOURCES)
 docwordcompletiondataDATA_INSTALL = $(INSTALL_DATA)
@@ -105,8 +112,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -114,13 +119,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -134,8 +139,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -156,17 +159,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -235,7 +235,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -272,12 +271,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -322,87 +323,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -426,75 +383,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -502,16 +401,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -534,7 +432,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -572,13 +470,13 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
+	test -z "$(kde_moduledir)" || $(MKDIR_P) "$(DESTDIR)$(kde_moduledir)"
 	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
@@ -589,7 +487,7 @@
 
 uninstall-kde_moduleLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
@@ -603,11 +501,8 @@
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
-#>- ktexteditor_docwordcompletion.la: $(ktexteditor_docwordcompletion_la_OBJECTS) $(ktexteditor_docwordcompletion_la_DEPENDENCIES) 
-#>+ 2
-@KDE_USE_CLOSURE_TRUE@ktexteditor_docwordcompletion.la: ktexteditor_docwordcompletion.la.closure $(ktexteditor_docwordcompletion_la_OBJECTS) $(ktexteditor_docwordcompletion_la_DEPENDENCIES) 
-@KDE_USE_CLOSURE_FALSE@ktexteditor_docwordcompletion.la: $(ktexteditor_docwordcompletion_la_OBJECTS) $(ktexteditor_docwordcompletion_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(kde_moduledir) $(ktexteditor_docwordcompletion_la_LDFLAGS) $(ktexteditor_docwordcompletion_la_OBJECTS) $(ktexteditor_docwordcompletion_la_LIBADD) $(LIBS)
+ktexteditor_docwordcompletion.la: $(ktexteditor_docwordcompletion_la_OBJECTS) $(ktexteditor_docwordcompletion_la_DEPENDENCIES) 
+	$(ktexteditor_docwordcompletion_la_LINK) -rpath $(kde_moduledir) $(ktexteditor_docwordcompletion_la_OBJECTS) $(ktexteditor_docwordcompletion_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -618,22 +513,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/docwordcompletion.Plo@am__quote@
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -643,13 +538,9 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 install-docwordcompletiondataDATA: $(docwordcompletiondata_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(docwordcompletiondatadir)" || $(mkdir_p) "$(DESTDIR)$(docwordcompletiondatadir)"
+	test -z "$(docwordcompletiondatadir)" || $(MKDIR_P) "$(DESTDIR)$(docwordcompletiondatadir)"
 	@list='$(docwordcompletiondata_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -666,7 +557,7 @@
 	done
 install-kde_servicesDATA: $(kde_services_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(kde_servicesdir)" || $(mkdir_p) "$(DESTDIR)$(kde_servicesdir)"
+	test -z "$(kde_servicesdir)" || $(MKDIR_P) "$(DESTDIR)$(kde_servicesdir)"
 	@list='$(kde_services_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -731,22 +622,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -762,7 +652,7 @@
 all-am: Makefile $(LTLIBRARIES) $(DATA)
 installdirs:
 	for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(docwordcompletiondatadir)" "$(DESTDIR)$(kde_servicesdir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -795,14 +685,14 @@
 #>- clean-am: clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
 #>- 	mostlyclean-am
 #>+ 2
-clean-am: clean-metasources clean-closures clean-bcheck  clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
+clean-am: clean-metasources clean-bcheck  clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
 	mostlyclean-am
 
 distclean: distclean-am
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
@@ -820,14 +710,22 @@
 install-data-am:   install-docwordcompletiondataDATA \
  install-kde_servicesDATA
 
+install-dvi: install-dvi-am
+
 #>- install-exec-am:
 #>+ 1
 install-exec-am:  install-kde_moduleLTLIBRARIES
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -848,22 +746,26 @@
 
 ps-am:
 
-uninstall-am: uninstall-docwordcompletiondataDATA uninstall-info-am \
+uninstall-am: uninstall-docwordcompletiondataDATA \
 	uninstall-kde_moduleLTLIBRARIES uninstall-kde_servicesDATA
 
+.MAKE: install-am install-strip
+
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-kde_moduleLTLIBRARIES clean-libtool ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
 	distclean-tags distdir dvi dvi-am html html-am info info-am \
 	install install-am install-data install-data-am \
-	install-docwordcompletiondataDATA install-exec install-exec-am \
+	install-docwordcompletiondataDATA install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
 	install-info install-info-am install-kde_moduleLTLIBRARIES \
-	install-kde_servicesDATA install-man install-strip \
+	install-kde_servicesDATA install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
 	installcheck installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 	tags uninstall uninstall-am \
-	uninstall-docwordcompletiondataDATA uninstall-info-am \
+	uninstall-docwordcompletiondataDATA \
 	uninstall-kde_moduleLTLIBRARIES uninstall-kde_servicesDATA
 
 
@@ -873,15 +775,6 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
-#>+ 8
-ktexteditor_docwordcompletion.la.closure: $(ktexteditor_docwordcompletion_la_OBJECTS) $(ktexteditor_docwordcompletion_la_DEPENDENCIES)
-	@echo "int main() {return 0;}" > ktexteditor_docwordcompletion_la_closure.cpp
-	@$(LTCXXCOMPILE) -c ktexteditor_docwordcompletion_la_closure.cpp
-	$(CXXLINK) ktexteditor_docwordcompletion_la_closure.lo $(ktexteditor_docwordcompletion_la_LDFLAGS) $(ktexteditor_docwordcompletion_la_OBJECTS) $(ktexteditor_docwordcompletion_la_LIBADD) $(LIBS)
-	@rm -f ktexteditor_docwordcompletion_la_closure.* ktexteditor_docwordcompletion.la.closure
-	@echo "timestamp" > ktexteditor_docwordcompletion.la.closure
-
-
 #>+ 3
 docwordcompletion.moc: $(srcdir)/docwordcompletion.h
 	$(MOC) $(srcdir)/docwordcompletion.h -o docwordcompletion.moc
@@ -896,10 +789,6 @@
 #>+ 2
 KDE_DIST=Makefile.in ktexteditor_docwordcompletion.desktop docwordcompletionui.rc docwordcompletion.h Makefile.am 
 
-#>+ 3
-clean-closures:
-	-rm -f  ktexteditor_docwordcompletion.la.closure
-
 #>+ 2
 docs-am:
 
--- kdelibs-3.5.7.orig/kate/plugins/kdatatool/Makefile.in
+++ kdelibs-3.5.7/kate/plugins/kdatatool/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,15 +16,11 @@
 @SET_MAKE@
 
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -70,7 +66,16 @@
 #>- 	$(am_ktexteditor_kdatatool_la_OBJECTS)
 #>+ 1
 ktexteditor_kdatatool_la_OBJECTS = kate_kdatatool.lo
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+#>- ktexteditor_kdatatool_la_LINK = $(LIBTOOL) --tag=CXX \
+#>- 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
+#>- 	$(AM_CXXFLAGS) $(CXXFLAGS) $(ktexteditor_kdatatool_la_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 4
+ktexteditor_kdatatool_la_LINK = $(LIBTOOL) --tag=CXX \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
+	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(ktexteditor_kdatatool_la_LDFLAGS) \
+	$(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -78,19 +83,21 @@
 #>+ 2
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 #>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
 CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 3
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(ktexteditor_kdatatool_la_SOURCES)
 DIST_SOURCES = $(ktexteditor_kdatatool_la_SOURCES)
 kdatatooldataDATA_INSTALL = $(INSTALL_DATA)
@@ -104,8 +111,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -113,13 +118,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -133,8 +138,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -155,17 +158,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -234,7 +234,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -271,12 +270,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -321,87 +322,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -425,75 +382,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -501,16 +400,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -533,7 +431,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -571,13 +469,13 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
+	test -z "$(kde_moduledir)" || $(MKDIR_P) "$(DESTDIR)$(kde_moduledir)"
 	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
@@ -588,7 +486,7 @@
 
 uninstall-kde_moduleLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
@@ -602,11 +500,8 @@
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
-#>- ktexteditor_kdatatool.la: $(ktexteditor_kdatatool_la_OBJECTS) $(ktexteditor_kdatatool_la_DEPENDENCIES) 
-#>+ 2
-@KDE_USE_CLOSURE_TRUE@ktexteditor_kdatatool.la: ktexteditor_kdatatool.la.closure $(ktexteditor_kdatatool_la_OBJECTS) $(ktexteditor_kdatatool_la_DEPENDENCIES) 
-@KDE_USE_CLOSURE_FALSE@ktexteditor_kdatatool.la: $(ktexteditor_kdatatool_la_OBJECTS) $(ktexteditor_kdatatool_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(kde_moduledir) $(ktexteditor_kdatatool_la_LDFLAGS) $(ktexteditor_kdatatool_la_OBJECTS) $(ktexteditor_kdatatool_la_LIBADD) $(LIBS)
+ktexteditor_kdatatool.la: $(ktexteditor_kdatatool_la_OBJECTS) $(ktexteditor_kdatatool_la_DEPENDENCIES) 
+	$(ktexteditor_kdatatool_la_LINK) -rpath $(kde_moduledir) $(ktexteditor_kdatatool_la_OBJECTS) $(ktexteditor_kdatatool_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -617,22 +512,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kate_kdatatool.Plo@am__quote@
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -642,13 +537,9 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 install-kdatatooldataDATA: $(kdatatooldata_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(kdatatooldatadir)" || $(mkdir_p) "$(DESTDIR)$(kdatatooldatadir)"
+	test -z "$(kdatatooldatadir)" || $(MKDIR_P) "$(DESTDIR)$(kdatatooldatadir)"
 	@list='$(kdatatooldata_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -665,7 +556,7 @@
 	done
 install-kde_servicesDATA: $(kde_services_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(kde_servicesdir)" || $(mkdir_p) "$(DESTDIR)$(kde_servicesdir)"
+	test -z "$(kde_servicesdir)" || $(MKDIR_P) "$(DESTDIR)$(kde_servicesdir)"
 	@list='$(kde_services_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -730,22 +621,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -761,7 +651,7 @@
 all-am: Makefile $(LTLIBRARIES) $(DATA)
 installdirs:
 	for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(kdatatooldatadir)" "$(DESTDIR)$(kde_servicesdir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -794,14 +684,14 @@
 #>- clean-am: clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
 #>- 	mostlyclean-am
 #>+ 2
-clean-am: clean-metasources clean-closures clean-bcheck  clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
+clean-am: clean-metasources clean-bcheck  clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
 	mostlyclean-am
 
 distclean: distclean-am
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
@@ -819,14 +709,22 @@
 install-data-am:   install-kdatatooldataDATA \
  install-kde_servicesDATA
 
+install-dvi: install-dvi-am
+
 #>- install-exec-am:
 #>+ 1
 install-exec-am:  install-kde_moduleLTLIBRARIES
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -847,23 +745,26 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-kdatatooldataDATA \
+uninstall-am: uninstall-kdatatooldataDATA \
 	uninstall-kde_moduleLTLIBRARIES uninstall-kde_servicesDATA
 
+.MAKE: install-am install-strip
+
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-kde_moduleLTLIBRARIES clean-libtool ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
 	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-exec \
-	install-exec-am install-info install-info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am \
 	install-kdatatooldataDATA install-kde_moduleLTLIBRARIES \
-	install-kde_servicesDATA install-man install-strip \
+	install-kde_servicesDATA install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
 	installcheck installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-info-am \
-	uninstall-kdatatooldataDATA uninstall-kde_moduleLTLIBRARIES \
-	uninstall-kde_servicesDATA
+	tags uninstall uninstall-am uninstall-kdatatooldataDATA \
+	uninstall-kde_moduleLTLIBRARIES uninstall-kde_servicesDATA
 
 
 messages: rc.cpp
@@ -872,15 +773,6 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
-#>+ 8
-ktexteditor_kdatatool.la.closure: $(ktexteditor_kdatatool_la_OBJECTS) $(ktexteditor_kdatatool_la_DEPENDENCIES)
-	@echo "int main() {return 0;}" > ktexteditor_kdatatool_la_closure.cpp
-	@$(LTCXXCOMPILE) -c ktexteditor_kdatatool_la_closure.cpp
-	$(CXXLINK) ktexteditor_kdatatool_la_closure.lo $(ktexteditor_kdatatool_la_LDFLAGS) $(ktexteditor_kdatatool_la_OBJECTS) $(ktexteditor_kdatatool_la_LIBADD) $(LIBS)
-	@rm -f ktexteditor_kdatatool_la_closure.* ktexteditor_kdatatool.la.closure
-	@echo "timestamp" > ktexteditor_kdatatool.la.closure
-
-
 #>+ 3
 kate_kdatatool.moc: $(srcdir)/kate_kdatatool.h
 	$(MOC) $(srcdir)/kate_kdatatool.h -o kate_kdatatool.moc
@@ -895,10 +787,6 @@
 #>+ 2
 KDE_DIST=ktexteditor_kdatatool.desktop Makefile.in kate_kdatatool.h ktexteditor_kdatatoolui.rc Makefile.am 
 
-#>+ 3
-clean-closures:
-	-rm -f  ktexteditor_kdatatool.la.closure
-
 #>+ 2
 docs-am:
 
--- kdelibs-3.5.7.orig/kate/plugins/insertfile/Makefile.in
+++ kdelibs-3.5.7/kate/plugins/insertfile/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,15 +16,11 @@
 @SET_MAKE@
 
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -71,7 +67,16 @@
 #>- 	$(am_ktexteditor_insertfile_la_OBJECTS)
 #>+ 1
 ktexteditor_insertfile_la_OBJECTS = insertfileplugin.lo
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+#>- ktexteditor_insertfile_la_LINK = $(LIBTOOL) --tag=CXX \
+#>- 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
+#>- 	$(AM_CXXFLAGS) $(CXXFLAGS) \
+#>- 	$(ktexteditor_insertfile_la_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 4
+ktexteditor_insertfile_la_LINK = $(LIBTOOL) --tag=CXX \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
+	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
+	$(ktexteditor_insertfile_la_LDFLAGS) $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -79,19 +84,21 @@
 #>+ 2
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 #>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
 CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 3
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(ktexteditor_insertfile_la_SOURCES)
 DIST_SOURCES = $(ktexteditor_insertfile_la_SOURCES)
 insertfiledataDATA_INSTALL = $(INSTALL_DATA)
@@ -105,8 +112,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -114,13 +119,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -134,8 +139,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -156,17 +159,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -235,7 +235,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -272,12 +271,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -322,87 +323,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -426,75 +383,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -502,16 +401,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -534,7 +432,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -572,13 +470,13 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
+	test -z "$(kde_moduledir)" || $(MKDIR_P) "$(DESTDIR)$(kde_moduledir)"
 	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
@@ -589,7 +487,7 @@
 
 uninstall-kde_moduleLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
@@ -603,11 +501,8 @@
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
-#>- ktexteditor_insertfile.la: $(ktexteditor_insertfile_la_OBJECTS) $(ktexteditor_insertfile_la_DEPENDENCIES) 
-#>+ 2
-@KDE_USE_CLOSURE_TRUE@ktexteditor_insertfile.la: ktexteditor_insertfile.la.closure $(ktexteditor_insertfile_la_OBJECTS) $(ktexteditor_insertfile_la_DEPENDENCIES) 
-@KDE_USE_CLOSURE_FALSE@ktexteditor_insertfile.la: $(ktexteditor_insertfile_la_OBJECTS) $(ktexteditor_insertfile_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(kde_moduledir) $(ktexteditor_insertfile_la_LDFLAGS) $(ktexteditor_insertfile_la_OBJECTS) $(ktexteditor_insertfile_la_LIBADD) $(LIBS)
+ktexteditor_insertfile.la: $(ktexteditor_insertfile_la_OBJECTS) $(ktexteditor_insertfile_la_DEPENDENCIES) 
+	$(ktexteditor_insertfile_la_LINK) -rpath $(kde_moduledir) $(ktexteditor_insertfile_la_OBJECTS) $(ktexteditor_insertfile_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -618,22 +513,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/insertfileplugin.Plo@am__quote@
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -643,13 +538,9 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 install-insertfiledataDATA: $(insertfiledata_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(insertfiledatadir)" || $(mkdir_p) "$(DESTDIR)$(insertfiledatadir)"
+	test -z "$(insertfiledatadir)" || $(MKDIR_P) "$(DESTDIR)$(insertfiledatadir)"
 	@list='$(insertfiledata_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -666,7 +557,7 @@
 	done
 install-kde_servicesDATA: $(kde_services_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(kde_servicesdir)" || $(mkdir_p) "$(DESTDIR)$(kde_servicesdir)"
+	test -z "$(kde_servicesdir)" || $(MKDIR_P) "$(DESTDIR)$(kde_servicesdir)"
 	@list='$(kde_services_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -731,22 +622,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -762,7 +652,7 @@
 all-am: Makefile $(LTLIBRARIES) $(DATA)
 installdirs:
 	for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(insertfiledatadir)" "$(DESTDIR)$(kde_servicesdir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -795,14 +685,14 @@
 #>- clean-am: clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
 #>- 	mostlyclean-am
 #>+ 2
-clean-am: clean-metasources clean-closures clean-bcheck  clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
+clean-am: clean-metasources clean-bcheck  clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
 	mostlyclean-am
 
 distclean: distclean-am
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
@@ -820,14 +710,22 @@
 install-data-am:   install-insertfiledataDATA \
  install-kde_servicesDATA
 
+install-dvi: install-dvi-am
+
 #>- install-exec-am:
 #>+ 1
 install-exec-am:  install-kde_moduleLTLIBRARIES
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -848,23 +746,26 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-insertfiledataDATA \
+uninstall-am: uninstall-insertfiledataDATA \
 	uninstall-kde_moduleLTLIBRARIES uninstall-kde_servicesDATA
 
+.MAKE: install-am install-strip
+
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-kde_moduleLTLIBRARIES clean-libtool ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
 	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-exec \
-	install-exec-am install-info install-info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am \
 	install-insertfiledataDATA install-kde_moduleLTLIBRARIES \
-	install-kde_servicesDATA install-man install-strip \
+	install-kde_servicesDATA install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
 	installcheck installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-info-am \
-	uninstall-insertfiledataDATA uninstall-kde_moduleLTLIBRARIES \
-	uninstall-kde_servicesDATA
+	tags uninstall uninstall-am uninstall-insertfiledataDATA \
+	uninstall-kde_moduleLTLIBRARIES uninstall-kde_servicesDATA
 
 
 messages: rc.cpp
@@ -873,15 +774,6 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
-#>+ 8
-ktexteditor_insertfile.la.closure: $(ktexteditor_insertfile_la_OBJECTS) $(ktexteditor_insertfile_la_DEPENDENCIES)
-	@echo "int main() {return 0;}" > ktexteditor_insertfile_la_closure.cpp
-	@$(LTCXXCOMPILE) -c ktexteditor_insertfile_la_closure.cpp
-	$(CXXLINK) ktexteditor_insertfile_la_closure.lo $(ktexteditor_insertfile_la_LDFLAGS) $(ktexteditor_insertfile_la_OBJECTS) $(ktexteditor_insertfile_la_LIBADD) $(LIBS)
-	@rm -f ktexteditor_insertfile_la_closure.* ktexteditor_insertfile.la.closure
-	@echo "timestamp" > ktexteditor_insertfile.la.closure
-
-
 #>+ 3
 insertfileplugin.moc: $(srcdir)/insertfileplugin.h
 	$(MOC) $(srcdir)/insertfileplugin.h -o insertfileplugin.moc
@@ -896,10 +788,6 @@
 #>+ 2
 KDE_DIST=ktexteditor_insertfileui.rc ktexteditor_insertfile.desktop Makefile.in insertfileplugin.h Makefile.am 
 
-#>+ 3
-clean-closures:
-	-rm -f  ktexteditor_insertfile.la.closure
-
 #>+ 2
 docs-am:
 
--- kdelibs-3.5.7.orig/kate/part/Makefile.in
+++ kdelibs-3.5.7/kate/part/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -15,15 +15,11 @@
 
 @SET_MAKE@
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -38,6 +34,7 @@
 build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
+TESTS = testkateregression$(EXEEXT)
 check_PROGRAMS = testkateregression$(EXEEXT)
 subdir = kate/part
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
@@ -100,6 +97,13 @@
 #>- libkatepart_la_OBJECTS = $(am_libkatepart_la_OBJECTS)
 #>+ 1
 libkatepart_la_OBJECTS = dummy.lo
+#>- libkatepart_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(libkatepart_la_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+libkatepart_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(libkatepart_la_LDFLAGS) $(LDFLAGS) -o $@
 am_testkateregression_OBJECTS = test_regression.$(OBJEXT)
 #>- testkateregression_OBJECTS = $(am_testkateregression_OBJECTS)
 #>+ 1
@@ -109,7 +113,7 @@
 	$(top_builddir)/kutils/libkutils.la \
 	$(top_builddir)/kjs/libkjs.la $(am__DEPENDENCIES_1)
 testkateregression_DEPENDENCIES = $(am__DEPENDENCIES_2)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -117,19 +121,21 @@
 #>+ 2
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
-#>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+#>+ 3
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
 CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 3
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(libkate_la_SOURCES) $(libkatepart_la_SOURCES) \
 	$(testkateregression_SOURCES)
 DIST_SOURCES = $(libkate_la_SOURCES) $(libkatepart_la_SOURCES) \
@@ -142,8 +148,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -151,13 +155,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -171,8 +175,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -193,17 +195,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -272,7 +271,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -309,12 +307,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -359,87 +359,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -463,75 +419,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -539,16 +437,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -588,7 +485,6 @@
 LUT_FILES = katejscript.lut.h
 CREATE_HASH_TABLE = $(top_srcdir)/kjs/create_hash_table
 CLEANFILES = $(LUT_FILES)
-TESTS = testkateregression
 testkateregression_SOURCES = test_regression.cpp
 testkateregression_LDADD = $(libkatepart_la_LIBADD)
 #>- all: all-am
@@ -597,7 +493,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -635,13 +531,13 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
+	test -z "$(kde_moduledir)" || $(MKDIR_P) "$(DESTDIR)$(kde_moduledir)"
 	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
@@ -652,7 +548,7 @@
 
 uninstall-kde_moduleLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
@@ -676,12 +572,9 @@
 	  rm -f "$${dir}/so_locations"; \
 	done
 libkate.la: $(libkate_la_OBJECTS) $(libkate_la_DEPENDENCIES) 
-	$(CXXLINK)  $(libkate_la_LDFLAGS) $(libkate_la_OBJECTS) $(libkate_la_LIBADD) $(LIBS)
-#>- libkatepart.la: $(libkatepart_la_OBJECTS) $(libkatepart_la_DEPENDENCIES) 
-#>+ 2
-@KDE_USE_CLOSURE_TRUE@libkatepart.la: libkatepart.la.closure $(libkatepart_la_OBJECTS) $(libkatepart_la_DEPENDENCIES) 
-@KDE_USE_CLOSURE_FALSE@libkatepart.la: $(libkatepart_la_OBJECTS) $(libkatepart_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(kde_moduledir) $(libkatepart_la_LDFLAGS) $(libkatepart_la_OBJECTS) $(libkatepart_la_LIBADD) $(LIBS)
+	$(CXXLINK)  $(libkate_la_OBJECTS) $(libkate_la_LIBADD) $(LIBS)
+libkatepart.la: $(libkatepart_la_OBJECTS) $(libkatepart_la_DEPENDENCIES) 
+	$(libkatepart_la_LINK) -rpath $(kde_moduledir) $(libkatepart_la_OBJECTS) $(libkatepart_la_LIBADD) $(LIBS)
 
 clean-checkPROGRAMS:
 	@list='$(check_PROGRAMS)'; for p in $$list; do \
@@ -691,7 +584,7 @@
 	done
 testkateregression$(EXEEXT): $(testkateregression_OBJECTS) $(testkateregression_DEPENDENCIES) 
 	@rm -f testkateregression$(EXEEXT)
-	$(CXXLINK) $(testkateregression_LDFLAGS) $(testkateregression_OBJECTS) $(testkateregression_LDADD) $(LIBS)
+	$(CXXLINK) $(testkateregression_OBJECTS) $(testkateregression_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -737,22 +630,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_regression.Po@am__quote@
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -763,10 +656,6 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -816,9 +705,9 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 check-TESTS: $(TESTS)
-	@failed=0; all=0; xfail=0; xpass=0; skip=0; \
+	@failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[	 ]'; \
 	srcdir=$(srcdir); export srcdir; \
-	list='$(TESTS)'; \
+	list=' $(TESTS) '; \
 	if test -n "$$list"; then \
 	  for tst in $$list; do \
 	    if test -f ./$$tst; then dir=./; \
@@ -827,7 +716,7 @@
 	    if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
 	      all=`expr $$all + 1`; \
 	      case " $(XFAIL_TESTS) " in \
-	      *" $$tst "*) \
+	      *$$ws$$tst$$ws*) \
 		xpass=`expr $$xpass + 1`; \
 		failed=`expr $$failed + 1`; \
 		echo "XPASS: $$tst"; \
@@ -839,7 +728,7 @@
 	    elif test $$? -ne 77; then \
 	      all=`expr $$all + 1`; \
 	      case " $(XFAIL_TESTS) " in \
-	      *" $$tst "*) \
+	      *$$ws$$tst$$ws*) \
 		xfail=`expr $$xfail + 1`; \
 		echo "XFAIL: $$tst"; \
 	      ;; \
@@ -889,22 +778,21 @@
 	else :; fi
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -922,7 +810,7 @@
 all-am: Makefile $(LTLIBRARIES)
 installdirs:
 	for dir in "$(DESTDIR)$(kde_moduledir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -957,7 +845,7 @@
 #>- 	clean-kde_moduleLTLIBRARIES clean-libtool \
 #>- 	clean-noinstLTLIBRARIES mostlyclean-am
 #>+ 3
-clean-am: clean-metasources clean-idl clean-closures clean-bcheck clean-final  clean-checkPROGRAMS clean-generic \
+clean-am: clean-metasources clean-idl clean-bcheck clean-final  clean-checkPROGRAMS clean-generic \
 	clean-kde_moduleLTLIBRARIES clean-libtool \
 	clean-noinstLTLIBRARIES mostlyclean-am
 
@@ -965,7 +853,7 @@
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
@@ -981,14 +869,22 @@
 #>+ 1
 install-data-am:   
 
+install-dvi: install-dvi-am
+
 #>- install-exec-am:
 #>+ 1
 install-exec-am:  install-kde_moduleLTLIBRARIES
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -1009,21 +905,24 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-kde_moduleLTLIBRARIES
+uninstall-am: uninstall-kde_moduleLTLIBRARIES
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
 	clean-checkPROGRAMS clean-generic clean-kde_moduleLTLIBRARIES \
 	clean-libtool clean-noinstLTLIBRARIES ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
 	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-exec \
-	install-exec-am install-info install-info-am \
-	install-kde_moduleLTLIBRARIES install-man install-strip \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am \
+	install-kde_moduleLTLIBRARIES install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
 	installcheck installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-info-am \
-	uninstall-kde_moduleLTLIBRARIES
+	tags uninstall uninstall-am uninstall-kde_moduleLTLIBRARIES
 
 
 dummy.cpp: $(srcdir)/Makefile.am
@@ -1189,15 +1088,6 @@
 #>+ 2
 mocs: katebookmarks.moc
 
-#>+ 8
-libkatepart.la.closure: $(libkatepart_la_OBJECTS) $(libkatepart_la_DEPENDENCIES)
-	@echo "int main() {return 0;}" > libkatepart_la_closure.cpp
-	@$(LTCXXCOMPILE) -c libkatepart_la_closure.cpp
-	$(CXXLINK) libkatepart_la_closure.lo $(libkatepart_la_LDFLAGS) $(libkatepart_la_OBJECTS) $(libkatepart_la_LIBADD) $(LIBS)
-	@rm -f libkatepart_la_closure.* libkatepart.la.closure
-	@echo "timestamp" > libkatepart.la.closure
-
-
 #>+ 3
 clean-metasources:
 	-rm -f  katecodecompletion.moc katedocument.moc katefiletype.moc katetemplatehandler.moc kateviewinternal.moc kateschema.moc test_regression.moc katedialogs.moc katedocumenthelpers.moc kateviewhelpers.moc kateprinter.moc katehighlight.moc kateview.moc katesearch.moc katecodefoldinghelpers.moc katebuffer.moc katespell.moc katesupercursor.moc kateautoindent.moc katearbitraryhighlight.moc katebookmarks.moc
@@ -1210,10 +1100,6 @@
 	-rm -f \
 	katedocument_skel.cpp katedocument_skel.h katedocument.kidl 
 
-#>+ 3
-clean-closures:
-	-rm -f  libkatepart.la.closure
-
 #>+ 2
 docs-am:
 
--- kdelibs-3.5.7.orig/kate/scripts/Makefile.in
+++ kdelibs-3.5.7/kate/scripts/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -15,15 +15,11 @@
 
 @SET_MAKE@
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -71,8 +67,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -80,13 +74,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -100,8 +94,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -122,17 +114,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -201,7 +190,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -238,12 +226,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -288,87 +278,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -392,75 +338,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -468,16 +356,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -492,7 +379,7 @@
 all: docs-am  all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -530,9 +417,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 mostlyclean-libtool:
@@ -540,13 +427,9 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 install-indentscriptskateDATA: $(indentscriptskate_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(indentscriptskatedir)" || $(mkdir_p) "$(DESTDIR)$(indentscriptskatedir)"
+	test -z "$(indentscriptskatedir)" || $(MKDIR_P) "$(DESTDIR)$(indentscriptskatedir)"
 	@list='$(indentscriptskate_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -563,7 +446,7 @@
 	done
 install-scriptskateDATA: $(scriptskate_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(scriptskatedir)" || $(mkdir_p) "$(DESTDIR)$(scriptskatedir)"
+	test -z "$(scriptskatedir)" || $(MKDIR_P) "$(DESTDIR)$(scriptskatedir)"
 	@list='$(scriptskate_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -586,22 +469,21 @@
 
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -617,7 +499,7 @@
 all-am: Makefile $(DATA)
 installdirs:
 	for dir in "$(DESTDIR)$(indentscriptskatedir)" "$(DESTDIR)$(scriptskatedir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -653,7 +535,7 @@
 
 distclean: distclean-am
 	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool
+distclean-am: clean-am distclean-generic
 
 dvi: dvi-am
 
@@ -667,12 +549,20 @@
 
 install-data-am: install-indentscriptskateDATA install-scriptskateDATA
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -691,20 +581,23 @@
 
 ps-am:
 
-uninstall-am: uninstall-indentscriptskateDATA uninstall-info-am \
+uninstall-am: uninstall-indentscriptskateDATA \
 	uninstall-scriptskateDATA
 
+.MAKE: install-am install-strip
+
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
 	distclean distclean-generic distclean-libtool distdir dvi \
 	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-exec install-exec-am \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
 	install-indentscriptskateDATA install-info install-info-am \
-	install-man install-scriptskateDATA install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
+	install-man install-pdf install-pdf-am install-ps \
+	install-ps-am install-scriptskateDATA install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-generic \
 	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
-	uninstall-indentscriptskateDATA uninstall-info-am \
-	uninstall-scriptskateDATA
+	uninstall-indentscriptskateDATA uninstall-scriptskateDATA
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- kdelibs-3.5.7.orig/kate/interfaces/Makefile.in
+++ kdelibs-3.5.7/kate/interfaces/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,15 +16,11 @@
 @SET_MAKE@
 
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -73,7 +69,16 @@
 libkatepartinterfaces_la_nofinal_OBJECTS = interfaces.lo katecmd.lo
 @KDE_USE_FINAL_FALSE@libkatepartinterfaces_la_OBJECTS = $(libkatepartinterfaces_la_nofinal_OBJECTS)
 @KDE_USE_FINAL_TRUE@libkatepartinterfaces_la_OBJECTS = $(libkatepartinterfaces_la_final_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+#>- libkatepartinterfaces_la_LINK = $(LIBTOOL) --tag=CXX \
+#>- 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
+#>- 	$(AM_CXXFLAGS) $(CXXFLAGS) $(libkatepartinterfaces_la_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 4
+libkatepartinterfaces_la_LINK = $(LIBTOOL) --tag=CXX \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
+	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(libkatepartinterfaces_la_LDFLAGS) \
+	$(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -81,19 +86,21 @@
 #>+ 2
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
-#>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+#>+ 3
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
 CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 3
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(libkatepartinterfaces_la_SOURCES)
 DIST_SOURCES = $(libkatepartinterfaces_la_SOURCES)
 kateincludeHEADERS_INSTALL = $(INSTALL_HEADER)
@@ -106,8 +113,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -115,13 +120,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -135,8 +140,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -157,17 +160,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -236,7 +236,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -273,12 +272,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -323,87 +324,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -427,75 +384,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -503,16 +402,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -522,9 +420,7 @@
 lib_LTLIBRARIES = libkatepartinterfaces.la
 libkatepartinterfaces_la_SOURCES = interfaces.cpp katecmd.cpp
 libkatepartinterfaces_la_LIBADD = $(top_builddir)/interfaces/ktexteditor/libktexteditor.la
-#>- libkatepartinterfaces_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined
-#>+ 1
-libkatepartinterfaces_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined $(KDE_NO_UNDEFINED)
+libkatepartinterfaces_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined
 kateinclude_HEADERS = document.h view.h
 kateincludedir = $(includedir)/kate
 INCLUDES = -I$(top_srcdir)/interfaces -I$(top_srcdir)/kparts -I$(top_srcdir) $(all_includes)
@@ -534,7 +430,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -572,13 +468,13 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
@@ -589,7 +485,7 @@
 
 uninstall-libLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
@@ -603,11 +499,8 @@
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
-#>- libkatepartinterfaces.la: $(libkatepartinterfaces_la_OBJECTS) $(libkatepartinterfaces_la_DEPENDENCIES) 
-#>+ 2
-@KDE_USE_CLOSURE_TRUE@libkatepartinterfaces.la: libkatepartinterfaces.la.closure $(libkatepartinterfaces_la_OBJECTS) $(libkatepartinterfaces_la_DEPENDENCIES) 
-@KDE_USE_CLOSURE_FALSE@libkatepartinterfaces.la: $(libkatepartinterfaces_la_OBJECTS) $(libkatepartinterfaces_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(libdir) $(libkatepartinterfaces_la_LDFLAGS) $(libkatepartinterfaces_la_OBJECTS) $(libkatepartinterfaces_la_LIBADD) $(LIBS)
+libkatepartinterfaces.la: $(libkatepartinterfaces_la_OBJECTS) $(libkatepartinterfaces_la_DEPENDENCIES) 
+	$(libkatepartinterfaces_la_LINK) -rpath $(libdir) $(libkatepartinterfaces_la_OBJECTS) $(libkatepartinterfaces_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -619,22 +512,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/katecmd.Plo@am__quote@
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -644,13 +537,9 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 install-kateincludeHEADERS: $(kateinclude_HEADERS)
 	@$(NORMAL_INSTALL)
-	test -z "$(kateincludedir)" || $(mkdir_p) "$(DESTDIR)$(kateincludedir)"
+	test -z "$(kateincludedir)" || $(MKDIR_P) "$(DESTDIR)$(kateincludedir)"
 	@list='$(kateinclude_HEADERS)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -715,22 +604,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -746,7 +634,7 @@
 all-am: Makefile $(LTLIBRARIES) $(HEADERS)
 installdirs:
 	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(kateincludedir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -779,14 +667,14 @@
 #>- clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
 #>- 	mostlyclean-am
 #>+ 2
-clean-am: clean-metasources clean-closures clean-bcheck clean-final  clean-generic clean-libLTLIBRARIES clean-libtool \
+clean-am: clean-metasources clean-bcheck clean-final  clean-generic clean-libLTLIBRARIES clean-libtool \
 	mostlyclean-am
 
 distclean: distclean-am
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
@@ -800,12 +688,20 @@
 
 install-data-am: install-kateincludeHEADERS
 
+install-dvi: install-dvi-am
+
 install-exec-am: install-libLTLIBRARIES
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -826,36 +722,29 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-kateincludeHEADERS \
-	uninstall-libLTLIBRARIES
+uninstall-am: uninstall-kateincludeHEADERS uninstall-libLTLIBRARIES
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-libLTLIBRARIES clean-libtool ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
 	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-exec \
-	install-exec-am install-info install-info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am \
 	install-kateincludeHEADERS install-libLTLIBRARIES install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
 	install-strip installcheck installcheck-am installdirs \
 	maintainer-clean maintainer-clean-generic mostlyclean \
 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
 	pdf pdf-am ps ps-am tags uninstall uninstall-am \
-	uninstall-info-am uninstall-kateincludeHEADERS \
-	uninstall-libLTLIBRARIES
+	uninstall-kateincludeHEADERS uninstall-libLTLIBRARIES
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
-#>+ 8
-libkatepartinterfaces.la.closure: $(libkatepartinterfaces_la_OBJECTS) $(libkatepartinterfaces_la_DEPENDENCIES)
-	@echo "int main() {return 0;}" > libkatepartinterfaces_la_closure.cpp
-	@$(LTCXXCOMPILE) -c libkatepartinterfaces_la_closure.cpp
-	$(CXXLINK) libkatepartinterfaces_la_closure.lo $(libkatepartinterfaces_la_LDFLAGS) $(libkatepartinterfaces_la_OBJECTS) $(libkatepartinterfaces_la_LIBADD) $(LIBS)
-	@rm -f libkatepartinterfaces_la_closure.* libkatepartinterfaces.la.closure
-	@echo "timestamp" > libkatepartinterfaces.la.closure
-
-
 #>+ 3
 view.moc: $(srcdir)/view.h
 	$(MOC) $(srcdir)/view.h -o view.moc
@@ -877,10 +766,6 @@
 #>+ 2
 KDE_DIST=katecmd.h Makefile.in Makefile.am 
 
-#>+ 3
-clean-closures:
-	-rm -f  libkatepartinterfaces.la.closure
-
 #>+ 2
 docs-am:
 
--- kdelibs-3.5.7.orig/kate/Makefile.in
+++ kdelibs-3.5.7/kate/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,15 +14,11 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -57,17 +53,21 @@
 DIST_SOURCES =
 #>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 #>- 	html-recursive info-recursive install-data-recursive \
-#>- 	install-exec-recursive install-info-recursive \
-#>- 	install-recursive installcheck-recursive installdirs-recursive \
-#>- 	pdf-recursive ps-recursive uninstall-info-recursive \
-#>- 	uninstall-recursive
-#>+ 6
+#>- 	install-dvi-recursive install-exec-recursive \
+#>- 	install-html-recursive install-info-recursive \
+#>- 	install-pdf-recursive install-ps-recursive install-recursive \
+#>- 	installcheck-recursive installdirs-recursive pdf-recursive \
+#>- 	ps-recursive uninstall-recursive
+#>+ 7
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	html-recursive info-recursive install-data-recursive \
-	install-exec-recursive install-info-recursive \
-	install-recursive installcheck-recursive installdirs-recursive \
-	pdf-recursive ps-recursive uninstall-info-recursive \
-	uninstall-recursive nmcheck-recursive bcheck-recursive
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive nmcheck-recursive bcheck-recursive
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
@@ -77,8 +77,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -86,13 +84,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -106,8 +104,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -128,17 +124,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -207,7 +200,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -244,12 +236,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -294,87 +288,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -398,75 +348,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -474,16 +366,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -497,7 +388,7 @@
 all: docs-am  all-recursive
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(srcdir)/../admin/Doxyfile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../admin/Doxyfile.am $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -535,9 +426,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 mostlyclean-libtool:
@@ -546,10 +437,6 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
 # To change the values of `make' variables: instead of editing Makefiles,
@@ -581,8 +468,7 @@
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
+$(RECURSIVE_CLEAN_TARGETS):
 	@failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
@@ -683,23 +569,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	$(mkdir_p) $(distdir)/../admin
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -713,7 +597,7 @@
 	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
-	    || $(mkdir_p) "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 	    || exit 1; \
 	    distdir=`$(am__cd) $(distdir) && pwd`; \
 	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
@@ -721,6 +605,8 @@
 	      $(MAKE) $(AM_MAKEFLAGS) \
 	        top_distdir="$$top_distdir" \
 	        distdir="$$distdir/$$subdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -764,8 +650,7 @@
 
 distclean: distclean-recursive
 	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool \
-	distclean-tags
+distclean-am: clean-am distclean-generic distclean-tags
 
 dvi: dvi-recursive
 
@@ -779,12 +664,20 @@
 
 install-data-am: install-data-local
 
+install-dvi: install-dvi-recursive
+
 install-exec-am:
 
+install-html: install-html-recursive
+
 install-info: install-info-recursive
 
 install-man:
 
+install-pdf: install-pdf-recursive
+
+install-ps: install-ps-recursive
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
@@ -803,23 +696,24 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-local
+uninstall-am: uninstall-local
 
-uninstall-info: uninstall-info-recursive
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+	install-strip
 
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-	clean clean-generic clean-libtool clean-recursive ctags \
-	ctags-recursive distclean distclean-generic distclean-libtool \
-	distclean-recursive distclean-tags distdir dvi dvi-am html \
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+	all all-am check check-am clean clean-generic clean-libtool \
+	ctags ctags-recursive distclean distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
 	html-am info info-am install install-am install-data \
-	install-data-am install-data-local install-exec \
-	install-exec-am install-info install-info-am install-man \
-	install-strip installcheck installcheck-am installdirs \
-	installdirs-am maintainer-clean maintainer-clean-generic \
-	maintainer-clean-recursive mostlyclean mostlyclean-generic \
-	mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
-	tags tags-recursive uninstall uninstall-am uninstall-info-am \
-	uninstall-local
+	install-data-am install-data-local install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs installdirs-am \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags tags-recursive uninstall uninstall-am uninstall-local
 
 
 messages:
--- kdelibs-3.5.7.orig/kate/data/Makefile.in
+++ kdelibs-3.5.7/kate/data/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -15,15 +15,11 @@
 
 @SET_MAKE@
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -75,8 +71,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -84,13 +78,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -104,8 +98,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -126,17 +118,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -205,7 +194,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -242,12 +230,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -292,87 +282,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -396,75 +342,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -472,16 +360,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -515,7 +402,7 @@
 all: docs-am  all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -553,9 +440,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 mostlyclean-libtool:
@@ -563,13 +450,9 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 install-kde_servicesDATA: $(kde_services_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(kde_servicesdir)" || $(mkdir_p) "$(DESTDIR)$(kde_servicesdir)"
+	test -z "$(kde_servicesdir)" || $(MKDIR_P) "$(DESTDIR)$(kde_servicesdir)"
 	@list='$(kde_services_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -586,7 +469,7 @@
 	done
 install-partrcDATA: $(partrc_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(partrcdir)" || $(mkdir_p) "$(DESTDIR)$(partrcdir)"
+	test -z "$(partrcdir)" || $(MKDIR_P) "$(DESTDIR)$(partrcdir)"
 	@list='$(partrc_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -603,7 +486,7 @@
 	done
 install-rckateDATA: $(rckate_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(rckatedir)" || $(mkdir_p) "$(DESTDIR)$(rckatedir)"
+	test -z "$(rckatedir)" || $(MKDIR_P) "$(DESTDIR)$(rckatedir)"
 	@list='$(rckate_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -620,7 +503,7 @@
 	done
 install-syntaxkateDATA: $(syntaxkate_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(syntaxkatedir)" || $(mkdir_p) "$(DESTDIR)$(syntaxkatedir)"
+	test -z "$(syntaxkatedir)" || $(MKDIR_P) "$(DESTDIR)$(syntaxkatedir)"
 	@list='$(syntaxkate_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -643,22 +526,21 @@
 
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -674,7 +556,7 @@
 all-am: Makefile $(DATA)
 installdirs:
 	for dir in "$(DESTDIR)$(kde_servicesdir)" "$(DESTDIR)$(partrcdir)" "$(DESTDIR)$(rckatedir)" "$(DESTDIR)$(syntaxkatedir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -710,7 +592,7 @@
 
 distclean: distclean-am
 	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool
+distclean-am: clean-am distclean-generic
 
 dvi: dvi-am
 
@@ -725,12 +607,20 @@
 install-data-am: install-kde_servicesDATA install-partrcDATA \
 	install-rckateDATA install-syntaxkateDATA
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -749,21 +639,23 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-kde_servicesDATA \
-	uninstall-partrcDATA uninstall-rckateDATA \
-	uninstall-syntaxkateDATA
+uninstall-am: uninstall-kde_servicesDATA uninstall-partrcDATA \
+	uninstall-rckateDATA uninstall-syntaxkateDATA
+
+.MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
 	distclean distclean-generic distclean-libtool distdir dvi \
 	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-exec install-exec-am \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
 	install-info install-info-am install-kde_servicesDATA \
-	install-man install-partrcDATA install-rckateDATA \
-	install-strip install-syntaxkateDATA installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
-	uninstall-info-am uninstall-kde_servicesDATA \
+	install-man install-partrcDATA install-pdf install-pdf-am \
+	install-ps install-ps-am install-rckateDATA install-strip \
+	install-syntaxkateDATA installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+	ps ps-am uninstall uninstall-am uninstall-kde_servicesDATA \
 	uninstall-partrcDATA uninstall-rckateDATA \
 	uninstall-syntaxkateDATA
 
--- kdelibs-3.5.7.orig/kab/Makefile.in
+++ kdelibs-3.5.7/kab/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -15,15 +15,11 @@
 
 @SET_MAKE@
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -62,7 +58,14 @@
 libkab_la_nofinal_OBJECTS = kabapi.lo addressbook.lo qconfigDB.lo
 @KDE_USE_FINAL_FALSE@libkab_la_OBJECTS = $(libkab_la_nofinal_OBJECTS)
 @KDE_USE_FINAL_TRUE@libkab_la_OBJECTS = $(libkab_la_final_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+#>- libkab_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(libkab_la_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+libkab_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(libkab_la_LDFLAGS) $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -70,19 +73,21 @@
 #>+ 2
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
-#>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+#>+ 3
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
 CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 3
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(libkab_la_SOURCES)
 DIST_SOURCES = $(libkab_la_SOURCES)
 ETAGS = etags
@@ -93,8 +98,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -102,13 +105,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -122,8 +125,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -144,17 +145,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -223,7 +221,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -260,12 +257,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -310,87 +309,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -414,75 +369,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -490,16 +387,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -514,9 +410,7 @@
 	addressbook.cc \
 	qconfigDB.cc 
 
-#>- libkab_la_LDFLAGS = $(KDE_MT_LDFLAGS) -no-undefined
-#>+ 1
-libkab_la_LDFLAGS = $(KDE_MT_LDFLAGS) -no-undefined $(KDE_NO_UNDEFINED)
+libkab_la_LDFLAGS = $(KDE_MT_LDFLAGS) -no-undefined
 libkab_la_LIBADD = ../kdeui/libkdeui.la
 #>- libkab_la_METASOURCES = AUTO
 #>- all: all-am
@@ -525,7 +419,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cc .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -563,9 +457,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 clean-noinstLTLIBRARIES:
@@ -576,11 +470,8 @@
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
-#>- libkab.la: $(libkab_la_OBJECTS) $(libkab_la_DEPENDENCIES) 
-#>+ 2
-@KDE_USE_CLOSURE_TRUE@libkab.la: libkab.la.closure $(libkab_la_OBJECTS) $(libkab_la_DEPENDENCIES) 
-@KDE_USE_CLOSURE_FALSE@libkab.la: $(libkab_la_OBJECTS) $(libkab_la_DEPENDENCIES) 
-	$(CXXLINK)  $(libkab_la_LDFLAGS) $(libkab_la_OBJECTS) $(libkab_la_LIBADD) $(LIBS)
+libkab.la: $(libkab_la_OBJECTS) $(libkab_la_DEPENDENCIES) 
+	$(libkab_la_LINK)  $(libkab_la_OBJECTS) $(libkab_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -593,22 +484,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/qconfigDB.Plo@am__quote@
 
 .cc.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cc.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cc.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -619,10 +510,6 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -672,22 +559,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -733,14 +619,14 @@
 #>- clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
 #>- 	mostlyclean-am
 #>+ 2
-clean-am: clean-metasources clean-closures clean-bcheck clean-final  clean-generic clean-libtool clean-noinstLTLIBRARIES \
+clean-am: clean-metasources clean-bcheck clean-final  clean-generic clean-libtool clean-noinstLTLIBRARIES \
 	mostlyclean-am
 
 distclean: distclean-am
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
@@ -754,12 +640,20 @@
 
 install-data-am:
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -780,33 +674,27 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am
+uninstall-am:
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-libtool clean-noinstLTLIBRARIES ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
 	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-exec \
-	install-exec-am install-info install-info-am install-man \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
 	install-strip installcheck installcheck-am installdirs \
 	maintainer-clean maintainer-clean-generic mostlyclean \
 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-	pdf pdf-am ps ps-am tags uninstall uninstall-am \
-	uninstall-info-am
+	pdf pdf-am ps ps-am tags uninstall uninstall-am
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
-#>+ 8
-libkab.la.closure: $(libkab_la_OBJECTS) $(libkab_la_DEPENDENCIES)
-	@echo "int main() {return 0;}" > libkab_la_closure.cc
-	@$(LTCXXCOMPILE) -c libkab_la_closure.cc
-	$(CXXLINK) libkab_la_closure.lo $(libkab_la_LDFLAGS) $(libkab_la_OBJECTS) $(libkab_la_LIBADD) $(LIBS)
-	@rm -f libkab_la_closure.* libkab.la.closure
-	@echo "timestamp" > libkab.la.closure
-
-
 #>+ 3
 kabapi.moc: $(srcdir)/kabapi.h
 	$(MOC) $(srcdir)/kabapi.h -o kabapi.moc
@@ -835,10 +723,6 @@
 #>+ 2
 KDE_DIST=README.KABAPI template.kab template.config addressbook.h README.FORMAT kabapi.h Makefile.in qconfigDB.h Makefile.am 
 
-#>+ 3
-clean-closures:
-	-rm -f  libkab.la.closure
-
 #>+ 2
 docs-am:
 
--- kdelibs-3.5.7.orig/kcert/Makefile.in
+++ kdelibs-3.5.7/kcert/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,15 +16,11 @@
 @SET_MAKE@
 
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -68,7 +64,14 @@
 #>- libkcertpart_la_OBJECTS = $(am_libkcertpart_la_OBJECTS)
 #>+ 1
 libkcertpart_la_OBJECTS = kcertpart.lo
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+#>- libkcertpart_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(libkcertpart_la_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+libkcertpart_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(libkcertpart_la_LDFLAGS) $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -76,19 +79,21 @@
 #>+ 2
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 #>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
 CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 3
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(libkcertpart_la_SOURCES)
 DIST_SOURCES = $(libkcertpart_la_SOURCES)
 rcDATA_INSTALL = $(INSTALL_DATA)
@@ -102,8 +107,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -111,13 +114,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -131,8 +134,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -153,17 +154,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -232,7 +230,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -269,12 +266,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -319,87 +318,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -423,75 +378,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -499,16 +396,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -531,7 +427,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cc .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -569,13 +465,13 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
+	test -z "$(kde_moduledir)" || $(MKDIR_P) "$(DESTDIR)$(kde_moduledir)"
 	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
@@ -586,7 +482,7 @@
 
 uninstall-kde_moduleLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
@@ -600,11 +496,8 @@
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
-#>- libkcertpart.la: $(libkcertpart_la_OBJECTS) $(libkcertpart_la_DEPENDENCIES) 
-#>+ 2
-@KDE_USE_CLOSURE_TRUE@libkcertpart.la: libkcertpart.la.closure $(libkcertpart_la_OBJECTS) $(libkcertpart_la_DEPENDENCIES) 
-@KDE_USE_CLOSURE_FALSE@libkcertpart.la: $(libkcertpart_la_OBJECTS) $(libkcertpart_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(kde_moduledir) $(libkcertpart_la_LDFLAGS) $(libkcertpart_la_OBJECTS) $(libkcertpart_la_LIBADD) $(LIBS)
+libkcertpart.la: $(libkcertpart_la_OBJECTS) $(libkcertpart_la_DEPENDENCIES) 
+	$(libkcertpart_la_LINK) -rpath $(kde_moduledir) $(libkcertpart_la_OBJECTS) $(libkcertpart_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -615,22 +508,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kcertpart.Plo@am__quote@
 
 .cc.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cc.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cc.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -640,13 +533,9 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 install-rcDATA: $(rc_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(rcdir)" || $(mkdir_p) "$(DESTDIR)$(rcdir)"
+	test -z "$(rcdir)" || $(MKDIR_P) "$(DESTDIR)$(rcdir)"
 	@list='$(rc_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -663,7 +552,7 @@
 	done
 install-serviceDATA: $(service_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(servicedir)" || $(mkdir_p) "$(DESTDIR)$(servicedir)"
+	test -z "$(servicedir)" || $(MKDIR_P) "$(DESTDIR)$(servicedir)"
 	@list='$(service_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -728,22 +617,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -759,7 +647,7 @@
 all-am: Makefile $(LTLIBRARIES) $(DATA)
 installdirs:
 	for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(rcdir)" "$(DESTDIR)$(servicedir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -792,14 +680,14 @@
 #>- clean-am: clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
 #>- 	mostlyclean-am
 #>+ 2
-clean-am: clean-metasources clean-closures clean-bcheck  clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
+clean-am: clean-metasources clean-bcheck  clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
 	mostlyclean-am
 
 distclean: distclean-am
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
@@ -817,14 +705,22 @@
 install-data-am:   install-rcDATA \
 	install-serviceDATA
 
+install-dvi: install-dvi-am
+
 #>- install-exec-am:
 #>+ 1
 install-exec-am:  install-kde_moduleLTLIBRARIES
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -845,36 +741,31 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-kde_moduleLTLIBRARIES \
-	uninstall-rcDATA uninstall-serviceDATA
+uninstall-am: uninstall-kde_moduleLTLIBRARIES uninstall-rcDATA \
+	uninstall-serviceDATA
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-kde_moduleLTLIBRARIES clean-libtool ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
 	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-exec \
-	install-exec-am install-info install-info-am \
-	install-kde_moduleLTLIBRARIES install-man install-rcDATA \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am \
+	install-kde_moduleLTLIBRARIES install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-rcDATA \
 	install-serviceDATA install-strip installcheck installcheck-am \
 	installdirs maintainer-clean maintainer-clean-generic \
 	mostlyclean mostlyclean-compile mostlyclean-generic \
 	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
-	uninstall-am uninstall-info-am uninstall-kde_moduleLTLIBRARIES \
-	uninstall-rcDATA uninstall-serviceDATA
+	uninstall-am uninstall-kde_moduleLTLIBRARIES uninstall-rcDATA \
+	uninstall-serviceDATA
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
-#>+ 8
-libkcertpart.la.closure: $(libkcertpart_la_OBJECTS) $(libkcertpart_la_DEPENDENCIES)
-	@echo "int main() {return 0;}" > libkcertpart_la_closure.cc
-	@$(LTCXXCOMPILE) -c libkcertpart_la_closure.cc
-	$(CXXLINK) libkcertpart_la_closure.lo $(libkcertpart_la_LDFLAGS) $(libkcertpart_la_OBJECTS) $(libkcertpart_la_LIBADD) $(LIBS)
-	@rm -f libkcertpart_la_closure.* libkcertpart.la.closure
-	@echo "timestamp" > libkcertpart.la.closure
-
-
 #>+ 3
 kcertpart.moc: $(srcdir)/kcertpart.h
 	$(MOC) $(srcdir)/kcertpart.h -o kcertpart.moc
@@ -889,10 +780,6 @@
 #>+ 2
 KDE_DIST=kcertpart.h Makefile.in kcertpart.rc kcertpart.desktop Makefile.am 
 
-#>+ 3
-clean-closures:
-	-rm -f  libkcertpart.la.closure
-
 #>+ 2
 docs-am:
 
--- kdelibs-3.5.7.orig/kcmshell/Makefile.in
+++ kdelibs-3.5.7/kcmshell/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -37,15 +37,11 @@
 
 
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -96,12 +92,19 @@
 #>- kcmshell_la_OBJECTS = $(am_kcmshell_la_OBJECTS)
 #>+ 1
 kcmshell_la_OBJECTS = kcmshell_dummy.lo
+#>- kcmshell_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(kcmshell_la_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+kcmshell_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(kcmshell_la_LDFLAGS) $(LDFLAGS) -o $@
 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 #>- PROGRAMS = $(bin_PROGRAMS)
 #>+ 2
 bin_PROGRAMS += kcmshell$(EXEEXT) 
 PROGRAMS = $(bin_PROGRAMS)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -109,19 +112,21 @@
 #>+ 2
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 #>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
 CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 3
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 #>- SOURCES = $(kcmshell_la_SOURCES)
 #>+ 1
 SOURCES = $(kcmshell_la_SOURCES) $(kcmshell_SOURCES) 
@@ -137,8 +142,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -146,13 +149,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -166,8 +169,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -188,17 +189,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -267,7 +265,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -304,12 +301,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -354,87 +353,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -458,75 +413,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -534,16 +431,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -570,7 +466,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -608,13 +504,13 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(kdeinitdir)" || $(mkdir_p) "$(DESTDIR)$(kdeinitdir)"
+	test -z "$(kdeinitdir)" || $(MKDIR_P) "$(DESTDIR)$(kdeinitdir)"
 	@list='$(kdeinit_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
@@ -625,7 +521,7 @@
 
 uninstall-kdeinitLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@set -x; list='$(kdeinit_LTLIBRARIES)'; for p in $$list; do \
+	@list='$(kdeinit_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kdeinitdir)/$$p'"; \
 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kdeinitdir)/$$p"; \
@@ -641,7 +537,7 @@
 	done
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
@@ -652,7 +548,7 @@
 
 uninstall-libLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
@@ -667,10 +563,10 @@
 	  rm -f "$${dir}/so_locations"; \
 	done
 kcmshell.la: $(kcmshell_la_OBJECTS) $(kcmshell_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(kdeinitdir) $(kcmshell_la_LDFLAGS) $(kcmshell_la_OBJECTS) $(kcmshell_la_LIBADD) $(LIBS)
+	$(kcmshell_la_LINK) -rpath $(kdeinitdir) $(kcmshell_la_OBJECTS) $(kcmshell_la_LIBADD) $(LIBS)
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
+	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
 	  if test -f $$p \
@@ -706,22 +602,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Plo@am__quote@
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -732,10 +628,6 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -785,23 +677,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	$(mkdir_p) $(distdir)/../admin
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -819,7 +709,7 @@
 
 installdirs:
 	for dir in "$(DESTDIR)$(kdeinitdir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -859,7 +749,7 @@
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
@@ -873,12 +763,20 @@
 
 install-data-am: install-data-local install-kdeinitLTLIBRARIES
 
+install-dvi: install-dvi-am
+
 install-exec-am: install-binPROGRAMS install-libLTLIBRARIES
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -899,9 +797,10 @@
 
 ps-am:
 
-uninstall-am: uninstall-binPROGRAMS uninstall-info-am \
-	uninstall-kdeinitLTLIBRARIES uninstall-libLTLIBRARIES \
-	uninstall-local
+uninstall-am: uninstall-binPROGRAMS uninstall-kdeinitLTLIBRARIES \
+	uninstall-libLTLIBRARIES uninstall-local
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
 	clean-generic clean-kdeinitLTLIBRARIES clean-libLTLIBRARIES \
@@ -909,15 +808,17 @@
 	distclean-generic distclean-libtool distclean-tags distdir dvi \
 	dvi-am html html-am info info-am install install-am \
 	install-binPROGRAMS install-data install-data-am \
-	install-data-local install-exec install-exec-am install-info \
+	install-data-local install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
 	install-info-am install-kdeinitLTLIBRARIES \
-	install-libLTLIBRARIES install-man install-strip installcheck \
+	install-libLTLIBRARIES install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
 	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 	tags uninstall uninstall-am uninstall-binPROGRAMS \
-	uninstall-info-am uninstall-kdeinitLTLIBRARIES \
-	uninstall-libLTLIBRARIES uninstall-local
+	uninstall-kdeinitLTLIBRARIES uninstall-libLTLIBRARIES \
+	uninstall-local
 
 
 messages: rc.cpp
--- kdelibs-3.5.7.orig/Makefile.am
+++ kdelibs-3.5.7/Makefile.am
@@ -54,10 +54,8 @@
 	find $$dirs -maxdepth 1 -name "*.cc" -print >> files ;\
 	find $$dirs -maxdepth 1 -name "*.h" -print >> files ;\
 	echo ./kdecore/kde-config.cpp.in >> files ;\
-	$(EXTRACTRC) `find $$dirs -maxdepth 1 \( -name "*.rc" -o -name "*.ui" \) ` ./dnssd/kcm_kdnssd.kcfg > rc.cpp; \
-	: > kde.pot ;\
+	$(EXTRACTRC) `find $$dirs -maxdepth 1 \( -name "*.rc" -o -name "*.ui" \) ` ./dnssd/kcm_kdnssd.kcfg > rc.cpp;
 	$(XGETTEXT) -ktranslate -x qt-messages.pot rc.cpp `cat files` && cat messages.po qt-messages.pot > $(podir)/kdelibs.pot
-	$(XGETTEXT) common_texts.cpp -o kde.pot
 	rm -f dirs
 
 EXTRA_DIST = admin kde.pot \
--- kdelibs-3.5.7.orig/khtml/css/Makefile.in
+++ kdelibs-3.5.7/khtml/css/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -36,15 +36,11 @@
 
 
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -87,7 +83,7 @@
 	csshelper.lo parser.lo css_renderstyledeclarationimpl.lo
 @KDE_USE_FINAL_FALSE@libkhtmlcss_la_OBJECTS = $(libkhtmlcss_la_nofinal_OBJECTS)
 @KDE_USE_FINAL_TRUE@libkhtmlcss_la_OBJECTS = $(libkhtmlcss_la_final_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -95,19 +91,21 @@
 #>+ 2
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 #>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
 CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 3
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(libkhtmlcss_la_SOURCES)
 DIST_SOURCES = $(libkhtmlcss_la_SOURCES)
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -128,8 +126,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -137,13 +133,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -157,8 +153,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -179,17 +173,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -258,7 +249,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -295,12 +285,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -345,87 +337,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -449,75 +397,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -525,16 +415,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -572,7 +461,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -610,9 +499,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 clean-noinstLTLIBRARIES:
@@ -624,7 +513,7 @@
 	  rm -f "$${dir}/so_locations"; \
 	done
 libkhtmlcss.la: $(libkhtmlcss_la_OBJECTS) $(libkhtmlcss_la_DEPENDENCIES) 
-	$(CXXLINK)  $(libkhtmlcss_la_LDFLAGS) $(libkhtmlcss_la_OBJECTS) $(libkhtmlcss_la_LIBADD) $(LIBS)
+	$(CXXLINK)  $(libkhtmlcss_la_OBJECTS) $(libkhtmlcss_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -643,22 +532,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parser.Plo@am__quote@
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -668,13 +557,9 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 install-cssDATA: $(css_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(cssdir)" || $(mkdir_p) "$(DESTDIR)$(cssdir)"
+	test -z "$(cssdir)" || $(MKDIR_P) "$(DESTDIR)$(cssdir)"
 	@list='$(css_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -739,22 +624,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -770,7 +654,7 @@
 all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS)
 installdirs:
 	for dir in "$(DESTDIR)$(cssdir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -810,7 +694,7 @@
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
@@ -824,12 +708,20 @@
 
 install-data-am: install-cssDATA
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -850,20 +742,23 @@
 
 ps-am:
 
-uninstall-am: uninstall-cssDATA uninstall-info-am
+uninstall-am: uninstall-cssDATA
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-libtool clean-noinstLTLIBRARIES ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
 	distclean-tags distdir dvi dvi-am html html-am info info-am \
 	install install-am install-cssDATA install-data \
-	install-data-am install-exec install-exec-am install-info \
-	install-info-am install-man install-strip installcheck \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
 	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-cssDATA \
-	uninstall-info-am
+	tags uninstall uninstall-am uninstall-cssDATA
 
 
 parser: $(srcdir)/parser.y
--- kdelibs-3.5.7.orig/khtml/pics/Makefile.in
+++ kdelibs-3.5.7/khtml/pics/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,15 +14,11 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -59,8 +55,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -68,13 +62,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -88,8 +82,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -110,17 +102,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -189,7 +178,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -226,12 +214,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -276,87 +266,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -380,75 +326,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -456,16 +344,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -488,7 +375,7 @@
 all: docs-am  all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -526,9 +413,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 mostlyclean-libtool:
@@ -536,10 +423,6 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 tags: TAGS
 TAGS:
 
@@ -548,22 +431,21 @@
 
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -612,7 +494,7 @@
 
 distclean: distclean-am
 	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool
+distclean-am: clean-am distclean-generic
 
 dvi: dvi-am
 
@@ -628,12 +510,20 @@
 #>+ 1
 install-data-am: install-kde-icons 
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -652,19 +542,22 @@
 
 ps-am:
 
-#>- uninstall-am: uninstall-info-am
+#>- uninstall-am:
 #>+ 1
-uninstall-am: uninstall-kde-icons  uninstall-info-am
+uninstall-am: uninstall-kde-icons 
+
+.MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
 	distclean distclean-generic distclean-libtool distdir dvi \
 	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-exec install-exec-am \
-	install-info install-info-am install-man install-strip \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
 	installcheck installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
-	uninstall-info-am
+	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- kdelibs-3.5.7.orig/khtml/misc/Makefile.in
+++ kdelibs-3.5.7/khtml/misc/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -35,15 +35,11 @@
 #    Boston, MA 02110-1301, USA.
 
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -77,15 +73,24 @@
 am__DEPENDENCIES_1 =
 libkhtmlmisc_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
 am_libkhtmlmisc_la_OBJECTS = decoder.lo loader.lo loader_jpeg.lo \
-	guess_ja.lo htmlhashes.lo helper.lo arena.lo stringit.lo
+	guess_ja.lo htmlhashes.lo helper.lo arena.lo stringit.lo \
+	knsplugininstaller.lo
 #>- libkhtmlmisc_la_OBJECTS = $(am_libkhtmlmisc_la_OBJECTS)
-#>+ 5
+#>+ 6
 libkhtmlmisc_la_final_OBJECTS = libkhtmlmisc_la.all_cpp.lo 
 libkhtmlmisc_la_nofinal_OBJECTS = decoder.lo loader.lo loader_jpeg.lo \
-	guess_ja.lo htmlhashes.lo helper.lo arena.lo stringit.lo
+	guess_ja.lo htmlhashes.lo helper.lo arena.lo stringit.lo \
+	knsplugininstaller.lo
 @KDE_USE_FINAL_FALSE@libkhtmlmisc_la_OBJECTS = $(libkhtmlmisc_la_nofinal_OBJECTS)
 @KDE_USE_FINAL_TRUE@libkhtmlmisc_la_OBJECTS = $(libkhtmlmisc_la_final_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+#>- libkhtmlmisc_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(libkhtmlmisc_la_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+libkhtmlmisc_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(libkhtmlmisc_la_LDFLAGS) $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -93,19 +98,21 @@
 #>+ 2
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
-#>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+#>+ 3
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
 CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 3
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(libkhtmlmisc_la_SOURCES)
 DIST_SOURCES = $(libkhtmlmisc_la_SOURCES)
 HEADERS = $(noinst_HEADERS)
@@ -117,8 +124,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -126,13 +131,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -146,8 +151,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -168,17 +171,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -247,7 +247,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -284,12 +283,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -334,87 +335,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -438,75 +395,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -514,16 +413,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -533,14 +431,14 @@
 noinst_LTLIBRARIES = libkhtmlmisc.la
 libkhtmlmisc_la_SOURCES = \
 	decoder.cpp    loader.cpp loader_jpeg.cpp guess_ja.cpp\
-	htmlhashes.cpp helper.cpp arena.cpp stringit.cpp
+	htmlhashes.cpp helper.cpp arena.cpp stringit.cpp knsplugininstaller.cpp
 
 libkhtmlmisc_la_LIBADD = $(LIBJPEG)
 libkhtmlmisc_la_LDFLAGS = $(USER_LDFLAGS)
 #>- libkhtmlmisc_la_METASOURCES = AUTO
 noinst_HEADERS = \
 	decoder.h khtmllayout.h loader_jpeg.h loader.h guess_ja.h\
-	stringit.h htmlhashes.h helper.h shared.h arena.h 
+	stringit.h htmlhashes.h helper.h shared.h arena.h knsplugininstaller.h
 
 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/dcop -I$(top_srcdir)/kio -I$(top_srcdir)/libltdl \
            -I$(top_srcdir)/khtml -I$(top_srcdir)/kutils $(all_includes)
@@ -552,7 +450,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -590,9 +488,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 clean-noinstLTLIBRARIES:
@@ -604,7 +502,7 @@
 	  rm -f "$${dir}/so_locations"; \
 	done
 libkhtmlmisc.la: $(libkhtmlmisc_la_OBJECTS) $(libkhtmlmisc_la_DEPENDENCIES) 
-	$(CXXLINK)  $(libkhtmlmisc_la_LDFLAGS) $(libkhtmlmisc_la_OBJECTS) $(libkhtmlmisc_la_LIBADD) $(LIBS)
+	$(libkhtmlmisc_la_LINK)  $(libkhtmlmisc_la_OBJECTS) $(libkhtmlmisc_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -617,27 +515,28 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/guess_ja.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/helper.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/htmlhashes.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/knsplugininstaller.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/loader.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/loader_jpeg.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stringit.Plo@am__quote@
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -648,10 +547,6 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -701,22 +596,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -769,7 +663,7 @@
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
@@ -783,12 +677,20 @@
 
 install-data-am:
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -809,19 +711,22 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am
+uninstall-am:
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-libtool clean-noinstLTLIBRARIES ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
 	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-exec \
-	install-exec-am install-info install-info-am install-man \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
 	install-strip installcheck installcheck-am installdirs \
 	maintainer-clean maintainer-clean-generic mostlyclean \
 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-	pdf pdf-am ps ps-am tags uninstall uninstall-am \
-	uninstall-info-am
+	pdf pdf-am ps ps-am tags uninstall uninstall-am
 
 
 srcdoc:
@@ -832,6 +737,13 @@
 .NOEXPORT:
 
 #>+ 3
+knsplugininstaller.moc: $(srcdir)/knsplugininstaller.h
+	$(MOC) $(srcdir)/knsplugininstaller.h -o knsplugininstaller.moc
+
+#>+ 2
+mocs: knsplugininstaller.moc
+
+#>+ 3
 loader.moc: $(srcdir)/loader.h
 	$(MOC) $(srcdir)/loader.h -o loader.moc
 
@@ -840,7 +752,7 @@
 
 #>+ 3
 clean-metasources:
-	-rm -f  loader.moc
+	-rm -f  knsplugininstaller.moc loader.moc
 
 #>+ 2
 KDE_DIST=loader_client.h maketags Makefile.in htmlattrs.c htmltags.in makeattrs htmltags.h seed.h blocked_icon.cpp htmltags.c htmlattrs.h multimap.h blocked_icon.png htmlattrs.in Makefile.am 
@@ -887,11 +799,11 @@
 
 
 #>+ 11
-libkhtmlmisc_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/decoder.cpp $(srcdir)/loader.cpp $(srcdir)/loader_jpeg.cpp $(srcdir)/guess_ja.cpp $(srcdir)/htmlhashes.cpp $(srcdir)/helper.cpp $(srcdir)/arena.cpp $(srcdir)/stringit.cpp  loader.moc
+libkhtmlmisc_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/decoder.cpp $(srcdir)/loader.cpp $(srcdir)/loader_jpeg.cpp $(srcdir)/guess_ja.cpp $(srcdir)/htmlhashes.cpp $(srcdir)/helper.cpp $(srcdir)/arena.cpp $(srcdir)/stringit.cpp $(srcdir)/knsplugininstaller.cpp  knsplugininstaller.moc loader.moc
 	@echo 'creating libkhtmlmisc_la.all_cpp.cpp ...'; \
 	rm -f libkhtmlmisc_la.all_cpp.files libkhtmlmisc_la.all_cpp.final; \
 	echo "#define KDE_USE_FINAL 1" >> libkhtmlmisc_la.all_cpp.final; \
-	for file in decoder.cpp loader.cpp loader_jpeg.cpp guess_ja.cpp htmlhashes.cpp helper.cpp arena.cpp stringit.cpp ; do \
+	for file in decoder.cpp loader.cpp loader_jpeg.cpp guess_ja.cpp htmlhashes.cpp helper.cpp arena.cpp stringit.cpp knsplugininstaller.cpp ; do \
 	  echo "#include \"$$file\"" >> libkhtmlmisc_la.all_cpp.files; \
 	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkhtmlmisc_la.all_cpp.final; \
 	done; \
@@ -922,8 +834,10 @@
 kde-rpo-clean:
 	-rm -f *.rpo
 
-#>+ 5
+#>+ 7
 nmcheck: 
 loader.o: loader.moc 
-loader.lo: loader.moc 
+knsplugininstaller.o: knsplugininstaller.moc 
 nmcheck-am: nmcheck
+knsplugininstaller.lo: knsplugininstaller.moc 
+loader.lo: loader.moc 
--- kdelibs-3.5.7.orig/khtml/dom/Makefile.in
+++ kdelibs-3.5.7/khtml/dom/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -35,15 +35,11 @@
 #    Boston, MA 02110-1301, USA.
 
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -94,7 +90,7 @@
 	dom2_events.lo dom2_views.lo
 @KDE_USE_FINAL_FALSE@libkhtmldom_la_OBJECTS = $(libkhtmldom_la_nofinal_OBJECTS)
 @KDE_USE_FINAL_TRUE@libkhtmldom_la_OBJECTS = $(libkhtmldom_la_final_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -102,19 +98,21 @@
 #>+ 2
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 #>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
 CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 3
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(libkhtmldom_la_SOURCES)
 DIST_SOURCES = $(libkhtmldom_la_SOURCES)
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -134,8 +132,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -143,13 +139,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -163,8 +159,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -185,17 +179,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -264,7 +255,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -301,12 +291,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -351,87 +343,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -455,75 +403,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -531,16 +421,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -583,7 +472,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -621,9 +510,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 clean-noinstLTLIBRARIES:
@@ -635,7 +524,7 @@
 	  rm -f "$${dir}/so_locations"; \
 	done
 libkhtmldom.la: $(libkhtmldom_la_OBJECTS) $(libkhtmldom_la_DEPENDENCIES) 
-	$(CXXLINK)  $(libkhtmldom_la_LDFLAGS) $(libkhtmldom_la_OBJECTS) $(libkhtmldom_la_LIBADD) $(LIBS)
+	$(CXXLINK)  $(libkhtmldom_la_OBJECTS) $(libkhtmldom_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -671,22 +560,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/html_table.Plo@am__quote@
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -696,13 +585,9 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 install-myincludeHEADERS: $(myinclude_HEADERS)
 	@$(NORMAL_INSTALL)
-	test -z "$(myincludedir)" || $(mkdir_p) "$(DESTDIR)$(myincludedir)"
+	test -z "$(myincludedir)" || $(MKDIR_P) "$(DESTDIR)$(myincludedir)"
 	@list='$(myinclude_HEADERS)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -767,22 +652,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -798,7 +682,7 @@
 all-am: Makefile $(LTLIBRARIES) $(HEADERS)
 installdirs:
 	for dir in "$(DESTDIR)$(myincludedir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -838,7 +722,7 @@
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
@@ -852,12 +736,20 @@
 
 install-data-am: install-myincludeHEADERS
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -878,20 +770,23 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-myincludeHEADERS
+uninstall-am: uninstall-myincludeHEADERS
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-libtool clean-noinstLTLIBRARIES ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
 	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-exec \
-	install-exec-am install-info install-info-am install-man \
-	install-myincludeHEADERS install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-info-am \
-	uninstall-myincludeHEADERS
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-myincludeHEADERS install-pdf install-pdf-am install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
+	uninstall-am uninstall-myincludeHEADERS
 
 
 srcdoc:
--- kdelibs-3.5.7.orig/khtml/kmultipart/Makefile.in
+++ kdelibs-3.5.7/khtml/kmultipart/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,15 +16,11 @@
 @SET_MAKE@
 
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -68,7 +64,14 @@
 #>- libkmultipart_la_OBJECTS = $(am_libkmultipart_la_OBJECTS)
 #>+ 1
 libkmultipart_la_OBJECTS = kmultipart.lo
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+#>- libkmultipart_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(libkmultipart_la_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+libkmultipart_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(libkmultipart_la_LDFLAGS) $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -76,19 +79,21 @@
 #>+ 2
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 #>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
 CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 3
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(libkmultipart_la_SOURCES)
 DIST_SOURCES = $(libkmultipart_la_SOURCES)
 kde_servicesDATA_INSTALL = $(INSTALL_DATA)
@@ -101,8 +106,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -110,13 +113,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -130,8 +133,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -152,17 +153,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -231,7 +229,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -268,12 +265,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -318,87 +317,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -422,75 +377,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -498,16 +395,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -534,7 +430,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -572,13 +468,13 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
+	test -z "$(kde_moduledir)" || $(MKDIR_P) "$(DESTDIR)$(kde_moduledir)"
 	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
@@ -589,7 +485,7 @@
 
 uninstall-kde_moduleLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
@@ -603,11 +499,8 @@
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
-#>- libkmultipart.la: $(libkmultipart_la_OBJECTS) $(libkmultipart_la_DEPENDENCIES) 
-#>+ 2
-@KDE_USE_CLOSURE_TRUE@libkmultipart.la: libkmultipart.la.closure $(libkmultipart_la_OBJECTS) $(libkmultipart_la_DEPENDENCIES) 
-@KDE_USE_CLOSURE_FALSE@libkmultipart.la: $(libkmultipart_la_OBJECTS) $(libkmultipart_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(kde_moduledir) $(libkmultipart_la_LDFLAGS) $(libkmultipart_la_OBJECTS) $(libkmultipart_la_LIBADD) $(LIBS)
+libkmultipart.la: $(libkmultipart_la_OBJECTS) $(libkmultipart_la_DEPENDENCIES) 
+	$(libkmultipart_la_LINK) -rpath $(kde_moduledir) $(libkmultipart_la_OBJECTS) $(libkmultipart_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -618,22 +511,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kmultipart.Plo@am__quote@
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -643,13 +536,9 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 install-kde_servicesDATA: $(kde_services_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(kde_servicesdir)" || $(mkdir_p) "$(DESTDIR)$(kde_servicesdir)"
+	test -z "$(kde_servicesdir)" || $(MKDIR_P) "$(DESTDIR)$(kde_servicesdir)"
 	@list='$(kde_services_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -714,22 +603,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -745,7 +633,7 @@
 all-am: Makefile $(LTLIBRARIES) $(DATA)
 installdirs:
 	for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(kde_servicesdir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -778,14 +666,14 @@
 #>- clean-am: clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
 #>- 	mostlyclean-am
 #>+ 2
-clean-am: clean-metasources clean-closures clean-bcheck  clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
+clean-am: clean-metasources clean-bcheck  clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
 	mostlyclean-am
 
 distclean: distclean-am
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
@@ -803,14 +691,22 @@
 install-data-am:   \
 	install-kde_servicesDATA
 
+install-dvi: install-dvi-am
+
 #>- install-exec-am:
 #>+ 1
 install-exec-am:  install-kde_moduleLTLIBRARIES
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -831,36 +727,31 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-kde_moduleLTLIBRARIES \
+uninstall-am: uninstall-kde_moduleLTLIBRARIES \
 	uninstall-kde_servicesDATA
 
+.MAKE: install-am install-strip
+
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-kde_moduleLTLIBRARIES clean-libtool ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
 	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-exec \
-	install-exec-am install-info install-info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am \
 	install-kde_moduleLTLIBRARIES install-kde_servicesDATA \
-	install-man install-strip installcheck installcheck-am \
+	install-man install-pdf install-pdf-am install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
 	installdirs maintainer-clean maintainer-clean-generic \
 	mostlyclean mostlyclean-compile mostlyclean-generic \
 	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
-	uninstall-am uninstall-info-am uninstall-kde_moduleLTLIBRARIES \
+	uninstall-am uninstall-kde_moduleLTLIBRARIES \
 	uninstall-kde_servicesDATA
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
-#>+ 8
-libkmultipart.la.closure: $(libkmultipart_la_OBJECTS) $(libkmultipart_la_DEPENDENCIES)
-	@echo "int main() {return 0;}" > libkmultipart_la_closure.cpp
-	@$(LTCXXCOMPILE) -c libkmultipart_la_closure.cpp
-	$(CXXLINK) libkmultipart_la_closure.lo $(libkmultipart_la_LDFLAGS) $(libkmultipart_la_OBJECTS) $(libkmultipart_la_LIBADD) $(LIBS)
-	@rm -f libkmultipart_la_closure.* libkmultipart.la.closure
-	@echo "timestamp" > libkmultipart.la.closure
-
-
 #>+ 3
 kmultipart.moc: $(srcdir)/kmultipart.h
 	$(MOC) $(srcdir)/kmultipart.h -o kmultipart.moc
@@ -875,10 +766,6 @@
 #>+ 2
 KDE_DIST=Makefile.in kmultipart.desktop kmultipart.h Makefile.am 
 
-#>+ 3
-clean-closures:
-	-rm -f  libkmultipart.la.closure
-
 #>+ 2
 docs-am:
 
--- kdelibs-3.5.7.orig/khtml/xml/Makefile.in
+++ kdelibs-3.5.7/khtml/xml/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -35,15 +35,11 @@
 #    Boston, MA 02110-1301, USA.
 
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -90,7 +86,7 @@
 	dom_restyler.lo
 @KDE_USE_FINAL_FALSE@libkhtmlxml_la_OBJECTS = $(libkhtmlxml_la_nofinal_OBJECTS)
 @KDE_USE_FINAL_TRUE@libkhtmlxml_la_OBJECTS = $(libkhtmlxml_la_final_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -98,19 +94,21 @@
 #>+ 2
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
-#>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+#>+ 3
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
 CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 3
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(libkhtmlxml_la_SOURCES)
 DIST_SOURCES = $(libkhtmlxml_la_SOURCES)
 HEADERS = $(noinst_HEADERS)
@@ -122,8 +120,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -131,13 +127,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -151,8 +147,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -173,17 +167,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -252,7 +243,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -289,12 +279,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -339,87 +331,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -443,75 +391,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -519,16 +409,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -562,7 +451,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -600,9 +489,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 clean-noinstLTLIBRARIES:
@@ -614,7 +503,7 @@
 	  rm -f "$${dir}/so_locations"; \
 	done
 libkhtmlxml.la: $(libkhtmlxml_la_OBJECTS) $(libkhtmlxml_la_DEPENDENCIES) 
-	$(CXXLINK)  $(libkhtmlxml_la_LDFLAGS) $(libkhtmlxml_la_OBJECTS) $(libkhtmlxml_la_LIBADD) $(LIBS)
+	$(CXXLINK)  $(libkhtmlxml_la_OBJECTS) $(libkhtmlxml_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -636,22 +525,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xml_tokenizer.Plo@am__quote@
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -662,10 +551,6 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -715,22 +600,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -783,7 +667,7 @@
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
@@ -797,12 +681,20 @@
 
 install-data-am:
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -823,19 +715,22 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am
+uninstall-am:
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-libtool clean-noinstLTLIBRARIES ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
 	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-exec \
-	install-exec-am install-info install-info-am install-man \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
 	install-strip installcheck installcheck-am installdirs \
 	maintainer-clean maintainer-clean-generic mostlyclean \
 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-	pdf pdf-am ps ps-am tags uninstall uninstall-am \
-	uninstall-info-am
+	pdf pdf-am ps ps-am tags uninstall uninstall-am
 
 
 srcdoc:
--- kdelibs-3.5.7.orig/khtml/Makefile.in
+++ kdelibs-3.5.7/khtml/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -36,15 +36,11 @@
 
 
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -94,6 +90,13 @@
 #>- khtmlimagepart_la_OBJECTS = $(am_khtmlimagepart_la_OBJECTS)
 #>+ 1
 khtmlimagepart_la_OBJECTS = imgdummy.lo
+#>- khtmlimagepart_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(khtmlimagepart_la_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+khtmlimagepart_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(khtmlimagepart_la_LDFLAGS) $(LDFLAGS) -o $@
 am__DEPENDENCIES_1 =
 libkhtml_la_DEPENDENCIES = ./xml/libkhtmlxml.la ./html/libkhtmlhtml.la \
 	./rendering/libkhtmlrender.la ./css/libkhtmlcss.la \
@@ -116,11 +119,25 @@
 	khtml_printsettings.lo khtmlimage.lo khtml_iface_skel.lo kjserrordlg.lo htmlpageinfo.lo
 @KDE_USE_FINAL_FALSE@libkhtml_la_OBJECTS = $(libkhtml_la_nofinal_OBJECTS)
 @KDE_USE_FINAL_TRUE@libkhtml_la_OBJECTS = $(libkhtml_la_final_OBJECTS)
+#>- libkhtml_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(libkhtml_la_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+libkhtml_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(libkhtml_la_LDFLAGS) $(LDFLAGS) -o $@
 libkhtmlpart_la_DEPENDENCIES = libkhtml.la
 am_libkhtmlpart_la_OBJECTS = dummy.lo
 #>- libkhtmlpart_la_OBJECTS = $(am_libkhtmlpart_la_OBJECTS)
 #>+ 1
 libkhtmlpart_la_OBJECTS = dummy.lo
+#>- libkhtmlpart_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(libkhtmlpart_la_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+libkhtmlpart_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(libkhtmlpart_la_LDFLAGS) $(LDFLAGS) -o $@
 am_testkhtml_OBJECTS = testkhtml.$(OBJEXT) domtreeview.$(OBJEXT)
 #>- testkhtml_OBJECTS = $(am_testkhtml_OBJECTS)
 #>+ 4
@@ -139,6 +156,13 @@
 @KDE_USE_FINAL_FALSE@testkhtml_static_OBJECTS = $(testkhtml_static_nofinal_OBJECTS)
 @KDE_USE_FINAL_TRUE@testkhtml_static_OBJECTS = $(testkhtml_static_final_OBJECTS)
 testkhtml_static_DEPENDENCIES = libkhtml.la
+#>- testkhtml_static_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(testkhtml_static_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+testkhtml_static_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(testkhtml_static_LDFLAGS) $(LDFLAGS) -o $@
 am_testregression_OBJECTS = test_regression.$(OBJEXT) \
 	test_regression_fontoverload.$(OBJEXT)
 #>- testregression_OBJECTS = $(am_testregression_OBJECTS)
@@ -149,7 +173,7 @@
 @KDE_USE_FINAL_FALSE@testregression_OBJECTS = $(testregression_nofinal_OBJECTS)
 @KDE_USE_FINAL_TRUE@testregression_OBJECTS = $(testregression_final_OBJECTS)
 testregression_DEPENDENCIES = libkhtml.la
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -157,19 +181,21 @@
 #>+ 2
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
-#>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+#>+ 3
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
 CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 3
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(khtmlimagepart_la_SOURCES) $(libkhtml_la_SOURCES) \
 	$(libkhtmlpart_la_SOURCES) $(testkhtml_SOURCES) \
 	$(testkhtml_static_SOURCES) $(testregression_SOURCES)
@@ -178,22 +204,26 @@
 	$(testkhtml_static_SOURCES) $(testregression_SOURCES)
 #>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 #>- 	html-recursive info-recursive install-data-recursive \
-#>- 	install-exec-recursive install-info-recursive \
-#>- 	install-recursive installcheck-recursive installdirs-recursive \
-#>- 	pdf-recursive ps-recursive uninstall-info-recursive \
-#>- 	uninstall-recursive
-#>+ 6
+#>- 	install-dvi-recursive install-exec-recursive \
+#>- 	install-html-recursive install-info-recursive \
+#>- 	install-pdf-recursive install-ps-recursive install-recursive \
+#>- 	installcheck-recursive installdirs-recursive pdf-recursive \
+#>- 	ps-recursive uninstall-recursive
+#>+ 7
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	html-recursive info-recursive install-data-recursive \
-	install-exec-recursive install-info-recursive \
-	install-recursive installcheck-recursive installdirs-recursive \
-	pdf-recursive ps-recursive uninstall-info-recursive \
-	uninstall-recursive nmcheck-recursive bcheck-recursive
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive nmcheck-recursive bcheck-recursive
 rcDATA_INSTALL = $(INSTALL_DATA)
 serviceDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(rc_DATA) $(service_DATA)
 includeHEADERS_INSTALL = $(INSTALL_HEADER)
 HEADERS = $(include_HEADERS) $(noinst_HEADERS)
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = misc dom css xml html rendering pics java ecma . \
@@ -204,8 +234,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -213,13 +241,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -233,8 +261,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -255,17 +281,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -334,7 +357,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -371,12 +393,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -421,87 +445,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -525,75 +505,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -601,16 +523,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -642,9 +563,7 @@
 		kjserrordlg.ui.h
 
 @include_VERSION_SCRIPT_TRUE@VSCRIPT = -Wl,--version-script=$(srcdir)/libkhtml.map
-#>- libkhtml_la_LDFLAGS = -version-info 6:0:2 -no-undefined $(VSCRIPT) $(all_libraries)
-#>+ 1
-libkhtml_la_LDFLAGS = -version-info 6:0:2 -no-undefined $(KDE_NO_UNDEFINED) $(VSCRIPT) $(all_libraries)
+libkhtml_la_LDFLAGS = -version-info 6:0:2 -no-undefined $(VSCRIPT) $(all_libraries)
 libkhtml_la_LIBADD = ./xml/libkhtmlxml.la ./html/libkhtmlhtml.la \
 	./rendering/libkhtmlrender.la ./css/libkhtmlcss.la \
 	./misc/libkhtmlmisc.la ecma/libkjs_html.la ./dom/libkhtmldom.la $(LIBKJAVA) \
@@ -655,14 +574,10 @@
 	$(top_builddir)/kwallet/client/libkwalletclient.la
 
 libkhtmlpart_la_SOURCES = dummy.cpp
-#>- libkhtmlpart_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries)
-#>+ 1
-libkhtmlpart_la_LDFLAGS = -no-undefined $(KDE_NO_UNDEFINED) -module $(KDE_PLUGIN) $(all_libraries)
+libkhtmlpart_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries)
 libkhtmlpart_la_LIBADD = libkhtml.la
 khtmlimagepart_la_SOURCES = imgdummy.cpp
-#>- khtmlimagepart_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries)
-#>+ 1
-khtmlimagepart_la_LDFLAGS = -no-undefined $(KDE_NO_UNDEFINED) -module $(KDE_PLUGIN) $(all_libraries)
+khtmlimagepart_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries)
 khtmlimagepart_la_LIBADD = libkhtml.la 
 INCLUDES = -I$(top_srcdir)/kjs -I$(top_builddir)/kjs -I$(top_srcdir)/kimgio \
 	-I$(srcdir)/java -I$(top_srcdir)/dcop -I$(srcdir)/misc \
@@ -697,7 +612,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cc .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(srcdir)/../admin/Doxyfile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../admin/Doxyfile.am $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -735,13 +650,13 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
+	test -z "$(kde_moduledir)" || $(MKDIR_P) "$(DESTDIR)$(kde_moduledir)"
 	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
@@ -752,7 +667,7 @@
 
 uninstall-kde_moduleLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
@@ -768,7 +683,7 @@
 	done
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
@@ -779,7 +694,7 @@
 
 uninstall-libLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
@@ -793,21 +708,12 @@
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
-#>- khtmlimagepart.la: $(khtmlimagepart_la_OBJECTS) $(khtmlimagepart_la_DEPENDENCIES) 
-#>+ 2
-@KDE_USE_CLOSURE_TRUE@khtmlimagepart.la: khtmlimagepart.la.closure $(khtmlimagepart_la_OBJECTS) $(khtmlimagepart_la_DEPENDENCIES) 
-@KDE_USE_CLOSURE_FALSE@khtmlimagepart.la: $(khtmlimagepart_la_OBJECTS) $(khtmlimagepart_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(kde_moduledir) $(khtmlimagepart_la_LDFLAGS) $(khtmlimagepart_la_OBJECTS) $(khtmlimagepart_la_LIBADD) $(LIBS)
-#>- libkhtml.la: $(libkhtml_la_OBJECTS) $(libkhtml_la_DEPENDENCIES) 
-#>+ 2
-@KDE_USE_CLOSURE_TRUE@libkhtml.la: libkhtml.la.closure $(libkhtml_la_OBJECTS) $(libkhtml_la_DEPENDENCIES) 
-@KDE_USE_CLOSURE_FALSE@libkhtml.la: $(libkhtml_la_OBJECTS) $(libkhtml_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(libdir) $(libkhtml_la_LDFLAGS) $(libkhtml_la_OBJECTS) $(libkhtml_la_LIBADD) $(LIBS)
-#>- libkhtmlpart.la: $(libkhtmlpart_la_OBJECTS) $(libkhtmlpart_la_DEPENDENCIES) 
-#>+ 2
-@KDE_USE_CLOSURE_TRUE@libkhtmlpart.la: libkhtmlpart.la.closure $(libkhtmlpart_la_OBJECTS) $(libkhtmlpart_la_DEPENDENCIES) 
-@KDE_USE_CLOSURE_FALSE@libkhtmlpart.la: $(libkhtmlpart_la_OBJECTS) $(libkhtmlpart_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(kde_moduledir) $(libkhtmlpart_la_LDFLAGS) $(libkhtmlpart_la_OBJECTS) $(libkhtmlpart_la_LIBADD) $(LIBS)
+khtmlimagepart.la: $(khtmlimagepart_la_OBJECTS) $(khtmlimagepart_la_DEPENDENCIES) 
+	$(khtmlimagepart_la_LINK) -rpath $(kde_moduledir) $(khtmlimagepart_la_OBJECTS) $(khtmlimagepart_la_LIBADD) $(LIBS)
+libkhtml.la: $(libkhtml_la_OBJECTS) $(libkhtml_la_DEPENDENCIES) 
+	$(libkhtml_la_LINK) -rpath $(libdir) $(libkhtml_la_OBJECTS) $(libkhtml_la_LIBADD) $(LIBS)
+libkhtmlpart.la: $(libkhtmlpart_la_OBJECTS) $(libkhtmlpart_la_DEPENDENCIES) 
+	$(libkhtmlpart_la_LINK) -rpath $(kde_moduledir) $(libkhtmlpart_la_OBJECTS) $(libkhtmlpart_la_LIBADD) $(LIBS)
 
 clean-checkPROGRAMS:
 	@list='$(check_PROGRAMS)'; for p in $$list; do \
@@ -817,13 +723,13 @@
 	done
 testkhtml$(EXEEXT): $(testkhtml_OBJECTS) $(testkhtml_DEPENDENCIES) 
 	@rm -f testkhtml$(EXEEXT)
-	$(CXXLINK) $(testkhtml_LDFLAGS) $(testkhtml_OBJECTS) $(testkhtml_LDADD) $(LIBS)
+	$(CXXLINK) $(testkhtml_OBJECTS) $(testkhtml_LDADD) $(LIBS)
 testkhtml_static$(EXEEXT): $(testkhtml_static_OBJECTS) $(testkhtml_static_DEPENDENCIES) 
 	@rm -f testkhtml_static$(EXEEXT)
-	$(CXXLINK) $(testkhtml_static_LDFLAGS) $(testkhtml_static_OBJECTS) $(testkhtml_static_LDADD) $(LIBS)
+	$(testkhtml_static_LINK) $(testkhtml_static_OBJECTS) $(testkhtml_static_LDADD) $(LIBS)
 testregression$(EXEEXT): $(testregression_OBJECTS) $(testregression_DEPENDENCIES) 
 	@rm -f testregression$(EXEEXT)
-	$(CXXLINK) $(testregression_LDFLAGS) $(testregression_OBJECTS) $(testregression_LDADD) $(LIBS)
+	$(CXXLINK) $(testregression_OBJECTS) $(testregression_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -850,43 +756,43 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testkhtml.Po@am__quote@
 
 .cc.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cc.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cc.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -896,13 +802,9 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 install-rcDATA: $(rc_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(rcdir)" || $(mkdir_p) "$(DESTDIR)$(rcdir)"
+	test -z "$(rcdir)" || $(MKDIR_P) "$(DESTDIR)$(rcdir)"
 	@list='$(rc_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -919,7 +821,7 @@
 	done
 install-serviceDATA: $(service_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(servicedir)" || $(mkdir_p) "$(DESTDIR)$(servicedir)"
+	test -z "$(servicedir)" || $(MKDIR_P) "$(DESTDIR)$(servicedir)"
 	@list='$(service_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -936,7 +838,7 @@
 	done
 install-includeHEADERS: $(include_HEADERS)
 	@$(NORMAL_INSTALL)
-	test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"
+	test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)"
 	@list='$(include_HEADERS)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -983,8 +885,7 @@
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
+$(RECURSIVE_CLEAN_TARGETS):
 	@failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
@@ -1085,23 +986,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	$(mkdir_p) $(distdir)/../admin
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -1115,7 +1014,7 @@
 	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
-	    || $(mkdir_p) "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 	    || exit 1; \
 	    distdir=`$(am__cd) $(distdir) && pwd`; \
 	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
@@ -1123,6 +1022,8 @@
 	      $(MAKE) $(AM_MAKEFLAGS) \
 	        top_distdir="$$top_distdir" \
 	        distdir="$$distdir/$$subdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -1134,7 +1035,7 @@
 installdirs: installdirs-recursive
 installdirs-am:
 	for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(rcdir)" "$(DESTDIR)$(servicedir)" "$(DESTDIR)$(includedir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-recursive
 install-exec: install-exec-recursive
@@ -1169,7 +1070,7 @@
 #>- 	clean-kde_moduleLTLIBRARIES clean-libLTLIBRARIES clean-libtool \
 #>- 	mostlyclean-am
 #>+ 3
-clean-am: clean-metasources clean-idl clean-ui clean-closures clean-bcheck clean-final  clean-checkPROGRAMS clean-generic \
+clean-am: clean-metasources clean-idl clean-ui clean-bcheck clean-final  clean-checkPROGRAMS clean-generic \
 	clean-kde_moduleLTLIBRARIES clean-libLTLIBRARIES clean-libtool \
 	mostlyclean-am
 
@@ -1177,7 +1078,7 @@
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-recursive
 
@@ -1197,14 +1098,22 @@
  install-rcDATA \
 	install-serviceDATA
 
+install-dvi: install-dvi-recursive
+
 #>- install-exec-am: install-libLTLIBRARIES
 #>+ 1
 install-exec-am:  install-libLTLIBRARIES install-kde_moduleLTLIBRARIES
 
+install-html: install-html-recursive
+
 install-info: install-info-recursive
 
 install-man:
 
+install-pdf: install-pdf-recursive
+
+install-ps: install-ps-recursive
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
@@ -1225,32 +1134,33 @@
 
 ps-am:
 
-uninstall-am: uninstall-includeHEADERS uninstall-info-am \
-	uninstall-kde_moduleLTLIBRARIES uninstall-libLTLIBRARIES \
-	uninstall-local uninstall-rcDATA uninstall-serviceDATA
-
-uninstall-info: uninstall-info-recursive
-
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-	clean clean-checkPROGRAMS clean-generic \
-	clean-kde_moduleLTLIBRARIES clean-libLTLIBRARIES clean-libtool \
-	clean-recursive ctags ctags-recursive distclean \
+uninstall-am: uninstall-includeHEADERS uninstall-kde_moduleLTLIBRARIES \
+	uninstall-libLTLIBRARIES uninstall-local uninstall-rcDATA \
+	uninstall-serviceDATA
+
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+	install-strip
+
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+	all all-am check check-am clean clean-checkPROGRAMS \
+	clean-generic clean-kde_moduleLTLIBRARIES clean-libLTLIBRARIES \
+	clean-libtool ctags ctags-recursive distclean \
 	distclean-compile distclean-generic distclean-libtool \
-	distclean-recursive distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-data \
-	install-data-am install-data-local install-exec \
-	install-exec-am install-includeHEADERS install-info \
-	install-info-am install-kde_moduleLTLIBRARIES \
-	install-libLTLIBRARIES install-man install-rcDATA \
-	install-serviceDATA install-strip installcheck installcheck-am \
-	installdirs installdirs-am maintainer-clean \
-	maintainer-clean-generic maintainer-clean-recursive \
-	mostlyclean mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
-	tags tags-recursive uninstall uninstall-am \
-	uninstall-includeHEADERS uninstall-info-am \
-	uninstall-kde_moduleLTLIBRARIES uninstall-libLTLIBRARIES \
-	uninstall-local uninstall-rcDATA uninstall-serviceDATA
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am \
+	install-data-local install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am \
+	install-includeHEADERS install-info install-info-am \
+	install-kde_moduleLTLIBRARIES install-libLTLIBRARIES \
+	install-man install-pdf install-pdf-am install-ps \
+	install-ps-am install-rcDATA install-serviceDATA install-strip \
+	installcheck installcheck-am installdirs installdirs-am \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+	pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
+	uninstall-includeHEADERS uninstall-kde_moduleLTLIBRARIES \
+	uninstall-libLTLIBRARIES uninstall-local uninstall-rcDATA \
+	uninstall-serviceDATA
 
 
 # init_libkhtml is in libkhtml.so; init_libkhtmlpart needs to be in the part
@@ -1373,30 +1283,12 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
-#>+ 8
-khtmlimagepart.la.closure: $(khtmlimagepart_la_OBJECTS) $(khtmlimagepart_la_DEPENDENCIES)
-	@echo "int main() {return 0;}" > khtmlimagepart_la_closure.cc
-	@$(LTCXXCOMPILE) -c khtmlimagepart_la_closure.cc
-	$(CXXLINK) khtmlimagepart_la_closure.lo $(khtmlimagepart_la_LDFLAGS) $(khtmlimagepart_la_OBJECTS) $(khtmlimagepart_la_LIBADD) $(LIBS)
-	@rm -f khtmlimagepart_la_closure.* khtmlimagepart.la.closure
-	@echo "timestamp" > khtmlimagepart.la.closure
-
-
 #>+ 5
 khtml_iface.kidl: $(srcdir)/khtml_iface.h $(DCOP_DEPENDENCIES)
 	$(DCOPIDL) $(srcdir)/khtml_iface.h > khtml_iface.kidl || ( rm -f khtml_iface.kidl ; false )
 khtml_iface_skel.cc: khtml_iface.kidl
 	$(DCOPIDL2CPP) --c++-suffix cc --no-signals --no-stub khtml_iface.kidl
 
-#>+ 8
-libkhtml.la.closure: $(libkhtml_la_OBJECTS) $(libkhtml_la_DEPENDENCIES)
-	@echo "int main() {return 0;}" > libkhtml_la_closure.cc
-	@$(LTCXXCOMPILE) -c libkhtml_la_closure.cc
-	$(CXXLINK) libkhtml_la_closure.lo $(libkhtml_la_LDFLAGS) $(libkhtml_la_OBJECTS) $(libkhtml_la_LIBADD) $(LIBS)
-	@rm -f libkhtml_la_closure.* libkhtml.la.closure
-	@echo "timestamp" > libkhtml.la.closure
-
-
 #>+ 3
 khtml_run.moc: $(srcdir)/khtml_run.h
 	$(MOC) $(srcdir)/khtml_run.h -o khtml_run.moc
@@ -1481,15 +1373,6 @@
 #>+ 2
 mocs: khtml_part.moc
 
-#>+ 8
-libkhtmlpart.la.closure: $(libkhtmlpart_la_OBJECTS) $(libkhtmlpart_la_DEPENDENCIES)
-	@echo "int main() {return 0;}" > libkhtmlpart_la_closure.cc
-	@$(LTCXXCOMPILE) -c libkhtmlpart_la_closure.cc
-	$(CXXLINK) libkhtmlpart_la_closure.lo $(libkhtmlpart_la_LDFLAGS) $(libkhtmlpart_la_OBJECTS) $(libkhtmlpart_la_LIBADD) $(LIBS)
-	@rm -f libkhtmlpart_la_closure.* libkhtmlpart.la.closure
-	@echo "timestamp" > libkhtmlpart.la.closure
-
-
 #>+ 3
 clean-metasources:
 	-rm -f  khtml_run.moc khtml_ext.moc khtml_pagecache.moc khtml_printsettings.moc khtml_factory.moc testkhtml.moc domtreeview.moc khtmlview.moc test_regression.moc khtmlimage.moc khtmlpart_p.moc khtml_part.moc
@@ -1508,10 +1391,6 @@
 	kjserrordlg.cc kjserrordlg.h kjserrordlg.moc \
 	htmlpageinfo.cc htmlpageinfo.h htmlpageinfo.moc 
 
-#>+ 3
-clean-closures:
-	-rm -f  khtmlimagepart.la.closure libkhtml.la.closure libkhtmlpart.la.closure
-
 #>+ 2
 docs-am:
 
--- kdelibs-3.5.7.orig/khtml/rendering/Makefile.in
+++ kdelibs-3.5.7/khtml/rendering/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -35,15 +35,11 @@
 #    Boston, MA 02110-1301, USA.
 
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -98,7 +94,7 @@
 	counter_tree.lo
 @KDE_USE_FINAL_FALSE@libkhtmlrender_la_OBJECTS = $(libkhtmlrender_la_nofinal_OBJECTS)
 @KDE_USE_FINAL_TRUE@libkhtmlrender_la_OBJECTS = $(libkhtmlrender_la_final_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -106,19 +102,21 @@
 #>+ 2
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
-#>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+#>+ 3
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
 CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 3
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(libkhtmlrender_la_SOURCES)
 DIST_SOURCES = $(libkhtmlrender_la_SOURCES)
 HEADERS = $(noinst_HEADERS)
@@ -130,8 +128,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -139,13 +135,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -159,8 +155,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -181,17 +175,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -260,7 +251,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -297,12 +287,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -347,87 +339,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -451,75 +399,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -527,16 +417,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -574,7 +463,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -612,9 +501,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 clean-noinstLTLIBRARIES:
@@ -626,7 +515,7 @@
 	  rm -f "$${dir}/so_locations"; \
 	done
 libkhtmlrender.la: $(libkhtmlrender_la_OBJECTS) $(libkhtmlrender_la_DEPENDENCIES) 
-	$(CXXLINK)  $(libkhtmlrender_la_LDFLAGS) $(libkhtmlrender_la_OBJECTS) $(libkhtmlrender_la_LIBADD) $(LIBS)
+	$(CXXLINK)  $(libkhtmlrender_la_OBJECTS) $(libkhtmlrender_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -663,22 +552,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/table_layout.Plo@am__quote@
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -689,10 +578,6 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -742,22 +627,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -810,7 +694,7 @@
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
@@ -824,12 +708,20 @@
 
 install-data-am:
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -850,19 +742,22 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am
+uninstall-am:
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-libtool clean-noinstLTLIBRARIES ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
 	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-exec \
-	install-exec-am install-info install-info-am install-man \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
 	install-strip installcheck installcheck-am installdirs \
 	maintainer-clean maintainer-clean-generic mostlyclean \
 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-	pdf pdf-am ps ps-am tags uninstall uninstall-am \
-	uninstall-info-am
+	pdf pdf-am ps ps-am tags uninstall uninstall-am
 
 
 srcdoc:
--- kdelibs-3.5.7.orig/khtml/java/tests/Makefile.in
+++ kdelibs-3.5.7/khtml/java/tests/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,15 +14,11 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -57,7 +53,7 @@
 #>+ 1
 testserver_OBJECTS = testkjavaappletserver.$(OBJEXT)
 testserver_DEPENDENCIES = ../libkjava.la
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -65,19 +61,21 @@
 #>+ 2
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 #>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
 CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 3
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(testserver_SOURCES)
 DIST_SOURCES = $(testserver_SOURCES)
 ETAGS = etags
@@ -88,8 +86,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -97,13 +93,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -117,8 +113,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -139,17 +133,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -218,7 +209,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -255,12 +245,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -305,87 +297,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -409,75 +357,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -485,16 +375,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -512,7 +401,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -550,9 +439,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 clean-checkPROGRAMS:
@@ -563,7 +452,7 @@
 	done
 testserver$(EXEEXT): $(testserver_OBJECTS) $(testserver_DEPENDENCIES) 
 	@rm -f testserver$(EXEEXT)
-	$(CXXLINK) $(testserver_LDFLAGS) $(testserver_OBJECTS) $(testserver_LDADD) $(LIBS)
+	$(CXXLINK) $(testserver_OBJECTS) $(testserver_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -574,22 +463,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testkjavaappletserver.Po@am__quote@
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -600,10 +489,6 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -653,22 +538,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -722,7 +606,7 @@
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
@@ -736,12 +620,20 @@
 
 install-data-am:
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -762,19 +654,23 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am
+uninstall-am:
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean \
 	clean-checkPROGRAMS clean-generic clean-libtool ctags \
 	distclean distclean-compile distclean-generic \
 	distclean-libtool distclean-tags distdir dvi dvi-am html \
 	html-am info info-am install install-am install-data \
-	install-data-am install-exec install-exec-am install-info \
-	install-info-am install-man install-strip installcheck \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
 	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-info-am
+	tags uninstall uninstall-am
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- kdelibs-3.5.7.orig/khtml/java/Makefile.in
+++ kdelibs-3.5.7/khtml/java/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -17,15 +17,11 @@
 
 
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -78,6 +74,13 @@
 	kjavadownloader.lo kjavaappletviewer.lo
 @KDE_USE_FINAL_FALSE@kjavaappletviewer_la_OBJECTS = $(kjavaappletviewer_la_nofinal_OBJECTS)
 @KDE_USE_FINAL_TRUE@kjavaappletviewer_la_OBJECTS = $(kjavaappletviewer_la_final_OBJECTS)
+#>- kjavaappletviewer_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(kjavaappletviewer_la_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+kjavaappletviewer_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(kjavaappletviewer_la_LDFLAGS) $(LDFLAGS) -o $@
 libkjava_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
 am_libkjava_la_OBJECTS = kjavaapplet.lo kjavaappletcontext.lo \
 	kjavaappletserver.lo kjavaappletwidget.lo kjavaprocess.lo \
@@ -90,7 +93,14 @@
 	kjavadownloader.lo
 @KDE_USE_FINAL_FALSE@libkjava_la_OBJECTS = $(libkjava_la_nofinal_OBJECTS)
 @KDE_USE_FINAL_TRUE@libkjava_la_OBJECTS = $(libkjava_la_final_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+#>- libkjava_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(libkjava_la_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+libkjava_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(libkjava_la_LDFLAGS) $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -98,38 +108,44 @@
 #>+ 2
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 #>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
 CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 3
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(kjavaappletviewer_la_SOURCES) $(libkjava_la_SOURCES)
 DIST_SOURCES = $(kjavaappletviewer_la_SOURCES) $(libkjava_la_SOURCES)
 #>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 #>- 	html-recursive info-recursive install-data-recursive \
-#>- 	install-exec-recursive install-info-recursive \
-#>- 	install-recursive installcheck-recursive installdirs-recursive \
-#>- 	pdf-recursive ps-recursive uninstall-info-recursive \
-#>- 	uninstall-recursive
-#>+ 6
+#>- 	install-dvi-recursive install-exec-recursive \
+#>- 	install-html-recursive install-info-recursive \
+#>- 	install-pdf-recursive install-ps-recursive install-recursive \
+#>- 	installcheck-recursive installdirs-recursive pdf-recursive \
+#>- 	ps-recursive uninstall-recursive
+#>+ 7
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	html-recursive info-recursive install-data-recursive \
-	install-exec-recursive install-info-recursive \
-	install-recursive installcheck-recursive installdirs-recursive \
-	pdf-recursive ps-recursive uninstall-info-recursive \
-	uninstall-recursive nmcheck-recursive bcheck-recursive
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive nmcheck-recursive bcheck-recursive
 kde_servicesDATA_INSTALL = $(INSTALL_DATA)
 kjavadataDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(kde_services_DATA) $(kjavadata_DATA)
 HEADERS = $(noinst_HEADERS)
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
@@ -139,8 +155,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -148,13 +162,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -168,8 +182,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -190,17 +202,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -269,7 +278,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -306,12 +314,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -356,87 +366,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -460,75 +426,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -536,16 +444,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -562,9 +469,7 @@
                  kjavaappletserver.h kjavaprocess.h kjavaappletviewer.h
 
 #>- METASOURCES = AUTO
-#>- libkjava_la_LDFLAGS = $(KDE_MT_LDFLAGS) -no-undefined
-#>+ 1
-libkjava_la_LDFLAGS = $(KDE_MT_LDFLAGS) -no-undefined $(KDE_NO_UNDEFINED)
+libkjava_la_LDFLAGS = $(KDE_MT_LDFLAGS) -no-undefined
 libkjava_la_LIBADD = $(LIB_KPARTS)
 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/khtml \
 	-I$(top_srcdir)/kio/kssl -I$(top_builddir)/kio/kssl \
@@ -589,7 +494,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -627,15 +532,15 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 kjava.policy: $(top_builddir)/config.status $(srcdir)/kjava.policy.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
+	test -z "$(kde_moduledir)" || $(MKDIR_P) "$(DESTDIR)$(kde_moduledir)"
 	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
@@ -646,7 +551,7 @@
 
 uninstall-kde_moduleLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
@@ -669,16 +574,10 @@
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
-#>- kjavaappletviewer.la: $(kjavaappletviewer_la_OBJECTS) $(kjavaappletviewer_la_DEPENDENCIES) 
-#>+ 2
-@KDE_USE_CLOSURE_TRUE@kjavaappletviewer.la: kjavaappletviewer.la.closure $(kjavaappletviewer_la_OBJECTS) $(kjavaappletviewer_la_DEPENDENCIES) 
-@KDE_USE_CLOSURE_FALSE@kjavaappletviewer.la: $(kjavaappletviewer_la_OBJECTS) $(kjavaappletviewer_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(kde_moduledir) $(kjavaappletviewer_la_LDFLAGS) $(kjavaappletviewer_la_OBJECTS) $(kjavaappletviewer_la_LIBADD) $(LIBS)
-#>- libkjava.la: $(libkjava_la_OBJECTS) $(libkjava_la_DEPENDENCIES) 
-#>+ 2
-@KDE_USE_CLOSURE_TRUE@libkjava.la: libkjava.la.closure $(libkjava_la_OBJECTS) $(libkjava_la_DEPENDENCIES) 
-@KDE_USE_CLOSURE_FALSE@libkjava.la: $(libkjava_la_OBJECTS) $(libkjava_la_DEPENDENCIES) 
-	$(CXXLINK)  $(libkjava_la_LDFLAGS) $(libkjava_la_OBJECTS) $(libkjava_la_LIBADD) $(LIBS)
+kjavaappletviewer.la: $(kjavaappletviewer_la_OBJECTS) $(kjavaappletviewer_la_DEPENDENCIES) 
+	$(kjavaappletviewer_la_LINK) -rpath $(kde_moduledir) $(kjavaappletviewer_la_OBJECTS) $(kjavaappletviewer_la_LIBADD) $(LIBS)
+libkjava.la: $(libkjava_la_OBJECTS) $(libkjava_la_DEPENDENCIES) 
+	$(libkjava_la_LINK)  $(libkjava_la_OBJECTS) $(libkjava_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -695,22 +594,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kjavaprocess.Plo@am__quote@
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -720,13 +619,9 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 install-kde_servicesDATA: $(kde_services_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(kde_servicesdir)" || $(mkdir_p) "$(DESTDIR)$(kde_servicesdir)"
+	test -z "$(kde_servicesdir)" || $(MKDIR_P) "$(DESTDIR)$(kde_servicesdir)"
 	@list='$(kde_services_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -743,7 +638,7 @@
 	done
 install-kjavadataDATA: $(kjavadata_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(kjavadatadir)" || $(mkdir_p) "$(DESTDIR)$(kjavadatadir)"
+	test -z "$(kjavadatadir)" || $(MKDIR_P) "$(DESTDIR)$(kjavadatadir)"
 	@list='$(kjavadata_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -790,8 +685,7 @@
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
+$(RECURSIVE_CLEAN_TARGETS):
 	@failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
@@ -892,22 +786,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -921,7 +814,7 @@
 	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
-	    || $(mkdir_p) "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 	    || exit 1; \
 	    distdir=`$(am__cd) $(distdir) && pwd`; \
 	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
@@ -929,6 +822,8 @@
 	      $(MAKE) $(AM_MAKEFLAGS) \
 	        top_distdir="$$top_distdir" \
 	        distdir="$$distdir/$$subdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -939,7 +834,7 @@
 installdirs: installdirs-recursive
 installdirs-am:
 	for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(kde_servicesdir)" "$(DESTDIR)$(kjavadatadir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-recursive
 install-exec: install-exec-recursive
@@ -972,14 +867,14 @@
 #>- clean-am: clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
 #>- 	clean-noinstLTLIBRARIES mostlyclean-am
 #>+ 2
-clean-am: clean-metasources clean-closures clean-bcheck clean-final  clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
+clean-am: clean-metasources clean-bcheck clean-final  clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
 	clean-noinstLTLIBRARIES mostlyclean-am
 
 distclean: distclean-recursive
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-recursive
 
@@ -997,14 +892,22 @@
 install-data-am: install-kde-icons   \
 	install-kde_servicesDATA install-kjavadataDATA
 
+install-dvi: install-dvi-recursive
+
 #>- install-exec-am:
 #>+ 1
 install-exec-am:  install-kde_moduleLTLIBRARIES
 
+install-html: install-html-recursive
+
 install-info: install-info-recursive
 
 install-man:
 
+install-pdf: install-pdf-recursive
+
+install-ps: install-ps-recursive
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
@@ -1025,44 +928,38 @@
 
 ps-am:
 
-#>- uninstall-am: uninstall-info-am uninstall-kde_moduleLTLIBRARIES \
+#>- uninstall-am: uninstall-kde_moduleLTLIBRARIES \
 #>- 	uninstall-kde_servicesDATA uninstall-kjavadataDATA
 #>+ 2
-uninstall-am: uninstall-kde-icons  uninstall-info-am uninstall-kde_moduleLTLIBRARIES \
+uninstall-am: uninstall-kde-icons  uninstall-kde_moduleLTLIBRARIES \
 	uninstall-kde_servicesDATA uninstall-kjavadataDATA
 
-uninstall-info: uninstall-info-recursive
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+	install-strip
 
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-	clean clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
-	clean-noinstLTLIBRARIES clean-recursive ctags ctags-recursive \
-	distclean distclean-compile distclean-generic \
-	distclean-libtool distclean-recursive distclean-tags distdir \
-	dvi dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-exec install-exec-am \
-	install-info install-info-am install-kde_moduleLTLIBRARIES \
-	install-kde_servicesDATA install-kjavadataDATA install-man \
-	install-strip installcheck installcheck-am installdirs \
-	installdirs-am maintainer-clean maintainer-clean-generic \
-	maintainer-clean-recursive mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
-	pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
-	uninstall-info-am uninstall-kde_moduleLTLIBRARIES \
-	uninstall-kde_servicesDATA uninstall-kjavadataDATA
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+	all all-am check check-am clean clean-generic \
+	clean-kde_moduleLTLIBRARIES clean-libtool \
+	clean-noinstLTLIBRARIES ctags ctags-recursive distclean \
+	distclean-compile distclean-generic distclean-libtool \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am \
+	install-kde_moduleLTLIBRARIES install-kde_servicesDATA \
+	install-kjavadataDATA install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs installdirs-am maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags tags-recursive uninstall uninstall-am \
+	uninstall-kde_moduleLTLIBRARIES uninstall-kde_servicesDATA \
+	uninstall-kjavadataDATA
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
-#>+ 8
-kjavaappletviewer.la.closure: $(kjavaappletviewer_la_OBJECTS) $(kjavaappletviewer_la_DEPENDENCIES)
-	@echo "int main() {return 0;}" > kjavaappletviewer_la_closure.cpp
-	@$(LTCXXCOMPILE) -c kjavaappletviewer_la_closure.cpp
-	$(CXXLINK) kjavaappletviewer_la_closure.lo $(kjavaappletviewer_la_LDFLAGS) $(kjavaappletviewer_la_OBJECTS) $(kjavaappletviewer_la_LIBADD) $(LIBS)
-	@rm -f kjavaappletviewer_la_closure.* kjavaappletviewer.la.closure
-	@echo "timestamp" > kjavaappletviewer.la.closure
-
-
 #>+ 3
 kjavaappletcontext.moc: $(srcdir)/kjavaappletcontext.h
 	$(MOC) $(srcdir)/kjavaappletcontext.h -o kjavaappletcontext.moc
@@ -1112,15 +1009,6 @@
 #>+ 2
 mocs: kjavaappletviewer.moc
 
-#>+ 8
-libkjava.la.closure: $(libkjava_la_OBJECTS) $(libkjava_la_DEPENDENCIES)
-	@echo "int main() {return 0;}" > libkjava_la_closure.cpp
-	@$(LTCXXCOMPILE) -c libkjava_la_closure.cpp
-	$(CXXLINK) libkjava_la_closure.lo $(libkjava_la_LDFLAGS) $(libkjava_la_OBJECTS) $(libkjava_la_LIBADD) $(LIBS)
-	@rm -f libkjava_la_closure.* libkjava.la.closure
-	@echo "timestamp" > libkjava.la.closure
-
-
 #>+ 3
 clean-metasources:
 	-rm -f  kjavaappletcontext.moc kjavaapplet.moc kjavaappletserver.moc kjavadownloader.moc kjavaprocess.moc kjavaappletwidget.moc kjavaappletviewer.moc
@@ -1128,10 +1016,6 @@
 #>+ 2
 KDE_DIST=KJAS_GRAMMAR.txt kjava.jar pluginsinfo Makefile.in kjava.policy.in configure.in.in kjavadownloader.h kxeventutil.cpp make-jar kqeventutil.cpp build.xml kjavaappletviewer.desktop build.properties Makefile.am cr16-action-java.png 
 
-#>+ 3
-clean-closures:
-	-rm -f  kjavaappletviewer.la.closure libkjava.la.closure
-
 #>+ 2
 docs-am:
 
--- kdelibs-3.5.7.orig/khtml/java/dummy/Makefile.in
+++ kdelibs-3.5.7/khtml/java/dummy/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -15,15 +15,11 @@
 
 @SET_MAKE@
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -66,7 +62,14 @@
 #>- libkjava_la_OBJECTS = $(am_libkjava_la_OBJECTS)
 #>+ 1
 libkjava_la_OBJECTS = dummy.lo
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+#>- libkjava_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(libkjava_la_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+libkjava_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(libkjava_la_LDFLAGS) $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -74,19 +77,21 @@
 #>+ 2
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 #>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
 CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 3
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(libkjava_la_SOURCES)
 DIST_SOURCES = $(libkjava_la_SOURCES)
 ETAGS = etags
@@ -97,8 +102,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -106,13 +109,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -126,8 +129,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -148,17 +149,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -227,7 +225,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -264,12 +261,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -314,87 +313,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -418,75 +373,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -494,16 +391,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -518,7 +414,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -556,13 +452,13 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
@@ -573,7 +469,7 @@
 
 uninstall-libLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
@@ -588,7 +484,7 @@
 	  rm -f "$${dir}/so_locations"; \
 	done
 libkjava.la: $(libkjava_la_OBJECTS) $(libkjava_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(libdir) $(libkjava_la_LDFLAGS) $(libkjava_la_OBJECTS) $(libkjava_la_LIBADD) $(LIBS)
+	$(libkjava_la_LINK) -rpath $(libdir) $(libkjava_la_OBJECTS) $(libkjava_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -599,22 +495,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dummy.Plo@am__quote@
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -625,10 +521,6 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -678,22 +570,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -709,7 +600,7 @@
 all-am: Makefile $(LTLIBRARIES)
 installdirs:
 	for dir in "$(DESTDIR)$(libdir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -749,7 +640,7 @@
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
@@ -763,12 +654,20 @@
 
 install-data-am:
 
+install-dvi: install-dvi-am
+
 install-exec-am: install-libLTLIBRARIES
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -789,20 +688,23 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES
+uninstall-am: uninstall-libLTLIBRARIES
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-libLTLIBRARIES clean-libtool ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
 	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-exec \
-	install-exec-am install-info install-info-am \
-	install-libLTLIBRARIES install-man install-strip installcheck \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am \
+	install-libLTLIBRARIES install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
 	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-info-am \
-	uninstall-libLTLIBRARIES
+	tags uninstall uninstall-am uninstall-libLTLIBRARIES
 
 
 dummy.cpp:
--- kdelibs-3.5.7.orig/khtml/ecma/Makefile.in
+++ kdelibs-3.5.7/khtml/ecma/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -34,15 +34,11 @@
 #    Boston, MA 02110-1301, USA.
 
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -89,7 +85,7 @@
 	xmlserializer.lo domparser.lo
 @KDE_USE_FINAL_FALSE@libkjs_html_la_OBJECTS = $(libkjs_html_la_nofinal_OBJECTS)
 @KDE_USE_FINAL_TRUE@libkjs_html_la_OBJECTS = $(libkjs_html_la_final_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -97,19 +93,21 @@
 #>+ 2
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
-#>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+#>+ 3
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
 CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 3
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(libkjs_html_la_SOURCES)
 DIST_SOURCES = $(libkjs_html_la_SOURCES)
 HEADERS = $(noinst_HEADERS)
@@ -121,8 +119,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -130,13 +126,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -150,8 +146,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -172,17 +166,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -251,7 +242,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -288,12 +278,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -338,87 +330,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -442,75 +390,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -518,16 +408,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -560,7 +449,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -598,9 +487,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 clean-noinstLTLIBRARIES:
@@ -612,7 +501,7 @@
 	  rm -f "$${dir}/so_locations"; \
 	done
 libkjs_html.la: $(libkjs_html_la_OBJECTS) $(libkjs_html_la_DEPENDENCIES) 
-	$(CXXLINK)  $(libkjs_html_la_LDFLAGS) $(libkjs_html_la_OBJECTS) $(libkjs_html_la_LIBADD) $(LIBS)
+	$(CXXLINK)  $(libkjs_html_la_OBJECTS) $(libkjs_html_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -638,22 +527,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmlserializer.Plo@am__quote@
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -664,10 +553,6 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -717,22 +602,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -786,7 +670,7 @@
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
@@ -800,12 +684,20 @@
 
 install-data-am:
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -826,19 +718,22 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am
+uninstall-am:
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-libtool clean-noinstLTLIBRARIES ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
 	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-exec \
-	install-exec-am install-info install-info-am install-man \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
 	install-strip installcheck installcheck-am installdirs \
 	maintainer-clean maintainer-clean-generic mostlyclean \
 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-	pdf pdf-am ps ps-am tags uninstall uninstall-am \
-	uninstall-info-am
+	pdf pdf-am ps ps-am tags uninstall uninstall-am
 
 
 kjs_dom.lut.h : $(srcdir)/kjs_dom.cpp $(CREATE_HASH_TABLE)
--- kdelibs-3.5.7.orig/khtml/html/Makefile.in
+++ kdelibs-3.5.7/khtml/html/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -35,15 +35,11 @@
 #    Boston, MA 02110-1301, USA.
 
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -90,7 +86,7 @@
 	html_formimpl.lo html_objectimpl.lo html_tableimpl.lo
 @KDE_USE_FINAL_FALSE@libkhtmlhtml_la_OBJECTS = $(libkhtmlhtml_la_nofinal_OBJECTS)
 @KDE_USE_FINAL_TRUE@libkhtmlhtml_la_OBJECTS = $(libkhtmlhtml_la_final_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -98,19 +94,21 @@
 #>+ 2
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
-#>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+#>+ 3
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
 CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 3
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(libkhtmlhtml_la_SOURCES)
 DIST_SOURCES = $(libkhtmlhtml_la_SOURCES)
 HEADERS = $(noinst_HEADERS)
@@ -122,8 +120,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -131,13 +127,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -151,8 +147,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -173,17 +167,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -252,7 +243,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -289,12 +279,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -339,87 +331,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -443,75 +391,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -519,16 +409,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -565,7 +454,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -603,9 +492,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 clean-noinstLTLIBRARIES:
@@ -617,7 +506,7 @@
 	  rm -f "$${dir}/so_locations"; \
 	done
 libkhtmlhtml.la: $(libkhtmlhtml_la_OBJECTS) $(libkhtmlhtml_la_DEPENDENCIES) 
-	$(CXXLINK)  $(libkhtmlhtml_la_LDFLAGS) $(libkhtmlhtml_la_OBJECTS) $(libkhtmlhtml_la_LIBADD) $(LIBS)
+	$(CXXLINK)  $(libkhtmlhtml_la_OBJECTS) $(libkhtmlhtml_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -642,22 +531,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/htmltokenizer.Plo@am__quote@
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -668,10 +557,6 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -721,22 +606,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -789,7 +673,7 @@
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
@@ -803,12 +687,20 @@
 
 install-data-am:
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -829,19 +721,22 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am
+uninstall-am:
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-libtool clean-noinstLTLIBRARIES ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
 	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-exec \
-	install-exec-am install-info install-info-am install-man \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
 	install-strip installcheck installcheck-am installdirs \
 	maintainer-clean maintainer-clean-generic mostlyclean \
 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-	pdf pdf-am ps ps-am tags uninstall uninstall-am \
-	uninstall-info-am
+	pdf pdf-am ps ps-am tags uninstall uninstall-am
 
 
 # Use "make doctypes" to regenerate doctypes.cpp from doctypes.gperf
--- kdelibs-3.5.7.orig/arts/knotify/Makefile.in
+++ kdelibs-3.5.7/arts/knotify/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -17,15 +17,11 @@
 
 
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -76,12 +72,26 @@
 knotify_la_nofinal_OBJECTS = knotify.lo knotify_skel.lo
 @KDE_USE_FINAL_FALSE@knotify_la_OBJECTS = $(knotify_la_nofinal_OBJECTS)
 @KDE_USE_FINAL_TRUE@knotify_la_OBJECTS = $(knotify_la_final_OBJECTS)
+#>- knotify_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(knotify_la_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+knotify_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(knotify_la_LDFLAGS) $(LDFLAGS) -o $@
 am_knotifytest_OBJECTS = knotifytest.$(OBJEXT)
 #>- knotifytest_OBJECTS = $(am_knotifytest_OBJECTS)
 #>+ 1
 knotifytest_OBJECTS = knotifytest.$(OBJEXT)
 knotifytest_DEPENDENCIES = $(am__DEPENDENCIES_1)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+#>- knotifytest_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(knotifytest_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+knotifytest_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(knotifytest_LDFLAGS) $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -89,19 +99,21 @@
 #>+ 2
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
-#>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+#>+ 3
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
 CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 3
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(knotify_la_SOURCES) $(knotifytest_SOURCES)
 DIST_SOURCES = $(knotify_la_SOURCES) $(knotifytest_SOURCES)
 kdelnkDATA_INSTALL = $(INSTALL_DATA)
@@ -115,8 +127,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -124,13 +134,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -144,8 +154,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -166,17 +174,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -245,7 +250,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -282,12 +286,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -332,87 +338,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -436,75 +398,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -512,16 +416,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -549,7 +452,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -587,13 +490,13 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
+	test -z "$(kde_moduledir)" || $(MKDIR_P) "$(DESTDIR)$(kde_moduledir)"
 	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
@@ -604,7 +507,7 @@
 
 uninstall-kde_moduleLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
@@ -619,7 +522,7 @@
 	  rm -f "$${dir}/so_locations"; \
 	done
 knotify.la: $(knotify_la_OBJECTS) $(knotify_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(kde_moduledir) $(knotify_la_LDFLAGS) $(knotify_la_OBJECTS) $(knotify_la_LIBADD) $(LIBS)
+	$(knotify_la_LINK) -rpath $(kde_moduledir) $(knotify_la_OBJECTS) $(knotify_la_LIBADD) $(LIBS)
 
 clean-checkPROGRAMS:
 	@list='$(check_PROGRAMS)'; for p in $$list; do \
@@ -629,7 +532,7 @@
 	done
 knotifytest$(EXEEXT): $(knotifytest_OBJECTS) $(knotifytest_DEPENDENCIES) 
 	@rm -f knotifytest$(EXEEXT)
-	$(CXXLINK) $(knotifytest_LDFLAGS) $(knotifytest_OBJECTS) $(knotifytest_LDADD) $(LIBS)
+	$(knotifytest_LINK) $(knotifytest_OBJECTS) $(knotifytest_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -641,22 +544,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/knotifytest.Po@am__quote@
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -666,13 +569,9 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 install-kdelnkDATA: $(kdelnk_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(kdelnkdir)" || $(mkdir_p) "$(DESTDIR)$(kdelnkdir)"
+	test -z "$(kdelnkdir)" || $(MKDIR_P) "$(DESTDIR)$(kdelnkdir)"
 	@list='$(kdelnk_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -737,22 +636,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -769,7 +667,7 @@
 all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS)
 installdirs:
 	for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(kdelnkdir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -809,7 +707,7 @@
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
@@ -825,14 +723,22 @@
 #>+ 1
 install-data-am:   install-kdelnkDATA
 
+install-dvi: install-dvi-am
+
 #>- install-exec-am:
 #>+ 1
 install-exec-am:  install-kde_moduleLTLIBRARIES
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -853,22 +759,25 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-kde_moduleLTLIBRARIES \
-	uninstall-kdelnkDATA
+uninstall-am: uninstall-kde_moduleLTLIBRARIES uninstall-kdelnkDATA
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean \
 	clean-checkPROGRAMS clean-generic clean-kde_moduleLTLIBRARIES \
 	clean-libtool ctags distclean distclean-compile \
 	distclean-generic distclean-libtool distclean-tags distdir dvi \
 	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-exec install-exec-am \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
 	install-info install-info-am install-kde_moduleLTLIBRARIES \
-	install-kdelnkDATA install-man install-strip installcheck \
+	install-kdelnkDATA install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
 	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-info-am \
-	uninstall-kde_moduleLTLIBRARIES uninstall-kdelnkDATA
+	tags uninstall uninstall-am uninstall-kde_moduleLTLIBRARIES \
+	uninstall-kdelnkDATA
 
 
 messages:
--- kdelibs-3.5.7.orig/arts/Makefile.in
+++ kdelibs-3.5.7/arts/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,15 +14,11 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -56,17 +52,21 @@
 DIST_SOURCES =
 #>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 #>- 	html-recursive info-recursive install-data-recursive \
-#>- 	install-exec-recursive install-info-recursive \
-#>- 	install-recursive installcheck-recursive installdirs-recursive \
-#>- 	pdf-recursive ps-recursive uninstall-info-recursive \
-#>- 	uninstall-recursive
-#>+ 6
+#>- 	install-dvi-recursive install-exec-recursive \
+#>- 	install-html-recursive install-info-recursive \
+#>- 	install-pdf-recursive install-ps-recursive install-recursive \
+#>- 	installcheck-recursive installdirs-recursive pdf-recursive \
+#>- 	ps-recursive uninstall-recursive
+#>+ 7
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	html-recursive info-recursive install-data-recursive \
-	install-exec-recursive install-info-recursive \
-	install-recursive installcheck-recursive installdirs-recursive \
-	pdf-recursive ps-recursive uninstall-info-recursive \
-	uninstall-recursive nmcheck-recursive bcheck-recursive
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive nmcheck-recursive bcheck-recursive
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = knotify kde message
@@ -76,8 +76,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -85,13 +83,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -105,8 +103,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -127,17 +123,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -206,7 +199,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -243,12 +235,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -293,87 +287,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -397,75 +347,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -473,16 +365,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -496,7 +387,7 @@
 all: docs-am  all-recursive
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(srcdir)/../admin/Doxyfile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../admin/Doxyfile.am $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -534,9 +425,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 mostlyclean-libtool:
@@ -545,10 +436,6 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
 # To change the values of `make' variables: instead of editing Makefiles,
@@ -580,8 +467,7 @@
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
+$(RECURSIVE_CLEAN_TARGETS):
 	@failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
@@ -682,23 +568,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	$(mkdir_p) $(distdir)/../admin
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -712,7 +596,7 @@
 	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
-	    || $(mkdir_p) "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 	    || exit 1; \
 	    distdir=`$(am__cd) $(distdir) && pwd`; \
 	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
@@ -720,6 +604,8 @@
 	      $(MAKE) $(AM_MAKEFLAGS) \
 	        top_distdir="$$top_distdir" \
 	        distdir="$$distdir/$$subdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -763,8 +649,7 @@
 
 distclean: distclean-recursive
 	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool \
-	distclean-tags
+distclean-am: clean-am distclean-generic distclean-tags
 
 dvi: dvi-recursive
 
@@ -778,12 +663,20 @@
 
 install-data-am: install-data-local
 
+install-dvi: install-dvi-recursive
+
 install-exec-am:
 
+install-html: install-html-recursive
+
 install-info: install-info-recursive
 
 install-man:
 
+install-pdf: install-pdf-recursive
+
+install-ps: install-ps-recursive
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
@@ -802,23 +695,24 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-local
+uninstall-am: uninstall-local
 
-uninstall-info: uninstall-info-recursive
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+	install-strip
 
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-	clean clean-generic clean-libtool clean-recursive ctags \
-	ctags-recursive distclean distclean-generic distclean-libtool \
-	distclean-recursive distclean-tags distdir dvi dvi-am html \
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+	all all-am check check-am clean clean-generic clean-libtool \
+	ctags ctags-recursive distclean distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
 	html-am info info-am install install-am install-data \
-	install-data-am install-data-local install-exec \
-	install-exec-am install-info install-info-am install-man \
-	install-strip installcheck installcheck-am installdirs \
-	installdirs-am maintainer-clean maintainer-clean-generic \
-	maintainer-clean-recursive mostlyclean mostlyclean-generic \
-	mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
-	tags tags-recursive uninstall uninstall-am uninstall-info-am \
-	uninstall-local
+	install-data-am install-data-local install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs installdirs-am \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags tags-recursive uninstall uninstall-am uninstall-local
 
 apidox-am-yes:
 	@if test \! -d "$(top_srcdir)/doc/common/" && test -z "$$DOXDATA" ; then \
--- kdelibs-3.5.7.orig/arts/message/Makefile.in
+++ kdelibs-3.5.7/arts/message/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -15,15 +15,11 @@
 
 @SET_MAKE@
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -61,7 +57,14 @@
 #>+ 1
 artsmessage_OBJECTS = artsmessage.$(OBJEXT)
 artsmessage_DEPENDENCIES = ../../kdeui/libkdeui.la
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+#>- artsmessage_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(artsmessage_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+artsmessage_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(artsmessage_LDFLAGS) $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -69,19 +72,21 @@
 #>+ 2
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 #>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
 CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 3
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(artsmessage_SOURCES)
 DIST_SOURCES = $(artsmessage_SOURCES)
 ETAGS = etags
@@ -92,8 +97,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -101,13 +104,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -121,8 +124,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -143,17 +144,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -222,7 +220,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -259,12 +256,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -309,87 +308,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -413,75 +368,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -489,16 +386,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -514,7 +410,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cc .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -552,13 +448,13 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
+	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
 	  if test -f $$p \
@@ -586,7 +482,7 @@
 	done
 artsmessage$(EXEEXT): $(artsmessage_OBJECTS) $(artsmessage_DEPENDENCIES) 
 	@rm -f artsmessage$(EXEEXT)
-	$(CXXLINK) $(artsmessage_LDFLAGS) $(artsmessage_OBJECTS) $(artsmessage_LDADD) $(LIBS)
+	$(artsmessage_LINK) $(artsmessage_OBJECTS) $(artsmessage_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -597,22 +493,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/artsmessage.Po@am__quote@
 
 .cc.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cc.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cc.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -623,10 +519,6 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -676,22 +568,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -707,7 +598,7 @@
 all-am: Makefile $(PROGRAMS)
 installdirs:
 	for dir in "$(DESTDIR)$(bindir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -745,7 +636,7 @@
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
@@ -759,12 +650,20 @@
 
 install-data-am:
 
+install-dvi: install-dvi-am
+
 install-exec-am: install-binPROGRAMS
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -785,19 +684,23 @@
 
 ps-am:
 
-uninstall-am: uninstall-binPROGRAMS uninstall-info-am
+uninstall-am: uninstall-binPROGRAMS
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
 	clean-generic clean-libtool ctags distclean distclean-compile \
 	distclean-generic distclean-libtool distclean-tags distdir dvi \
 	dvi-am html html-am info info-am install install-am \
-	install-binPROGRAMS install-data install-data-am install-exec \
-	install-exec-am install-info install-info-am install-man \
+	install-binPROGRAMS install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
 	install-strip installcheck installcheck-am installdirs \
 	maintainer-clean maintainer-clean-generic mostlyclean \
 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
 	pdf pdf-am ps ps-am tags uninstall uninstall-am \
-	uninstall-binPROGRAMS uninstall-info-am
+	uninstall-binPROGRAMS
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- kdelibs-3.5.7.orig/arts/kde/mcop-dcop/Makefile.in
+++ kdelibs-3.5.7/arts/kde/mcop-dcop/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -18,15 +18,11 @@
 
 
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -77,12 +73,19 @@
 #>- kmcop_la_OBJECTS = $(am_kmcop_la_OBJECTS)
 #>+ 1
 kmcop_la_OBJECTS = kmcop_dummy.lo
+#>- kmcop_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(kmcop_la_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+kmcop_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(kmcop_la_LDFLAGS) $(LDFLAGS) -o $@
 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 #>- PROGRAMS = $(bin_PROGRAMS)
 #>+ 2
 bin_PROGRAMS += kmcop$(EXEEXT) 
 PROGRAMS = $(bin_PROGRAMS)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -90,19 +93,21 @@
 #>+ 2
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 #>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
 CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 3
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 #>- SOURCES = $(kmcop_la_SOURCES)
 #>+ 1
 SOURCES = $(kmcop_la_SOURCES) $(kmcop_SOURCES) 
@@ -120,8 +125,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -129,13 +132,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -149,8 +152,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -171,17 +172,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -250,7 +248,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -287,12 +284,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -337,87 +336,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -441,75 +396,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -517,16 +414,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -557,7 +453,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -595,13 +491,13 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(kdeinitdir)" || $(mkdir_p) "$(DESTDIR)$(kdeinitdir)"
+	test -z "$(kdeinitdir)" || $(MKDIR_P) "$(DESTDIR)$(kdeinitdir)"
 	@list='$(kdeinit_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
@@ -612,7 +508,7 @@
 
 uninstall-kdeinitLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@set -x; list='$(kdeinit_LTLIBRARIES)'; for p in $$list; do \
+	@list='$(kdeinit_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kdeinitdir)/$$p'"; \
 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kdeinitdir)/$$p"; \
@@ -628,7 +524,7 @@
 	done
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
@@ -639,7 +535,7 @@
 
 uninstall-libLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
@@ -654,10 +550,10 @@
 	  rm -f "$${dir}/so_locations"; \
 	done
 kmcop.la: $(kmcop_la_OBJECTS) $(kmcop_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(kdeinitdir) $(kmcop_la_LDFLAGS) $(kmcop_la_OBJECTS) $(kmcop_la_LIBADD) $(LIBS)
+	$(kmcop_la_LINK) -rpath $(kdeinitdir) $(kmcop_la_OBJECTS) $(kmcop_la_LIBADD) $(LIBS)
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
+	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
 	  if test -f $$p \
@@ -694,22 +590,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mcopdcopobject.Plo@am__quote@
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -719,13 +615,9 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 install-kdelnkDATA: $(kdelnk_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(kdelnkdir)" || $(mkdir_p) "$(DESTDIR)$(kdelnkdir)"
+	test -z "$(kdelnkdir)" || $(MKDIR_P) "$(DESTDIR)$(kdelnkdir)"
 	@list='$(kdelnk_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -790,22 +682,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -823,7 +714,7 @@
 
 installdirs:
 	for dir in "$(DESTDIR)$(kdeinitdir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(kdelnkdir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -863,7 +754,7 @@
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
@@ -877,12 +768,20 @@
 
 install-data-am: install-kdeinitLTLIBRARIES install-kdelnkDATA
 
+install-dvi: install-dvi-am
+
 install-exec-am: install-binPROGRAMS install-libLTLIBRARIES
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -903,25 +802,28 @@
 
 ps-am:
 
-uninstall-am: uninstall-binPROGRAMS uninstall-info-am \
-	uninstall-kdeinitLTLIBRARIES uninstall-kdelnkDATA \
-	uninstall-libLTLIBRARIES
+uninstall-am: uninstall-binPROGRAMS uninstall-kdeinitLTLIBRARIES \
+	uninstall-kdelnkDATA uninstall-libLTLIBRARIES
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
 	clean-generic clean-kdeinitLTLIBRARIES clean-libLTLIBRARIES \
 	clean-libtool ctags distclean distclean-compile \
 	distclean-generic distclean-libtool distclean-tags distdir dvi \
 	dvi-am html html-am info info-am install install-am \
-	install-binPROGRAMS install-data install-data-am install-exec \
-	install-exec-am install-info install-info-am \
+	install-binPROGRAMS install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am \
 	install-kdeinitLTLIBRARIES install-kdelnkDATA \
-	install-libLTLIBRARIES install-man install-strip installcheck \
+	install-libLTLIBRARIES install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
 	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 	tags uninstall uninstall-am uninstall-binPROGRAMS \
-	uninstall-info-am uninstall-kdeinitLTLIBRARIES \
-	uninstall-kdelnkDATA uninstall-libLTLIBRARIES
+	uninstall-kdeinitLTLIBRARIES uninstall-kdelnkDATA \
+	uninstall-libLTLIBRARIES
 
 
 messages:
--- kdelibs-3.5.7.orig/arts/kde/Makefile.in
+++ kdelibs-3.5.7/arts/kde/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,15 +16,11 @@
 @SET_MAKE@
 
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -83,6 +79,13 @@
 	kvideowidget.lo kplayobjectcreator.lo kaudiomanagerplay.lo
 @KDE_USE_FINAL_FALSE@libartskde_la_OBJECTS = $(libartskde_la_nofinal_OBJECTS)
 @KDE_USE_FINAL_TRUE@libartskde_la_OBJECTS = $(libartskde_la_final_OBJECTS)
+#>- libartskde_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(libartskde_la_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+libartskde_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(libartskde_la_LDFLAGS) $(LDFLAGS) -o $@
 am_kconverttest_OBJECTS = kconverttest.$(OBJEXT)
 #>- kconverttest_OBJECTS = $(am_kconverttest_OBJECTS)
 #>+ 1
@@ -99,7 +102,7 @@
 #>+ 1
 kiotestslow_OBJECTS = kiotestslow.$(OBJEXT)
 kiotestslow_DEPENDENCIES = $(am__DEPENDENCIES_2)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -107,19 +110,21 @@
 #>+ 2
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
-#>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+#>+ 3
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
 CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 3
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(libartskde_la_SOURCES) $(kconverttest_SOURCES) \
 	$(kiotest_SOURCES) $(kiotestslow_SOURCES)
 DIST_SOURCES = $(libartskde_la_SOURCES) $(kconverttest_SOURCES) \
@@ -134,8 +139,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -143,13 +146,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -163,8 +166,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -185,17 +186,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -264,7 +262,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -301,12 +298,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -351,87 +350,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -455,75 +410,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -531,16 +428,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -558,9 +454,7 @@
                         kaudiomanagerplay.cpp
 
 libartskde_la_LIBADD = $(LIB_KIO) -lqtmcop -lsoundserver_idl
-#>- libartskde_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 3:0:2
-#>+ 1
-libartskde_la_LDFLAGS = $(all_libraries) -no-undefined $(KDE_NO_UNDEFINED) -version-info 3:0:2
+libartskde_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 3:0:2
 #>- libartskde_la_METASOURCES = AUTO
 libartskde_la_COMPILE_FIRST = artskde.h
 artskdeincludedir = $(includedir)/arts
@@ -584,7 +478,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cc .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -622,13 +516,13 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
@@ -639,7 +533,7 @@
 
 uninstall-libLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
@@ -653,11 +547,8 @@
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
-#>- libartskde.la: $(libartskde_la_OBJECTS) $(libartskde_la_DEPENDENCIES) 
-#>+ 2
-@KDE_USE_CLOSURE_TRUE@libartskde.la: libartskde.la.closure $(libartskde_la_OBJECTS) $(libartskde_la_DEPENDENCIES) 
-@KDE_USE_CLOSURE_FALSE@libartskde.la: $(libartskde_la_OBJECTS) $(libartskde_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(libdir) $(libartskde_la_LDFLAGS) $(libartskde_la_OBJECTS) $(libartskde_la_LIBADD) $(LIBS)
+libartskde.la: $(libartskde_la_OBJECTS) $(libartskde_la_DEPENDENCIES) 
+	$(libartskde_la_LINK) -rpath $(libdir) $(libartskde_la_OBJECTS) $(libartskde_la_LIBADD) $(LIBS)
 
 clean-checkPROGRAMS:
 	@list='$(check_PROGRAMS)'; for p in $$list; do \
@@ -667,13 +558,13 @@
 	done
 kconverttest$(EXEEXT): $(kconverttest_OBJECTS) $(kconverttest_DEPENDENCIES) 
 	@rm -f kconverttest$(EXEEXT)
-	$(CXXLINK) $(kconverttest_LDFLAGS) $(kconverttest_OBJECTS) $(kconverttest_LDADD) $(LIBS)
+	$(CXXLINK) $(kconverttest_OBJECTS) $(kconverttest_LDADD) $(LIBS)
 kiotest$(EXEEXT): $(kiotest_OBJECTS) $(kiotest_DEPENDENCIES) 
 	@rm -f kiotest$(EXEEXT)
-	$(CXXLINK) $(kiotest_LDFLAGS) $(kiotest_OBJECTS) $(kiotest_LDADD) $(LIBS)
+	$(CXXLINK) $(kiotest_OBJECTS) $(kiotest_LDADD) $(LIBS)
 kiotestslow$(EXEEXT): $(kiotestslow_OBJECTS) $(kiotestslow_DEPENDENCIES) 
 	@rm -f kiotestslow$(EXEEXT)
-	$(CXXLINK) $(kiotestslow_LDFLAGS) $(kiotestslow_OBJECTS) $(kiotestslow_LDADD) $(LIBS)
+	$(CXXLINK) $(kiotestslow_OBJECTS) $(kiotestslow_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -700,43 +591,43 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kvideowidget.Plo@am__quote@
 
 .cc.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cc.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cc.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -746,13 +637,9 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 install-artskdeincludeHEADERS: $(artskdeinclude_HEADERS)
 	@$(NORMAL_INSTALL)
-	test -z "$(artskdeincludedir)" || $(mkdir_p) "$(DESTDIR)$(artskdeincludedir)"
+	test -z "$(artskdeincludedir)" || $(MKDIR_P) "$(DESTDIR)$(artskdeincludedir)"
 	@list='$(artskdeinclude_HEADERS)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -817,22 +704,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -849,7 +735,7 @@
 all-am: Makefile $(LTLIBRARIES) $(HEADERS)
 installdirs:
 	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(artskdeincludedir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -883,14 +769,14 @@
 #>- clean-am: clean-checkPROGRAMS clean-generic clean-libLTLIBRARIES \
 #>- 	clean-libtool mostlyclean-am
 #>+ 2
-clean-am: clean-metasources clean-closures clean-bcheck clean-final  clean-checkPROGRAMS clean-generic clean-libLTLIBRARIES \
+clean-am: clean-metasources clean-bcheck clean-final  clean-checkPROGRAMS clean-generic clean-libLTLIBRARIES \
 	clean-libtool mostlyclean-am
 
 distclean: distclean-am
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
@@ -904,12 +790,20 @@
 
 install-data-am: install-artskdeincludeHEADERS
 
+install-dvi: install-dvi-am
+
 install-exec-am: install-libLTLIBRARIES
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -930,8 +824,9 @@
 
 ps-am:
 
-uninstall-am: uninstall-artskdeincludeHEADERS uninstall-info-am \
-	uninstall-libLTLIBRARIES
+uninstall-am: uninstall-artskdeincludeHEADERS uninstall-libLTLIBRARIES
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean \
 	clean-checkPROGRAMS clean-generic clean-libLTLIBRARIES \
@@ -939,13 +834,15 @@
 	distclean-generic distclean-libtool distclean-tags distdir dvi \
 	dvi-am html html-am info info-am install install-am \
 	install-artskdeincludeHEADERS install-data install-data-am \
-	install-exec install-exec-am install-info install-info-am \
-	install-libLTLIBRARIES install-man install-strip installcheck \
+	install-dvi install-dvi-am install-exec install-exec-am \
+	install-html install-html-am install-info install-info-am \
+	install-libLTLIBRARIES install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
 	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 	tags uninstall uninstall-am uninstall-artskdeincludeHEADERS \
-	uninstall-info-am uninstall-libLTLIBRARIES
+	uninstall-libLTLIBRARIES
 
 
 artskde.mcoptype: artskde.h
@@ -958,15 +855,6 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
-#>+ 8
-libartskde.la.closure: $(libartskde_la_OBJECTS) $(libartskde_la_DEPENDENCIES)
-	@echo "int main() {return 0;}" > libartskde_la_closure.cc
-	@$(LTCXXCOMPILE) -c libartskde_la_closure.cc
-	$(CXXLINK) libartskde_la_closure.lo $(libartskde_la_LDFLAGS) $(libartskde_la_OBJECTS) $(libartskde_la_LIBADD) $(LIBS)
-	@rm -f libartskde_la_closure.* libartskde.la.closure
-	@echo "timestamp" > libartskde.la.closure
-
-
 #>+ 3
 kioinputstream_impl.moc: $(srcdir)/kioinputstream_impl.h
 	$(MOC) $(srcdir)/kioinputstream_impl.h -o kioinputstream_impl.moc
@@ -1079,10 +967,6 @@
 #>+ 2
 KDE_DIST=kconverttest.h kaudiorecordstream_p.h kaudioplaystream_p.h kioinputstream_impl.h artskde.idl kaudioconverter.h Makefile.in kdatarequest_impl.h Makefile.am 
 
-#>+ 3
-clean-closures:
-	-rm -f  libartskde.la.closure
-
 #>+ 2
 docs-am:
 
--- kdelibs-3.5.7.orig/kstyles/themes/Makefile.in
+++ kdelibs-3.5.7/kstyles/themes/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -15,15 +15,11 @@
 
 @SET_MAKE@
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -71,8 +67,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -80,13 +74,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -100,8 +94,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -122,17 +114,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -201,7 +190,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -238,12 +226,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -288,87 +278,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -392,75 +338,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -468,16 +356,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -497,7 +384,7 @@
 all: docs-am  all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -535,9 +422,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 mostlyclean-libtool:
@@ -545,13 +432,9 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 install-kde_confDATA: $(kde_conf_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(kde_confdir)" || $(mkdir_p) "$(DESTDIR)$(kde_confdir)"
+	test -z "$(kde_confdir)" || $(MKDIR_P) "$(DESTDIR)$(kde_confdir)"
 	@list='$(kde_conf_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -568,7 +451,7 @@
 	done
 install-kstylethemesdataDATA: $(kstylethemesdata_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(kstylethemesdatadir)" || $(mkdir_p) "$(DESTDIR)$(kstylethemesdatadir)"
+	test -z "$(kstylethemesdatadir)" || $(MKDIR_P) "$(DESTDIR)$(kstylethemesdatadir)"
 	@list='$(kstylethemesdata_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -591,22 +474,21 @@
 
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -622,7 +504,7 @@
 all-am: Makefile $(DATA)
 installdirs:
 	for dir in "$(DESTDIR)$(kde_confdir)" "$(DESTDIR)$(kstylethemesdatadir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -658,7 +540,7 @@
 
 distclean: distclean-am
 	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool
+distclean-am: clean-am distclean-generic
 
 dvi: dvi-am
 
@@ -672,12 +554,20 @@
 
 install-data-am: install-kde_confDATA install-kstylethemesdataDATA
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -696,20 +586,22 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-kde_confDATA \
-	uninstall-kstylethemesdataDATA
+uninstall-am: uninstall-kde_confDATA uninstall-kstylethemesdataDATA
+
+.MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
 	distclean distclean-generic distclean-libtool distdir dvi \
 	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-exec install-exec-am \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
 	install-info install-info-am install-kde_confDATA \
-	install-kstylethemesdataDATA install-man install-strip \
+	install-kstylethemesdataDATA install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
 	installcheck installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-generic \
 	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
-	uninstall-info-am uninstall-kde_confDATA \
-	uninstall-kstylethemesdataDATA
+	uninstall-kde_confDATA uninstall-kstylethemesdataDATA
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- kdelibs-3.5.7.orig/kstyles/kthemestyle/Makefile.in
+++ kdelibs-3.5.7/kstyles/kthemestyle/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -35,15 +35,11 @@
 #    Boston, MA 02110-1301, USA.
 
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -91,7 +87,14 @@
 kthemestyle_la_nofinal_OBJECTS = kthemebase.lo kthemestyle.lo kstyledirs.lo
 @KDE_USE_FINAL_FALSE@kthemestyle_la_OBJECTS = $(kthemestyle_la_nofinal_OBJECTS)
 @KDE_USE_FINAL_TRUE@kthemestyle_la_OBJECTS = $(kthemestyle_la_final_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+#>- kthemestyle_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(kthemestyle_la_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+kthemestyle_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(kthemestyle_la_LDFLAGS) $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -99,19 +102,21 @@
 #>+ 2
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
-#>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+#>+ 3
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
 CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 3
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(kthemestyle_la_SOURCES)
 DIST_SOURCES = $(kthemestyle_la_SOURCES)
 HEADERS = $(noinst_HEADERS)
@@ -123,8 +128,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -132,13 +135,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -152,8 +155,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -174,17 +175,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -253,7 +251,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -290,12 +287,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -340,87 +339,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -444,75 +399,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -520,16 +417,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -549,7 +445,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -587,13 +483,13 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-kde_styleLTLIBRARIES: $(kde_style_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(kde_styledir)" || $(mkdir_p) "$(DESTDIR)$(kde_styledir)"
+	test -z "$(kde_styledir)" || $(MKDIR_P) "$(DESTDIR)$(kde_styledir)"
 	@list='$(kde_style_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
@@ -604,7 +500,7 @@
 
 uninstall-kde_styleLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@set -x; list='$(kde_style_LTLIBRARIES)'; for p in $$list; do \
+	@list='$(kde_style_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_styledir)/$$p'"; \
 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_styledir)/$$p"; \
@@ -618,11 +514,8 @@
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
-#>- kthemestyle.la: $(kthemestyle_la_OBJECTS) $(kthemestyle_la_DEPENDENCIES) 
-#>+ 2
-@KDE_USE_CLOSURE_TRUE@kthemestyle.la: kthemestyle.la.closure $(kthemestyle_la_OBJECTS) $(kthemestyle_la_DEPENDENCIES) 
-@KDE_USE_CLOSURE_FALSE@kthemestyle.la: $(kthemestyle_la_OBJECTS) $(kthemestyle_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(kde_styledir) $(kthemestyle_la_LDFLAGS) $(kthemestyle_la_OBJECTS) $(kthemestyle_la_LIBADD) $(LIBS)
+kthemestyle.la: $(kthemestyle_la_OBJECTS) $(kthemestyle_la_DEPENDENCIES) 
+	$(kthemestyle_la_LINK) -rpath $(kde_styledir) $(kthemestyle_la_OBJECTS) $(kthemestyle_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -635,22 +528,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kthemestyle.Plo@am__quote@
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -661,10 +554,6 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -714,22 +603,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -745,7 +633,7 @@
 all-am: Makefile $(LTLIBRARIES) $(HEADERS)
 installdirs:
 	for dir in "$(DESTDIR)$(kde_styledir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -778,14 +666,14 @@
 #>- clean-am: clean-generic clean-kde_styleLTLIBRARIES clean-libtool \
 #>- 	mostlyclean-am
 #>+ 2
-clean-am: clean-metasources clean-closures clean-bcheck clean-final  clean-generic clean-kde_styleLTLIBRARIES clean-libtool \
+clean-am: clean-metasources clean-bcheck clean-final  clean-generic clean-kde_styleLTLIBRARIES clean-libtool \
 	mostlyclean-am
 
 distclean: distclean-am
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
@@ -799,12 +687,20 @@
 
 install-data-am: install-kde_styleLTLIBRARIES
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -825,34 +721,28 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-kde_styleLTLIBRARIES
+uninstall-am: uninstall-kde_styleLTLIBRARIES
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-kde_styleLTLIBRARIES clean-libtool ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
 	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-exec \
-	install-exec-am install-info install-info-am \
-	install-kde_styleLTLIBRARIES install-man install-strip \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am \
+	install-kde_styleLTLIBRARIES install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
 	installcheck installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-info-am \
-	uninstall-kde_styleLTLIBRARIES
+	tags uninstall uninstall-am uninstall-kde_styleLTLIBRARIES
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
-#>+ 8
-kthemestyle.la.closure: $(kthemestyle_la_OBJECTS) $(kthemestyle_la_DEPENDENCIES)
-	@echo "int main() {return 0;}" > kthemestyle_la_closure.cpp
-	@$(LTCXXCOMPILE) -c kthemestyle_la_closure.cpp
-	$(CXXLINK) kthemestyle_la_closure.lo $(kthemestyle_la_LDFLAGS) $(kthemestyle_la_OBJECTS) $(kthemestyle_la_LIBADD) $(LIBS)
-	@rm -f kthemestyle_la_closure.* kthemestyle.la.closure
-	@echo "timestamp" > kthemestyle.la.closure
-
-
 #>+ 3
 kthemebase.moc: $(srcdir)/kthemebase.h
 	$(MOC) $(srcdir)/kthemebase.h -o kthemebase.moc
@@ -874,10 +764,6 @@
 #>+ 2
 KDE_DIST=Makefile.in Makefile.am 
 
-#>+ 3
-clean-closures:
-	-rm -f  kthemestyle.la.closure
-
 #>+ 2
 docs-am:
 
--- kdelibs-3.5.7.orig/kstyles/utils/Makefile.in
+++ kdelibs-3.5.7/kstyles/utils/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,15 +14,11 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -55,17 +51,21 @@
 DIST_SOURCES =
 #>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 #>- 	html-recursive info-recursive install-data-recursive \
-#>- 	install-exec-recursive install-info-recursive \
-#>- 	install-recursive installcheck-recursive installdirs-recursive \
-#>- 	pdf-recursive ps-recursive uninstall-info-recursive \
-#>- 	uninstall-recursive
-#>+ 6
+#>- 	install-dvi-recursive install-exec-recursive \
+#>- 	install-html-recursive install-info-recursive \
+#>- 	install-pdf-recursive install-ps-recursive install-recursive \
+#>- 	installcheck-recursive installdirs-recursive pdf-recursive \
+#>- 	ps-recursive uninstall-recursive
+#>+ 7
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	html-recursive info-recursive install-data-recursive \
-	install-exec-recursive install-info-recursive \
-	install-recursive installcheck-recursive installdirs-recursive \
-	pdf-recursive ps-recursive uninstall-info-recursive \
-	uninstall-recursive nmcheck-recursive bcheck-recursive
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive nmcheck-recursive bcheck-recursive
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
@@ -75,8 +75,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -84,13 +82,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -104,8 +102,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -126,17 +122,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -205,7 +198,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -242,12 +234,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -292,87 +286,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -396,75 +346,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -472,16 +364,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -493,7 +384,7 @@
 all: docs-am  all-recursive
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -531,9 +422,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 mostlyclean-libtool:
@@ -542,10 +433,6 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
 # To change the values of `make' variables: instead of editing Makefiles,
@@ -577,8 +464,7 @@
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
+$(RECURSIVE_CLEAN_TARGETS):
 	@failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
@@ -679,22 +565,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -708,7 +593,7 @@
 	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
-	    || $(mkdir_p) "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 	    || exit 1; \
 	    distdir=`$(am__cd) $(distdir) && pwd`; \
 	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
@@ -716,6 +601,8 @@
 	      $(MAKE) $(AM_MAKEFLAGS) \
 	        top_distdir="$$top_distdir" \
 	        distdir="$$distdir/$$subdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -759,8 +646,7 @@
 
 distclean: distclean-recursive
 	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool \
-	distclean-tags
+distclean-am: clean-am distclean-generic distclean-tags
 
 dvi: dvi-recursive
 
@@ -774,12 +660,20 @@
 
 install-data-am:
 
+install-dvi: install-dvi-recursive
+
 install-exec-am:
 
+install-html: install-html-recursive
+
 install-info: install-info-recursive
 
 install-man:
 
+install-pdf: install-pdf-recursive
+
+install-ps: install-ps-recursive
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
@@ -798,22 +692,24 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am
+uninstall-am:
 
-uninstall-info: uninstall-info-recursive
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+	install-strip
 
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-	clean clean-generic clean-libtool clean-recursive ctags \
-	ctags-recursive distclean distclean-generic distclean-libtool \
-	distclean-recursive distclean-tags distdir dvi dvi-am html \
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+	all all-am check check-am clean clean-generic clean-libtool \
+	ctags ctags-recursive distclean distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
 	html-am info info-am install install-am install-data \
-	install-data-am install-exec install-exec-am install-info \
-	install-info-am install-man install-strip installcheck \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
 	installcheck-am installdirs installdirs-am maintainer-clean \
-	maintainer-clean-generic maintainer-clean-recursive \
-	mostlyclean mostlyclean-generic mostlyclean-libtool \
-	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
-	uninstall uninstall-am uninstall-info-am
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
+	uninstall uninstall-am
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- kdelibs-3.5.7.orig/kstyles/utils/installtheme/Makefile.in
+++ kdelibs-3.5.7/kstyles/utils/installtheme/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -15,15 +15,11 @@
 
 @SET_MAKE@
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -62,7 +58,14 @@
 kinstalltheme_OBJECTS = main.$(OBJEXT)
 am__DEPENDENCIES_1 =
 kinstalltheme_DEPENDENCIES = $(am__DEPENDENCIES_1)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+#>- kinstalltheme_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(kinstalltheme_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+kinstalltheme_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(kinstalltheme_LDFLAGS) $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -70,19 +73,21 @@
 #>+ 2
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 #>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
 CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 3
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(kinstalltheme_SOURCES)
 DIST_SOURCES = $(kinstalltheme_SOURCES)
 ETAGS = etags
@@ -93,8 +98,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -102,13 +105,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -122,8 +125,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -144,17 +145,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -223,7 +221,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -260,12 +257,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -310,87 +309,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -414,75 +369,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -490,16 +387,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -524,7 +420,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -562,13 +458,13 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
+	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
 	  if test -f $$p \
@@ -596,7 +492,7 @@
 	done
 kinstalltheme$(EXEEXT): $(kinstalltheme_OBJECTS) $(kinstalltheme_DEPENDENCIES) 
 	@rm -f kinstalltheme$(EXEEXT)
-	$(CXXLINK) $(kinstalltheme_LDFLAGS) $(kinstalltheme_OBJECTS) $(kinstalltheme_LDADD) $(LIBS)
+	$(kinstalltheme_LINK) $(kinstalltheme_OBJECTS) $(kinstalltheme_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -607,22 +503,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -633,10 +529,6 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -686,22 +578,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -717,7 +608,7 @@
 all-am: Makefile $(PROGRAMS)
 installdirs:
 	for dir in "$(DESTDIR)$(bindir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -755,7 +646,7 @@
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
@@ -769,12 +660,20 @@
 
 install-data-am:
 
+install-dvi: install-dvi-am
+
 install-exec-am: install-binPROGRAMS
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -795,19 +694,23 @@
 
 ps-am:
 
-uninstall-am: uninstall-binPROGRAMS uninstall-info-am
+uninstall-am: uninstall-binPROGRAMS
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
 	clean-generic clean-libtool ctags distclean distclean-compile \
 	distclean-generic distclean-libtool distclean-tags distdir dvi \
 	dvi-am html html-am info info-am install install-am \
-	install-binPROGRAMS install-data install-data-am install-exec \
-	install-exec-am install-info install-info-am install-man \
+	install-binPROGRAMS install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
 	install-strip installcheck installcheck-am installdirs \
 	maintainer-clean maintainer-clean-generic mostlyclean \
 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
 	pdf pdf-am ps ps-am tags uninstall uninstall-am \
-	uninstall-binPROGRAMS uninstall-info-am
+	uninstall-binPROGRAMS
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- kdelibs-3.5.7.orig/kstyles/klegacy/Makefile.in
+++ kdelibs-3.5.7/kstyles/klegacy/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,15 +16,11 @@
 @SET_MAKE@
 
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -72,7 +68,14 @@
 klegacystyle_la_nofinal_OBJECTS = klegacystyle.lo plugin.lo
 @KDE_USE_FINAL_FALSE@klegacystyle_la_OBJECTS = $(klegacystyle_la_nofinal_OBJECTS)
 @KDE_USE_FINAL_TRUE@klegacystyle_la_OBJECTS = $(klegacystyle_la_final_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+#>- klegacystyle_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(klegacystyle_la_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+klegacystyle_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(klegacystyle_la_LDFLAGS) $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -80,19 +83,21 @@
 #>+ 2
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
-#>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+#>+ 3
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
 CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 3
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(klegacystyle_la_SOURCES)
 DIST_SOURCES = $(klegacystyle_la_SOURCES)
 HEADERS = $(noinst_HEADERS)
@@ -104,8 +109,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -113,13 +116,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -133,8 +136,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -155,17 +156,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -234,7 +232,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -271,12 +268,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -321,87 +320,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -425,75 +380,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -501,16 +398,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -519,9 +415,7 @@
 INCLUDES = $(all_includes) 
 noinst_HEADERS = klegacystyle.h
 lib_LTLIBRARIES = klegacystyle.la
-#>- klegacystyle_la_LDFLAGS = $(all_libraries) -module  -avoid-version -no-undefined 
-#>+ 1
-klegacystyle_la_LDFLAGS = $(all_libraries) -module  -avoid-version -no-undefined $(KDE_NO_UNDEFINED) 
+klegacystyle_la_LDFLAGS = $(all_libraries) -module  -avoid-version -no-undefined 
 klegacystyle_la_LIBADD = $(LIB_KDECORE) 
 klegacystyle_la_SOURCES = klegacystyle.cpp plugin.cpp
 #>- klegacystyle_la_METASOURCES = AUTO
@@ -531,7 +425,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -569,13 +463,13 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
@@ -586,7 +480,7 @@
 
 uninstall-libLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
@@ -600,11 +494,8 @@
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
-#>- klegacystyle.la: $(klegacystyle_la_OBJECTS) $(klegacystyle_la_DEPENDENCIES) 
-#>+ 2
-@KDE_USE_CLOSURE_TRUE@klegacystyle.la: klegacystyle.la.closure $(klegacystyle_la_OBJECTS) $(klegacystyle_la_DEPENDENCIES) 
-@KDE_USE_CLOSURE_FALSE@klegacystyle.la: $(klegacystyle_la_OBJECTS) $(klegacystyle_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(libdir) $(klegacystyle_la_LDFLAGS) $(klegacystyle_la_OBJECTS) $(klegacystyle_la_LIBADD) $(LIBS)
+klegacystyle.la: $(klegacystyle_la_OBJECTS) $(klegacystyle_la_DEPENDENCIES) 
+	$(klegacystyle_la_LINK) -rpath $(libdir) $(klegacystyle_la_OBJECTS) $(klegacystyle_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -616,22 +507,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/plugin.Plo@am__quote@
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -642,10 +533,6 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -695,22 +582,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -726,7 +612,7 @@
 all-am: Makefile $(LTLIBRARIES) $(HEADERS)
 installdirs:
 	for dir in "$(DESTDIR)$(libdir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -759,14 +645,14 @@
 #>- clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
 #>- 	mostlyclean-am
 #>+ 2
-clean-am: clean-metasources clean-closures clean-bcheck clean-final  clean-generic clean-libLTLIBRARIES clean-libtool \
+clean-am: clean-metasources clean-bcheck clean-final  clean-generic clean-libLTLIBRARIES clean-libtool \
 	mostlyclean-am
 
 distclean: distclean-am
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
@@ -780,12 +666,20 @@
 
 install-data-am:
 
+install-dvi: install-dvi-am
+
 install-exec-am: install-libLTLIBRARIES
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -806,34 +700,28 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES
+uninstall-am: uninstall-libLTLIBRARIES
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-libLTLIBRARIES clean-libtool ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
 	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-exec \
-	install-exec-am install-info install-info-am \
-	install-libLTLIBRARIES install-man install-strip installcheck \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am \
+	install-libLTLIBRARIES install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
 	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-info-am \
-	uninstall-libLTLIBRARIES
+	tags uninstall uninstall-am uninstall-libLTLIBRARIES
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
-#>+ 8
-klegacystyle.la.closure: $(klegacystyle_la_OBJECTS) $(klegacystyle_la_DEPENDENCIES)
-	@echo "int main() {return 0;}" > klegacystyle_la_closure.cpp
-	@$(LTCXXCOMPILE) -c klegacystyle_la_closure.cpp
-	$(CXXLINK) klegacystyle_la_closure.lo $(klegacystyle_la_LDFLAGS) $(klegacystyle_la_OBJECTS) $(klegacystyle_la_LIBADD) $(LIBS)
-	@rm -f klegacystyle_la_closure.* klegacystyle.la.closure
-	@echo "timestamp" > klegacystyle.la.closure
-
-
 #>+ 3
 klegacystyle.moc: $(srcdir)/klegacystyle.h
 	$(MOC) $(srcdir)/klegacystyle.h -o klegacystyle.moc
@@ -848,10 +736,6 @@
 #>+ 2
 KDE_DIST=Makefile.in Makefile.am 
 
-#>+ 3
-clean-closures:
-	-rm -f  klegacystyle.la.closure
-
 #>+ 2
 docs-am:
 
--- kdelibs-3.5.7.orig/kstyles/highcolor/Makefile.in
+++ kdelibs-3.5.7/kstyles/highcolor/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -35,15 +35,11 @@
 #    Boston, MA 02110-1301, USA.
 
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -87,7 +83,14 @@
 #>- highcolor_la_OBJECTS = $(am_highcolor_la_OBJECTS)
 #>+ 1
 highcolor_la_OBJECTS = highcolor.lo
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+#>- highcolor_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(highcolor_la_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+highcolor_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(highcolor_la_LDFLAGS) $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -95,19 +98,21 @@
 #>+ 2
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 #>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
 CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 3
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(highcolor_la_SOURCES)
 DIST_SOURCES = $(highcolor_la_SOURCES)
 HEADERS = $(noinst_HEADERS)
@@ -119,8 +124,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -128,13 +131,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -148,8 +151,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -170,17 +171,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -249,7 +247,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -286,12 +283,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -336,87 +335,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -440,75 +395,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -516,16 +413,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -545,7 +441,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -583,13 +479,13 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-kde_styleLTLIBRARIES: $(kde_style_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(kde_styledir)" || $(mkdir_p) "$(DESTDIR)$(kde_styledir)"
+	test -z "$(kde_styledir)" || $(MKDIR_P) "$(DESTDIR)$(kde_styledir)"
 	@list='$(kde_style_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
@@ -600,7 +496,7 @@
 
 uninstall-kde_styleLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@set -x; list='$(kde_style_LTLIBRARIES)'; for p in $$list; do \
+	@list='$(kde_style_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_styledir)/$$p'"; \
 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_styledir)/$$p"; \
@@ -614,11 +510,8 @@
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
-#>- highcolor.la: $(highcolor_la_OBJECTS) $(highcolor_la_DEPENDENCIES) 
-#>+ 2
-@KDE_USE_CLOSURE_TRUE@highcolor.la: highcolor.la.closure $(highcolor_la_OBJECTS) $(highcolor_la_DEPENDENCIES) 
-@KDE_USE_CLOSURE_FALSE@highcolor.la: $(highcolor_la_OBJECTS) $(highcolor_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(kde_styledir) $(highcolor_la_LDFLAGS) $(highcolor_la_OBJECTS) $(highcolor_la_LIBADD) $(LIBS)
+highcolor.la: $(highcolor_la_OBJECTS) $(highcolor_la_DEPENDENCIES) 
+	$(highcolor_la_LINK) -rpath $(kde_styledir) $(highcolor_la_OBJECTS) $(highcolor_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -629,22 +522,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/highcolor.Plo@am__quote@
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -655,10 +548,6 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -708,22 +597,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -739,7 +627,7 @@
 all-am: Makefile $(LTLIBRARIES) $(HEADERS)
 installdirs:
 	for dir in "$(DESTDIR)$(kde_styledir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -772,14 +660,14 @@
 #>- clean-am: clean-generic clean-kde_styleLTLIBRARIES clean-libtool \
 #>- 	mostlyclean-am
 #>+ 2
-clean-am: clean-metasources clean-closures clean-bcheck  clean-generic clean-kde_styleLTLIBRARIES clean-libtool \
+clean-am: clean-metasources clean-bcheck  clean-generic clean-kde_styleLTLIBRARIES clean-libtool \
 	mostlyclean-am
 
 distclean: distclean-am
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
@@ -793,12 +681,20 @@
 
 install-data-am: install-kde_styleLTLIBRARIES
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -819,34 +715,28 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-kde_styleLTLIBRARIES
+uninstall-am: uninstall-kde_styleLTLIBRARIES
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-kde_styleLTLIBRARIES clean-libtool ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
 	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-exec \
-	install-exec-am install-info install-info-am \
-	install-kde_styleLTLIBRARIES install-man install-strip \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am \
+	install-kde_styleLTLIBRARIES install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
 	installcheck installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-info-am \
-	uninstall-kde_styleLTLIBRARIES
+	tags uninstall uninstall-am uninstall-kde_styleLTLIBRARIES
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
-#>+ 8
-highcolor.la.closure: $(highcolor_la_OBJECTS) $(highcolor_la_DEPENDENCIES)
-	@echo "int main() {return 0;}" > highcolor_la_closure.cpp
-	@$(LTCXXCOMPILE) -c highcolor_la_closure.cpp
-	$(CXXLINK) highcolor_la_closure.lo $(highcolor_la_LDFLAGS) $(highcolor_la_OBJECTS) $(highcolor_la_LIBADD) $(LIBS)
-	@rm -f highcolor_la_closure.* highcolor.la.closure
-	@echo "timestamp" > highcolor.la.closure
-
-
 #>+ 3
 highcolor.moc: $(srcdir)/highcolor.h
 	$(MOC) $(srcdir)/highcolor.h -o highcolor.moc
@@ -861,10 +751,6 @@
 #>+ 2
 KDE_DIST=Makefile.in Makefile.am 
 
-#>+ 3
-clean-closures:
-	-rm -f  highcolor.la.closure
-
 #>+ 2
 docs-am:
 
--- kdelibs-3.5.7.orig/kstyles/Makefile.in
+++ kdelibs-3.5.7/kstyles/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,15 +14,11 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -55,17 +51,21 @@
 DIST_SOURCES =
 #>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 #>- 	html-recursive info-recursive install-data-recursive \
-#>- 	install-exec-recursive install-info-recursive \
-#>- 	install-recursive installcheck-recursive installdirs-recursive \
-#>- 	pdf-recursive ps-recursive uninstall-info-recursive \
-#>- 	uninstall-recursive
-#>+ 6
+#>- 	install-dvi-recursive install-exec-recursive \
+#>- 	install-html-recursive install-info-recursive \
+#>- 	install-pdf-recursive install-ps-recursive install-recursive \
+#>- 	installcheck-recursive installdirs-recursive pdf-recursive \
+#>- 	ps-recursive uninstall-recursive
+#>+ 7
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	html-recursive info-recursive install-data-recursive \
-	install-exec-recursive install-info-recursive \
-	install-recursive installcheck-recursive installdirs-recursive \
-	pdf-recursive ps-recursive uninstall-info-recursive \
-	uninstall-recursive nmcheck-recursive bcheck-recursive
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive nmcheck-recursive bcheck-recursive
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
@@ -75,8 +75,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -84,13 +82,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -104,8 +102,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -126,17 +122,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -205,7 +198,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -242,12 +234,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -292,87 +286,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -396,75 +346,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -472,16 +364,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -493,7 +384,7 @@
 all: docs-am  all-recursive
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -531,9 +422,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 mostlyclean-libtool:
@@ -542,10 +433,6 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
 # To change the values of `make' variables: instead of editing Makefiles,
@@ -577,8 +464,7 @@
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
+$(RECURSIVE_CLEAN_TARGETS):
 	@failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
@@ -679,22 +565,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -708,7 +593,7 @@
 	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
-	    || $(mkdir_p) "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 	    || exit 1; \
 	    distdir=`$(am__cd) $(distdir) && pwd`; \
 	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
@@ -716,6 +601,8 @@
 	      $(MAKE) $(AM_MAKEFLAGS) \
 	        top_distdir="$$top_distdir" \
 	        distdir="$$distdir/$$subdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -759,8 +646,7 @@
 
 distclean: distclean-recursive
 	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool \
-	distclean-tags
+distclean-am: clean-am distclean-generic distclean-tags
 
 dvi: dvi-recursive
 
@@ -774,12 +660,20 @@
 
 install-data-am:
 
+install-dvi: install-dvi-recursive
+
 install-exec-am:
 
+install-html: install-html-recursive
+
 install-info: install-info-recursive
 
 install-man:
 
+install-pdf: install-pdf-recursive
+
+install-ps: install-ps-recursive
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
@@ -798,22 +692,24 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am
+uninstall-am:
 
-uninstall-info: uninstall-info-recursive
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+	install-strip
 
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-	clean clean-generic clean-libtool clean-recursive ctags \
-	ctags-recursive distclean distclean-generic distclean-libtool \
-	distclean-recursive distclean-tags distdir dvi dvi-am html \
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+	all all-am check check-am clean clean-generic clean-libtool \
+	ctags ctags-recursive distclean distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
 	html-am info info-am install install-am install-data \
-	install-data-am install-exec install-exec-am install-info \
-	install-info-am install-man install-strip installcheck \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
 	installcheck-am installdirs installdirs-am maintainer-clean \
-	maintainer-clean-generic maintainer-clean-recursive \
-	mostlyclean mostlyclean-generic mostlyclean-libtool \
-	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
-	uninstall uninstall-am uninstall-info-am
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
+	uninstall uninstall-am
 
 
 #kstyles should not be included in the apidocs
--- kdelibs-3.5.7.orig/kstyles/plastik/Makefile.in
+++ kdelibs-3.5.7/kstyles/plastik/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -17,15 +17,11 @@
 
 
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -73,7 +69,14 @@
 plastik_la_nofinal_OBJECTS = plastik.lo misc.lo
 @KDE_USE_FINAL_FALSE@plastik_la_OBJECTS = $(plastik_la_nofinal_OBJECTS)
 @KDE_USE_FINAL_TRUE@plastik_la_OBJECTS = $(plastik_la_final_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+#>- plastik_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(plastik_la_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+plastik_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(plastik_la_LDFLAGS) $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -81,37 +84,43 @@
 #>+ 2
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 #>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
 CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 3
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(plastik_la_SOURCES)
 DIST_SOURCES = $(plastik_la_SOURCES)
 #>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 #>- 	html-recursive info-recursive install-data-recursive \
-#>- 	install-exec-recursive install-info-recursive \
-#>- 	install-recursive installcheck-recursive installdirs-recursive \
-#>- 	pdf-recursive ps-recursive uninstall-info-recursive \
-#>- 	uninstall-recursive
-#>+ 6
+#>- 	install-dvi-recursive install-exec-recursive \
+#>- 	install-html-recursive install-info-recursive \
+#>- 	install-pdf-recursive install-ps-recursive install-recursive \
+#>- 	installcheck-recursive installdirs-recursive pdf-recursive \
+#>- 	ps-recursive uninstall-recursive
+#>+ 7
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	html-recursive info-recursive install-data-recursive \
-	install-exec-recursive install-info-recursive \
-	install-recursive installcheck-recursive installdirs-recursive \
-	pdf-recursive ps-recursive uninstall-info-recursive \
-	uninstall-recursive nmcheck-recursive bcheck-recursive
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive nmcheck-recursive bcheck-recursive
 stylercDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(stylerc_DATA)
 HEADERS = $(noinst_HEADERS)
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
@@ -121,8 +130,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -130,13 +137,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -150,8 +157,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -172,17 +177,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -251,7 +253,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -288,12 +289,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -338,87 +341,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -442,75 +401,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -518,16 +419,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -553,7 +453,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -591,13 +491,13 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-kde_styleLTLIBRARIES: $(kde_style_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(kde_styledir)" || $(mkdir_p) "$(DESTDIR)$(kde_styledir)"
+	test -z "$(kde_styledir)" || $(MKDIR_P) "$(DESTDIR)$(kde_styledir)"
 	@list='$(kde_style_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
@@ -608,7 +508,7 @@
 
 uninstall-kde_styleLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@set -x; list='$(kde_style_LTLIBRARIES)'; for p in $$list; do \
+	@list='$(kde_style_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_styledir)/$$p'"; \
 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_styledir)/$$p"; \
@@ -622,11 +522,8 @@
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
-#>- plastik.la: $(plastik_la_OBJECTS) $(plastik_la_DEPENDENCIES) 
-#>+ 2
-@KDE_USE_CLOSURE_TRUE@plastik.la: plastik.la.closure $(plastik_la_OBJECTS) $(plastik_la_DEPENDENCIES) 
-@KDE_USE_CLOSURE_FALSE@plastik.la: $(plastik_la_OBJECTS) $(plastik_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(kde_styledir) $(plastik_la_LDFLAGS) $(plastik_la_OBJECTS) $(plastik_la_LIBADD) $(LIBS)
+plastik.la: $(plastik_la_OBJECTS) $(plastik_la_DEPENDENCIES) 
+	$(plastik_la_LINK) -rpath $(kde_styledir) $(plastik_la_OBJECTS) $(plastik_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -638,22 +535,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/plastik.Plo@am__quote@
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -663,13 +560,9 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 install-stylercDATA: $(stylerc_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(stylercdir)" || $(mkdir_p) "$(DESTDIR)$(stylercdir)"
+	test -z "$(stylercdir)" || $(MKDIR_P) "$(DESTDIR)$(stylercdir)"
 	@list='$(stylerc_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -716,8 +609,7 @@
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
+$(RECURSIVE_CLEAN_TARGETS):
 	@failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
@@ -818,22 +710,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -847,7 +738,7 @@
 	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
-	    || $(mkdir_p) "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 	    || exit 1; \
 	    distdir=`$(am__cd) $(distdir) && pwd`; \
 	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
@@ -855,6 +746,8 @@
 	      $(MAKE) $(AM_MAKEFLAGS) \
 	        top_distdir="$$top_distdir" \
 	        distdir="$$distdir/$$subdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -865,7 +758,7 @@
 installdirs: installdirs-recursive
 installdirs-am:
 	for dir in "$(DESTDIR)$(kde_styledir)" "$(DESTDIR)$(stylercdir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-recursive
 install-exec: install-exec-recursive
@@ -899,14 +792,14 @@
 #>- clean-am: clean-generic clean-kde_styleLTLIBRARIES clean-libtool \
 #>- 	mostlyclean-am
 #>+ 2
-clean-am: clean-metasources clean-closures clean-bcheck clean-final  clean-generic clean-kde_styleLTLIBRARIES clean-libtool \
+clean-am: clean-metasources clean-bcheck clean-final  clean-generic clean-kde_styleLTLIBRARIES clean-libtool \
 	mostlyclean-am
 
 distclean: distclean-recursive
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-recursive
 
@@ -920,12 +813,20 @@
 
 install-data-am: install-kde_styleLTLIBRARIES install-stylercDATA
 
+install-dvi: install-dvi-recursive
+
 install-exec-am:
 
+install-html: install-html-recursive
+
 install-info: install-info-recursive
 
 install-man:
 
+install-pdf: install-pdf-recursive
+
+install-ps: install-ps-recursive
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
@@ -946,40 +847,32 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-kde_styleLTLIBRARIES \
-	uninstall-stylercDATA
+uninstall-am: uninstall-kde_styleLTLIBRARIES uninstall-stylercDATA
 
-uninstall-info: uninstall-info-recursive
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+	install-strip
 
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-	clean clean-generic clean-kde_styleLTLIBRARIES clean-libtool \
-	clean-recursive ctags ctags-recursive distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-recursive distclean-tags distdir dvi dvi-am html \
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+	all all-am check check-am clean clean-generic \
+	clean-kde_styleLTLIBRARIES clean-libtool ctags ctags-recursive \
+	distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
 	html-am info info-am install install-am install-data \
-	install-data-am install-exec install-exec-am install-info \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
 	install-info-am install-kde_styleLTLIBRARIES install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
 	install-strip install-stylercDATA installcheck installcheck-am \
 	installdirs installdirs-am maintainer-clean \
-	maintainer-clean-generic maintainer-clean-recursive \
-	mostlyclean mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
-	tags tags-recursive uninstall uninstall-am uninstall-info-am \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags tags-recursive uninstall uninstall-am \
 	uninstall-kde_styleLTLIBRARIES uninstall-stylercDATA
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
-#>+ 8
-plastik.la.closure: $(plastik_la_OBJECTS) $(plastik_la_DEPENDENCIES)
-	@echo "int main() {return 0;}" > plastik_la_closure.cpp
-	@$(LTCXXCOMPILE) -c plastik_la_closure.cpp
-	$(CXXLINK) plastik_la_closure.lo $(plastik_la_LDFLAGS) $(plastik_la_OBJECTS) $(plastik_la_LIBADD) $(LIBS)
-	@rm -f plastik_la_closure.* plastik.la.closure
-	@echo "timestamp" > plastik.la.closure
-
-
 #>+ 3
 plastik.moc: $(srcdir)/plastik.h
 	$(MOC) $(srcdir)/plastik.h -o plastik.moc
@@ -994,10 +887,6 @@
 #>+ 2
 KDE_DIST=Makefile.in plastik.themerc Makefile.am 
 
-#>+ 3
-clean-closures:
-	-rm -f  plastik.la.closure
-
 #>+ 2
 docs-am:
 
--- kdelibs-3.5.7.orig/kstyles/plastik/config/Makefile.in
+++ kdelibs-3.5.7/kstyles/plastik/config/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,15 +16,11 @@
 @SET_MAKE@
 
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -70,7 +66,16 @@
 #>- 	$(am_kstyle_plastik_config_la_OBJECTS)
 #>+ 1
 kstyle_plastik_config_la_OBJECTS = plastikconf.lo
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+#>- kstyle_plastik_config_la_LINK = $(LIBTOOL) --tag=CXX \
+#>- 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
+#>- 	$(AM_CXXFLAGS) $(CXXFLAGS) $(kstyle_plastik_config_la_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 4
+kstyle_plastik_config_la_LINK = $(LIBTOOL) --tag=CXX \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
+	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(kstyle_plastik_config_la_LDFLAGS) \
+	$(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -78,19 +83,21 @@
 #>+ 2
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 #>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
 CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 3
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(kstyle_plastik_config_la_SOURCES)
 DIST_SOURCES = $(kstyle_plastik_config_la_SOURCES)
 HEADERS = $(noinst_HEADERS)
@@ -102,8 +109,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -111,13 +116,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -131,8 +136,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -153,17 +156,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -232,7 +232,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -269,12 +268,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -319,87 +320,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -423,75 +380,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -499,16 +398,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -527,7 +425,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -565,13 +463,13 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
+	test -z "$(kde_moduledir)" || $(MKDIR_P) "$(DESTDIR)$(kde_moduledir)"
 	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
@@ -582,7 +480,7 @@
 
 uninstall-kde_moduleLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
@@ -596,11 +494,8 @@
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
-#>- kstyle_plastik_config.la: $(kstyle_plastik_config_la_OBJECTS) $(kstyle_plastik_config_la_DEPENDENCIES) 
-#>+ 2
-@KDE_USE_CLOSURE_TRUE@kstyle_plastik_config.la: kstyle_plastik_config.la.closure $(kstyle_plastik_config_la_OBJECTS) $(kstyle_plastik_config_la_DEPENDENCIES) 
-@KDE_USE_CLOSURE_FALSE@kstyle_plastik_config.la: $(kstyle_plastik_config_la_OBJECTS) $(kstyle_plastik_config_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(kde_moduledir) $(kstyle_plastik_config_la_LDFLAGS) $(kstyle_plastik_config_la_OBJECTS) $(kstyle_plastik_config_la_LIBADD) $(LIBS)
+kstyle_plastik_config.la: $(kstyle_plastik_config_la_OBJECTS) $(kstyle_plastik_config_la_DEPENDENCIES) 
+	$(kstyle_plastik_config_la_LINK) -rpath $(kde_moduledir) $(kstyle_plastik_config_la_OBJECTS) $(kstyle_plastik_config_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -611,22 +506,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/plastikconf.Plo@am__quote@
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -637,10 +532,6 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -690,22 +581,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -721,7 +611,7 @@
 all-am: Makefile $(LTLIBRARIES) $(HEADERS)
 installdirs:
 	for dir in "$(DESTDIR)$(kde_moduledir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -754,14 +644,14 @@
 #>- clean-am: clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
 #>- 	mostlyclean-am
 #>+ 2
-clean-am: clean-metasources clean-closures clean-bcheck  clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
+clean-am: clean-metasources clean-bcheck  clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
 	mostlyclean-am
 
 distclean: distclean-am
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
@@ -777,14 +667,22 @@
 #>+ 1
 install-data-am:   
 
+install-dvi: install-dvi-am
+
 #>- install-exec-am:
 #>+ 1
 install-exec-am:  install-kde_moduleLTLIBRARIES
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -805,20 +703,23 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-kde_moduleLTLIBRARIES
+uninstall-am: uninstall-kde_moduleLTLIBRARIES
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-kde_moduleLTLIBRARIES clean-libtool ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
 	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-exec \
-	install-exec-am install-info install-info-am \
-	install-kde_moduleLTLIBRARIES install-man install-strip \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am \
+	install-kde_moduleLTLIBRARIES install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
 	installcheck installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-info-am \
-	uninstall-kde_moduleLTLIBRARIES
+	tags uninstall uninstall-am uninstall-kde_moduleLTLIBRARIES
 
 
 messages:
@@ -827,15 +728,6 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
-#>+ 8
-kstyle_plastik_config.la.closure: $(kstyle_plastik_config_la_OBJECTS) $(kstyle_plastik_config_la_DEPENDENCIES)
-	@echo "int main() {return 0;}" > kstyle_plastik_config_la_closure.cpp
-	@$(LTCXXCOMPILE) -c kstyle_plastik_config_la_closure.cpp
-	$(CXXLINK) kstyle_plastik_config_la_closure.lo $(kstyle_plastik_config_la_LDFLAGS) $(kstyle_plastik_config_la_OBJECTS) $(kstyle_plastik_config_la_LIBADD) $(LIBS)
-	@rm -f kstyle_plastik_config_la_closure.* kstyle_plastik_config.la.closure
-	@echo "timestamp" > kstyle_plastik_config.la.closure
-
-
 #>+ 3
 plastikconf.moc: $(srcdir)/plastikconf.h
 	$(MOC) $(srcdir)/plastikconf.h -o plastikconf.moc
@@ -850,10 +742,6 @@
 #>+ 2
 KDE_DIST=Makefile.in Makefile.am 
 
-#>+ 3
-clean-closures:
-	-rm -f  kstyle_plastik_config.la.closure
-
 #>+ 2
 docs-am:
 
--- kdelibs-3.5.7.orig/kstyles/keramik/Makefile.in
+++ kdelibs-3.5.7/kstyles/keramik/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -17,15 +17,11 @@
 
 
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -75,13 +71,27 @@
 	colorutil.lo
 @KDE_USE_FINAL_FALSE@keramik_la_OBJECTS = $(keramik_la_nofinal_OBJECTS)
 @KDE_USE_FINAL_TRUE@keramik_la_OBJECTS = $(keramik_la_final_OBJECTS)
+#>- keramik_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(keramik_la_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+keramik_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(keramik_la_LDFLAGS) $(LDFLAGS) -o $@
 PROGRAMS = $(noinst_PROGRAMS)
 am_genembed_OBJECTS = genembed.$(OBJEXT)
 #>- genembed_OBJECTS = $(am_genembed_OBJECTS)
 #>+ 1
 genembed_OBJECTS = genembed.$(OBJEXT)
 genembed_DEPENDENCIES = ../../kdefx/libkdefx.la
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+#>- genembed_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(genembed_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+genembed_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(genembed_LDFLAGS) $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -89,19 +99,21 @@
 #>+ 2
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 #>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
 CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 3
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(keramik_la_SOURCES) $(genembed_SOURCES)
 DIST_SOURCES = $(keramik_la_SOURCES) $(genembed_SOURCES)
 HEADERS = $(noinst_HEADERS)
@@ -113,8 +125,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -122,13 +132,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -142,8 +152,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -164,17 +172,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -243,7 +248,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -280,12 +284,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -330,87 +336,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -434,75 +396,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -510,16 +414,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -545,7 +448,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -583,13 +486,13 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-kde_styleLTLIBRARIES: $(kde_style_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(kde_styledir)" || $(mkdir_p) "$(DESTDIR)$(kde_styledir)"
+	test -z "$(kde_styledir)" || $(MKDIR_P) "$(DESTDIR)$(kde_styledir)"
 	@list='$(kde_style_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
@@ -600,7 +503,7 @@
 
 uninstall-kde_styleLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@set -x; list='$(kde_style_LTLIBRARIES)'; for p in $$list; do \
+	@list='$(kde_style_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_styledir)/$$p'"; \
 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_styledir)/$$p"; \
@@ -614,11 +517,8 @@
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
-#>- keramik.la: $(keramik_la_OBJECTS) $(keramik_la_DEPENDENCIES) 
-#>+ 2
-@KDE_USE_CLOSURE_TRUE@keramik.la: keramik.la.closure $(keramik_la_OBJECTS) $(keramik_la_DEPENDENCIES) 
-@KDE_USE_CLOSURE_FALSE@keramik.la: $(keramik_la_OBJECTS) $(keramik_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(kde_styledir) $(keramik_la_LDFLAGS) $(keramik_la_OBJECTS) $(keramik_la_LIBADD) $(LIBS)
+keramik.la: $(keramik_la_OBJECTS) $(keramik_la_DEPENDENCIES) 
+	$(keramik_la_LINK) -rpath $(kde_styledir) $(keramik_la_OBJECTS) $(keramik_la_LIBADD) $(LIBS)
 
 clean-noinstPROGRAMS:
 	@list='$(noinst_PROGRAMS)'; for p in $$list; do \
@@ -628,7 +528,7 @@
 	done
 genembed$(EXEEXT): $(genembed_OBJECTS) $(genembed_DEPENDENCIES) 
 	@rm -f genembed$(EXEEXT)
-	$(CXXLINK) $(genembed_LDFLAGS) $(genembed_OBJECTS) $(genembed_LDADD) $(LIBS)
+	$(genembed_LINK) $(genembed_OBJECTS) $(genembed_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -643,22 +543,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pixmaploader.Plo@am__quote@
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -669,10 +569,6 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -722,22 +618,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -753,7 +648,7 @@
 all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS)
 installdirs:
 	for dir in "$(DESTDIR)$(kde_styledir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -786,14 +681,14 @@
 #>- clean-am: clean-generic clean-kde_styleLTLIBRARIES clean-libtool \
 #>- 	clean-noinstPROGRAMS mostlyclean-am
 #>+ 2
-clean-am: clean-metasources clean-closures clean-bcheck clean-final  clean-generic clean-kde_styleLTLIBRARIES clean-libtool \
+clean-am: clean-metasources clean-bcheck clean-final  clean-generic clean-kde_styleLTLIBRARIES clean-libtool \
 	clean-noinstPROGRAMS mostlyclean-am
 
 distclean: distclean-am
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
@@ -807,12 +702,20 @@
 
 install-data-am: install-kde_styleLTLIBRARIES
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -833,20 +736,24 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-kde_styleLTLIBRARIES
+uninstall-am: uninstall-kde_styleLTLIBRARIES
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-kde_styleLTLIBRARIES clean-libtool clean-noinstPROGRAMS \
 	ctags distclean distclean-compile distclean-generic \
 	distclean-libtool distclean-tags distdir dvi dvi-am html \
 	html-am info info-am install install-am install-data \
-	install-data-am install-exec install-exec-am install-info \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
 	install-info-am install-kde_styleLTLIBRARIES install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
 	install-strip installcheck installcheck-am installdirs \
 	maintainer-clean maintainer-clean-generic mostlyclean \
 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
 	pdf pdf-am ps ps-am tags uninstall uninstall-am \
-	uninstall-info-am uninstall-kde_styleLTLIBRARIES
+	uninstall-kde_styleLTLIBRARIES
 
 
 pixmaps.keramik: pics/checkbox-off.png pics/checkbox-on.png pics/combobox-list-bc.png\
@@ -922,15 +829,6 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
-#>+ 8
-keramik.la.closure: $(keramik_la_OBJECTS) $(keramik_la_DEPENDENCIES)
-	@echo "int main() {return 0;}" > keramik_la_closure.cpp
-	@$(LTCXXCOMPILE) -c keramik_la_closure.cpp
-	$(CXXLINK) keramik_la_closure.lo $(keramik_la_LDFLAGS) $(keramik_la_OBJECTS) $(keramik_la_LIBADD) $(LIBS)
-	@rm -f keramik_la_closure.* keramik.la.closure
-	@echo "timestamp" > keramik.la.closure
-
-
 #>+ 3
 keramik.moc: $(srcdir)/keramik.h
 	$(MOC) $(srcdir)/keramik.h -o keramik.moc
@@ -945,10 +843,6 @@
 #>+ 2
 KDE_DIST=Makefile.in Makefile.am 
 
-#>+ 3
-clean-closures:
-	-rm -f  keramik.la.closure
-
 #>+ 2
 docs-am:
 
--- kdelibs-3.5.7.orig/kstyles/light/Makefile.in
+++ kdelibs-3.5.7/kstyles/light/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -35,15 +35,11 @@
 #    Boston, MA 02110-1301, USA.
 
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -91,7 +87,14 @@
 light_la_nofinal_OBJECTS = light.lo lightstyle-v2.lo lightstyle-v3.lo
 @KDE_USE_FINAL_FALSE@light_la_OBJECTS = $(light_la_nofinal_OBJECTS)
 @KDE_USE_FINAL_TRUE@light_la_OBJECTS = $(light_la_final_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+#>- light_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(light_la_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+light_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(light_la_LDFLAGS) $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -99,19 +102,21 @@
 #>+ 2
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
-#>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+#>+ 3
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
 CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 3
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(light_la_SOURCES)
 DIST_SOURCES = $(light_la_SOURCES)
 HEADERS = $(noinst_HEADERS)
@@ -123,8 +128,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -132,13 +135,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -152,8 +155,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -174,17 +175,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -253,7 +251,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -290,12 +287,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -340,87 +339,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -444,75 +399,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -520,16 +417,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -549,7 +445,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -587,13 +483,13 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-kde_styleLTLIBRARIES: $(kde_style_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(kde_styledir)" || $(mkdir_p) "$(DESTDIR)$(kde_styledir)"
+	test -z "$(kde_styledir)" || $(MKDIR_P) "$(DESTDIR)$(kde_styledir)"
 	@list='$(kde_style_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
@@ -604,7 +500,7 @@
 
 uninstall-kde_styleLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@set -x; list='$(kde_style_LTLIBRARIES)'; for p in $$list; do \
+	@list='$(kde_style_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_styledir)/$$p'"; \
 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_styledir)/$$p"; \
@@ -618,11 +514,8 @@
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
-#>- light.la: $(light_la_OBJECTS) $(light_la_DEPENDENCIES) 
-#>+ 2
-@KDE_USE_CLOSURE_TRUE@light.la: light.la.closure $(light_la_OBJECTS) $(light_la_DEPENDENCIES) 
-@KDE_USE_CLOSURE_FALSE@light.la: $(light_la_OBJECTS) $(light_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(kde_styledir) $(light_la_LDFLAGS) $(light_la_OBJECTS) $(light_la_LIBADD) $(LIBS)
+light.la: $(light_la_OBJECTS) $(light_la_DEPENDENCIES) 
+	$(light_la_LINK) -rpath $(kde_styledir) $(light_la_OBJECTS) $(light_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -635,22 +528,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lightstyle-v3.Plo@am__quote@
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -661,10 +554,6 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -714,22 +603,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -745,7 +633,7 @@
 all-am: Makefile $(LTLIBRARIES) $(HEADERS)
 installdirs:
 	for dir in "$(DESTDIR)$(kde_styledir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -778,14 +666,14 @@
 #>- clean-am: clean-generic clean-kde_styleLTLIBRARIES clean-libtool \
 #>- 	mostlyclean-am
 #>+ 2
-clean-am: clean-metasources clean-closures clean-bcheck clean-final  clean-generic clean-kde_styleLTLIBRARIES clean-libtool \
+clean-am: clean-metasources clean-bcheck clean-final  clean-generic clean-kde_styleLTLIBRARIES clean-libtool \
 	mostlyclean-am
 
 distclean: distclean-am
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
@@ -799,12 +687,20 @@
 
 install-data-am: install-kde_styleLTLIBRARIES
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -825,34 +721,28 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-kde_styleLTLIBRARIES
+uninstall-am: uninstall-kde_styleLTLIBRARIES
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-kde_styleLTLIBRARIES clean-libtool ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
 	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-exec \
-	install-exec-am install-info install-info-am \
-	install-kde_styleLTLIBRARIES install-man install-strip \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am \
+	install-kde_styleLTLIBRARIES install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
 	installcheck installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-info-am \
-	uninstall-kde_styleLTLIBRARIES
+	tags uninstall uninstall-am uninstall-kde_styleLTLIBRARIES
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
-#>+ 8
-light.la.closure: $(light_la_OBJECTS) $(light_la_DEPENDENCIES)
-	@echo "int main() {return 0;}" > light_la_closure.cpp
-	@$(LTCXXCOMPILE) -c light_la_closure.cpp
-	$(CXXLINK) light_la_closure.lo $(light_la_LDFLAGS) $(light_la_OBJECTS) $(light_la_LIBADD) $(LIBS)
-	@rm -f light_la_closure.* light.la.closure
-	@echo "timestamp" > light.la.closure
-
-
 #>+ 3
 lightstyle-v3.moc: $(srcdir)/lightstyle-v3.h
 	$(MOC) $(srcdir)/lightstyle-v3.h -o lightstyle-v3.moc
@@ -874,10 +764,6 @@
 #>+ 2
 KDE_DIST=Makefile.in Makefile.am 
 
-#>+ 3
-clean-closures:
-	-rm -f  light.la.closure
-
 #>+ 2
 docs-am:
 
--- kdelibs-3.5.7.orig/kstyles/highcontrast/Makefile.in
+++ kdelibs-3.5.7/kstyles/highcontrast/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -35,15 +35,11 @@
 
 
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -88,7 +84,14 @@
 #>- highcontrast_la_OBJECTS = $(am_highcontrast_la_OBJECTS)
 #>+ 1
 highcontrast_la_OBJECTS = highcontrast.lo
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+#>- highcontrast_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(highcontrast_la_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+highcontrast_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(highcontrast_la_LDFLAGS) $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -96,37 +99,43 @@
 #>+ 2
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 #>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
 CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 3
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(highcontrast_la_SOURCES)
 DIST_SOURCES = $(highcontrast_la_SOURCES)
 #>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 #>- 	html-recursive info-recursive install-data-recursive \
-#>- 	install-exec-recursive install-info-recursive \
-#>- 	install-recursive installcheck-recursive installdirs-recursive \
-#>- 	pdf-recursive ps-recursive uninstall-info-recursive \
-#>- 	uninstall-recursive
-#>+ 6
+#>- 	install-dvi-recursive install-exec-recursive \
+#>- 	install-html-recursive install-info-recursive \
+#>- 	install-pdf-recursive install-ps-recursive install-recursive \
+#>- 	installcheck-recursive installdirs-recursive pdf-recursive \
+#>- 	ps-recursive uninstall-recursive
+#>+ 7
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	html-recursive info-recursive install-data-recursive \
-	install-exec-recursive install-info-recursive \
-	install-recursive installcheck-recursive installdirs-recursive \
-	pdf-recursive ps-recursive uninstall-info-recursive \
-	uninstall-recursive nmcheck-recursive bcheck-recursive
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive nmcheck-recursive bcheck-recursive
 stylercDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(stylerc_DATA)
 HEADERS = $(noinst_HEADERS)
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
@@ -136,8 +145,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -145,13 +152,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -165,8 +172,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -187,17 +192,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -266,7 +268,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -303,12 +304,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -353,87 +356,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -457,75 +416,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -533,16 +434,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -568,7 +468,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -606,13 +506,13 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-kde_styleLTLIBRARIES: $(kde_style_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(kde_styledir)" || $(mkdir_p) "$(DESTDIR)$(kde_styledir)"
+	test -z "$(kde_styledir)" || $(MKDIR_P) "$(DESTDIR)$(kde_styledir)"
 	@list='$(kde_style_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
@@ -623,7 +523,7 @@
 
 uninstall-kde_styleLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@set -x; list='$(kde_style_LTLIBRARIES)'; for p in $$list; do \
+	@list='$(kde_style_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_styledir)/$$p'"; \
 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_styledir)/$$p"; \
@@ -637,11 +537,8 @@
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
-#>- highcontrast.la: $(highcontrast_la_OBJECTS) $(highcontrast_la_DEPENDENCIES) 
-#>+ 2
-@KDE_USE_CLOSURE_TRUE@highcontrast.la: highcontrast.la.closure $(highcontrast_la_OBJECTS) $(highcontrast_la_DEPENDENCIES) 
-@KDE_USE_CLOSURE_FALSE@highcontrast.la: $(highcontrast_la_OBJECTS) $(highcontrast_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(kde_styledir) $(highcontrast_la_LDFLAGS) $(highcontrast_la_OBJECTS) $(highcontrast_la_LIBADD) $(LIBS)
+highcontrast.la: $(highcontrast_la_OBJECTS) $(highcontrast_la_DEPENDENCIES) 
+	$(highcontrast_la_LINK) -rpath $(kde_styledir) $(highcontrast_la_OBJECTS) $(highcontrast_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -652,22 +549,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/highcontrast.Plo@am__quote@
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -677,13 +574,9 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 install-stylercDATA: $(stylerc_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(stylercdir)" || $(mkdir_p) "$(DESTDIR)$(stylercdir)"
+	test -z "$(stylercdir)" || $(MKDIR_P) "$(DESTDIR)$(stylercdir)"
 	@list='$(stylerc_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -730,8 +623,7 @@
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
+$(RECURSIVE_CLEAN_TARGETS):
 	@failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
@@ -832,22 +724,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -861,7 +752,7 @@
 	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
-	    || $(mkdir_p) "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 	    || exit 1; \
 	    distdir=`$(am__cd) $(distdir) && pwd`; \
 	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
@@ -869,6 +760,8 @@
 	      $(MAKE) $(AM_MAKEFLAGS) \
 	        top_distdir="$$top_distdir" \
 	        distdir="$$distdir/$$subdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -879,7 +772,7 @@
 installdirs: installdirs-recursive
 installdirs-am:
 	for dir in "$(DESTDIR)$(kde_styledir)" "$(DESTDIR)$(stylercdir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-recursive
 install-exec: install-exec-recursive
@@ -913,14 +806,14 @@
 #>- clean-am: clean-generic clean-kde_styleLTLIBRARIES clean-libtool \
 #>- 	mostlyclean-am
 #>+ 2
-clean-am: clean-metasources clean-closures clean-bcheck  clean-generic clean-kde_styleLTLIBRARIES clean-libtool \
+clean-am: clean-metasources clean-bcheck  clean-generic clean-kde_styleLTLIBRARIES clean-libtool \
 	mostlyclean-am
 
 distclean: distclean-recursive
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-recursive
 
@@ -934,12 +827,20 @@
 
 install-data-am: install-kde_styleLTLIBRARIES install-stylercDATA
 
+install-dvi: install-dvi-recursive
+
 install-exec-am:
 
+install-html: install-html-recursive
+
 install-info: install-info-recursive
 
 install-man:
 
+install-pdf: install-pdf-recursive
+
+install-ps: install-ps-recursive
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
@@ -960,40 +861,32 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-kde_styleLTLIBRARIES \
-	uninstall-stylercDATA
+uninstall-am: uninstall-kde_styleLTLIBRARIES uninstall-stylercDATA
 
-uninstall-info: uninstall-info-recursive
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+	install-strip
 
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-	clean clean-generic clean-kde_styleLTLIBRARIES clean-libtool \
-	clean-recursive ctags ctags-recursive distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-recursive distclean-tags distdir dvi dvi-am html \
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+	all all-am check check-am clean clean-generic \
+	clean-kde_styleLTLIBRARIES clean-libtool ctags ctags-recursive \
+	distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
 	html-am info info-am install install-am install-data \
-	install-data-am install-exec install-exec-am install-info \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
 	install-info-am install-kde_styleLTLIBRARIES install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
 	install-strip install-stylercDATA installcheck installcheck-am \
 	installdirs installdirs-am maintainer-clean \
-	maintainer-clean-generic maintainer-clean-recursive \
-	mostlyclean mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
-	tags tags-recursive uninstall uninstall-am uninstall-info-am \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags tags-recursive uninstall uninstall-am \
 	uninstall-kde_styleLTLIBRARIES uninstall-stylercDATA
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
-#>+ 8
-highcontrast.la.closure: $(highcontrast_la_OBJECTS) $(highcontrast_la_DEPENDENCIES)
-	@echo "int main() {return 0;}" > highcontrast_la_closure.cpp
-	@$(LTCXXCOMPILE) -c highcontrast_la_closure.cpp
-	$(CXXLINK) highcontrast_la_closure.lo $(highcontrast_la_LDFLAGS) $(highcontrast_la_OBJECTS) $(highcontrast_la_LIBADD) $(LIBS)
-	@rm -f highcontrast_la_closure.* highcontrast.la.closure
-	@echo "timestamp" > highcontrast.la.closure
-
-
 #>+ 3
 highcontrast.moc: $(srcdir)/highcontrast.h
 	$(MOC) $(srcdir)/highcontrast.h -o highcontrast.moc
@@ -1008,10 +901,6 @@
 #>+ 2
 KDE_DIST=Makefile.in highcontrast.themerc Makefile.am 
 
-#>+ 3
-clean-closures:
-	-rm -f  highcontrast.la.closure
-
 #>+ 2
 docs-am:
 
--- kdelibs-3.5.7.orig/kstyles/highcontrast/config/Makefile.in
+++ kdelibs-3.5.7/kstyles/highcontrast/config/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,15 +16,11 @@
 @SET_MAKE@
 
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -70,7 +66,16 @@
 #>- 	$(am_kstyle_highcontrast_config_la_OBJECTS)
 #>+ 1
 kstyle_highcontrast_config_la_OBJECTS = highcontrastconfig.lo
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+#>- kstyle_highcontrast_config_la_LINK = $(LIBTOOL) --tag=CXX \
+#>- 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
+#>- 	$(AM_CXXFLAGS) $(CXXFLAGS) \
+#>- 	$(kstyle_highcontrast_config_la_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 4
+kstyle_highcontrast_config_la_LINK = $(LIBTOOL) --tag=CXX \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
+	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
+	$(kstyle_highcontrast_config_la_LDFLAGS) $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -78,19 +83,21 @@
 #>+ 2
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 #>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
 CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 3
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(kstyle_highcontrast_config_la_SOURCES)
 DIST_SOURCES = $(kstyle_highcontrast_config_la_SOURCES)
 HEADERS = $(noinst_HEADERS)
@@ -102,8 +109,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -111,13 +116,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -131,8 +136,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -153,17 +156,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -232,7 +232,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -269,12 +268,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -319,87 +320,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -423,75 +380,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -499,16 +398,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -527,7 +425,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -565,13 +463,13 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
+	test -z "$(kde_moduledir)" || $(MKDIR_P) "$(DESTDIR)$(kde_moduledir)"
 	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
@@ -582,7 +480,7 @@
 
 uninstall-kde_moduleLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
@@ -596,11 +494,8 @@
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
-#>- kstyle_highcontrast_config.la: $(kstyle_highcontrast_config_la_OBJECTS) $(kstyle_highcontrast_config_la_DEPENDENCIES) 
-#>+ 2
-@KDE_USE_CLOSURE_TRUE@kstyle_highcontrast_config.la: kstyle_highcontrast_config.la.closure $(kstyle_highcontrast_config_la_OBJECTS) $(kstyle_highcontrast_config_la_DEPENDENCIES) 
-@KDE_USE_CLOSURE_FALSE@kstyle_highcontrast_config.la: $(kstyle_highcontrast_config_la_OBJECTS) $(kstyle_highcontrast_config_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(kde_moduledir) $(kstyle_highcontrast_config_la_LDFLAGS) $(kstyle_highcontrast_config_la_OBJECTS) $(kstyle_highcontrast_config_la_LIBADD) $(LIBS)
+kstyle_highcontrast_config.la: $(kstyle_highcontrast_config_la_OBJECTS) $(kstyle_highcontrast_config_la_DEPENDENCIES) 
+	$(kstyle_highcontrast_config_la_LINK) -rpath $(kde_moduledir) $(kstyle_highcontrast_config_la_OBJECTS) $(kstyle_highcontrast_config_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -611,22 +506,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/highcontrastconfig.Plo@am__quote@
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -637,10 +532,6 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -690,22 +581,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -721,7 +611,7 @@
 all-am: Makefile $(LTLIBRARIES) $(HEADERS)
 installdirs:
 	for dir in "$(DESTDIR)$(kde_moduledir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -754,14 +644,14 @@
 #>- clean-am: clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
 #>- 	mostlyclean-am
 #>+ 2
-clean-am: clean-metasources clean-closures clean-bcheck  clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
+clean-am: clean-metasources clean-bcheck  clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
 	mostlyclean-am
 
 distclean: distclean-am
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
@@ -777,14 +667,22 @@
 #>+ 1
 install-data-am:   
 
+install-dvi: install-dvi-am
+
 #>- install-exec-am:
 #>+ 1
 install-exec-am:  install-kde_moduleLTLIBRARIES
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -805,20 +703,23 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-kde_moduleLTLIBRARIES
+uninstall-am: uninstall-kde_moduleLTLIBRARIES
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-kde_moduleLTLIBRARIES clean-libtool ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
 	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-exec \
-	install-exec-am install-info install-info-am \
-	install-kde_moduleLTLIBRARIES install-man install-strip \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am \
+	install-kde_moduleLTLIBRARIES install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
 	installcheck installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-info-am \
-	uninstall-kde_moduleLTLIBRARIES
+	tags uninstall uninstall-am uninstall-kde_moduleLTLIBRARIES
 
 
 messages:
@@ -827,15 +728,6 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
-#>+ 8
-kstyle_highcontrast_config.la.closure: $(kstyle_highcontrast_config_la_OBJECTS) $(kstyle_highcontrast_config_la_DEPENDENCIES)
-	@echo "int main() {return 0;}" > kstyle_highcontrast_config_la_closure.cpp
-	@$(LTCXXCOMPILE) -c kstyle_highcontrast_config_la_closure.cpp
-	$(CXXLINK) kstyle_highcontrast_config_la_closure.lo $(kstyle_highcontrast_config_la_LDFLAGS) $(kstyle_highcontrast_config_la_OBJECTS) $(kstyle_highcontrast_config_la_LIBADD) $(LIBS)
-	@rm -f kstyle_highcontrast_config_la_closure.* kstyle_highcontrast_config.la.closure
-	@echo "timestamp" > kstyle_highcontrast_config.la.closure
-
-
 #>+ 3
 highcontrastconfig.moc: $(srcdir)/highcontrastconfig.h
 	$(MOC) $(srcdir)/highcontrastconfig.h -o highcontrastconfig.moc
@@ -850,10 +742,6 @@
 #>+ 2
 KDE_DIST=Makefile.in Makefile.am 
 
-#>+ 3
-clean-closures:
-	-rm -f  kstyle_highcontrast_config.la.closure
-
 #>+ 2
 docs-am:
 
--- kdelibs-3.5.7.orig/kstyles/riscos/Makefile.in
+++ kdelibs-3.5.7/kstyles/riscos/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -15,15 +15,11 @@
 
 @SET_MAKE@
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -70,8 +66,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -79,13 +73,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -99,8 +93,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -121,17 +113,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -200,7 +189,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -237,12 +225,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -287,87 +277,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -391,75 +337,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -467,16 +355,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -525,7 +412,7 @@
 all: docs-am  all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -563,9 +450,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 mostlyclean-libtool:
@@ -573,13 +460,9 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 install-pixmapDATA: $(pixmap_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(pixmapdir)" || $(mkdir_p) "$(DESTDIR)$(pixmapdir)"
+	test -z "$(pixmapdir)" || $(MKDIR_P) "$(DESTDIR)$(pixmapdir)"
 	@list='$(pixmap_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -596,7 +479,7 @@
 	done
 install-themercDATA: $(themerc_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(themercdir)" || $(mkdir_p) "$(DESTDIR)$(themercdir)"
+	test -z "$(themercdir)" || $(MKDIR_P) "$(DESTDIR)$(themercdir)"
 	@list='$(themerc_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -619,22 +502,21 @@
 
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -650,7 +532,7 @@
 all-am: Makefile $(DATA)
 installdirs:
 	for dir in "$(DESTDIR)$(pixmapdir)" "$(DESTDIR)$(themercdir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -686,7 +568,7 @@
 
 distclean: distclean-am
 	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool
+distclean-am: clean-am distclean-generic
 
 dvi: dvi-am
 
@@ -700,12 +582,20 @@
 
 install-data-am: install-pixmapDATA install-themercDATA
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -724,19 +614,22 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-pixmapDATA \
-	uninstall-themercDATA
+uninstall-am: uninstall-pixmapDATA uninstall-themercDATA
+
+.MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
 	distclean distclean-generic distclean-libtool distdir dvi \
 	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-exec install-exec-am \
-	install-info install-info-am install-man install-pixmapDATA \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-pixmapDATA install-ps install-ps-am \
 	install-strip install-themercDATA installcheck installcheck-am \
 	installdirs maintainer-clean maintainer-clean-generic \
 	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
-	ps ps-am uninstall uninstall-am uninstall-info-am \
-	uninstall-pixmapDATA uninstall-themercDATA
+	ps ps-am uninstall uninstall-am uninstall-pixmapDATA \
+	uninstall-themercDATA
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- kdelibs-3.5.7.orig/kstyles/web/Makefile.in
+++ kdelibs-3.5.7/kstyles/web/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -17,15 +17,11 @@
 
 
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -74,7 +70,14 @@
 webstyle_la_nofinal_OBJECTS = webstyle.lo plugin.lo
 @KDE_USE_FINAL_FALSE@webstyle_la_OBJECTS = $(webstyle_la_nofinal_OBJECTS)
 @KDE_USE_FINAL_TRUE@webstyle_la_OBJECTS = $(webstyle_la_final_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+#>- webstyle_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(webstyle_la_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+webstyle_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(webstyle_la_LDFLAGS) $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -82,19 +85,21 @@
 #>+ 2
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 #>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
 CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 3
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(webstyle_la_SOURCES)
 DIST_SOURCES = $(webstyle_la_SOURCES)
 kstylewebdataDATA_INSTALL = $(INSTALL_DATA)
@@ -108,8 +113,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -117,13 +120,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -137,8 +140,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -159,17 +160,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -238,7 +236,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -275,12 +272,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -325,87 +324,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -429,75 +384,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -505,16 +402,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -522,9 +418,7 @@
 xdg_menudir = @xdg_menudir@
 INCLUDES = $(all_includes)
 lib_LTLIBRARIES = webstyle.la
-#>- webstyle_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined 
-#>+ 1
-webstyle_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined $(KDE_NO_UNDEFINED) 
+webstyle_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined 
 webstyle_la_LIBADD = $(LIB_KDEUI)
 webstyle_la_SOURCES = webstyle.cpp plugin.cpp
 noinst_HEADERS = webstyle.h 
@@ -537,7 +431,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -575,13 +469,13 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
@@ -592,7 +486,7 @@
 
 uninstall-libLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
@@ -606,11 +500,8 @@
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
-#>- webstyle.la: $(webstyle_la_OBJECTS) $(webstyle_la_DEPENDENCIES) 
-#>+ 2
-@KDE_USE_CLOSURE_TRUE@webstyle.la: webstyle.la.closure $(webstyle_la_OBJECTS) $(webstyle_la_DEPENDENCIES) 
-@KDE_USE_CLOSURE_FALSE@webstyle.la: $(webstyle_la_OBJECTS) $(webstyle_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(libdir) $(webstyle_la_LDFLAGS) $(webstyle_la_OBJECTS) $(webstyle_la_LIBADD) $(LIBS)
+webstyle.la: $(webstyle_la_OBJECTS) $(webstyle_la_DEPENDENCIES) 
+	$(webstyle_la_LINK) -rpath $(libdir) $(webstyle_la_OBJECTS) $(webstyle_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -622,22 +513,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/webstyle.Plo@am__quote@
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -647,13 +538,9 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 install-kstylewebdataDATA: $(kstylewebdata_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(kstylewebdatadir)" || $(mkdir_p) "$(DESTDIR)$(kstylewebdatadir)"
+	test -z "$(kstylewebdatadir)" || $(MKDIR_P) "$(DESTDIR)$(kstylewebdatadir)"
 	@list='$(kstylewebdata_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -718,22 +605,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -749,7 +635,7 @@
 all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS)
 installdirs:
 	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(kstylewebdatadir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -782,14 +668,14 @@
 #>- clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
 #>- 	mostlyclean-am
 #>+ 2
-clean-am: clean-closures clean-bcheck clean-final  clean-generic clean-libLTLIBRARIES clean-libtool \
+clean-am: clean-bcheck clean-final  clean-generic clean-libLTLIBRARIES clean-libtool \
 	mostlyclean-am
 
 distclean: distclean-am
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
@@ -803,12 +689,20 @@
 
 install-data-am: install-kstylewebdataDATA
 
+install-dvi: install-dvi-am
+
 install-exec-am: install-libLTLIBRARIES
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -829,43 +723,32 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-kstylewebdataDATA \
-	uninstall-libLTLIBRARIES
+uninstall-am: uninstall-kstylewebdataDATA uninstall-libLTLIBRARIES
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-libLTLIBRARIES clean-libtool ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
 	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-exec \
-	install-exec-am install-info install-info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am \
 	install-kstylewebdataDATA install-libLTLIBRARIES install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
 	install-strip installcheck installcheck-am installdirs \
 	maintainer-clean maintainer-clean-generic mostlyclean \
 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
 	pdf pdf-am ps ps-am tags uninstall uninstall-am \
-	uninstall-info-am uninstall-kstylewebdataDATA \
-	uninstall-libLTLIBRARIES
+	uninstall-kstylewebdataDATA uninstall-libLTLIBRARIES
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
-#>+ 8
-webstyle.la.closure: $(webstyle_la_OBJECTS) $(webstyle_la_DEPENDENCIES)
-	@echo "int main() {return 0;}" > webstyle_la_closure.cpp
-	@$(LTCXXCOMPILE) -c webstyle_la_closure.cpp
-	$(CXXLINK) webstyle_la_closure.lo $(webstyle_la_LDFLAGS) $(webstyle_la_OBJECTS) $(webstyle_la_LIBADD) $(LIBS)
-	@rm -f webstyle_la_closure.* webstyle.la.closure
-	@echo "timestamp" > webstyle.la.closure
-
-
 #>+ 2
 KDE_DIST=Makefile.in web.themerc Makefile.am 
 
-#>+ 3
-clean-closures:
-	-rm -f  webstyle.la.closure
-
 #>+ 2
 docs-am:
 
--- kdelibs-3.5.7.orig/mimetypes/model/Makefile.in
+++ kdelibs-3.5.7/mimetypes/model/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -15,15 +15,11 @@
 
 @SET_MAKE@
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -69,8 +65,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -78,13 +72,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -98,8 +92,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -120,17 +112,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -199,7 +188,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -236,12 +224,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -286,87 +276,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -390,75 +336,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -466,16 +354,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -489,7 +376,7 @@
 all: docs-am  all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -527,9 +414,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 mostlyclean-libtool:
@@ -537,13 +424,9 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 install-mimetypemessagedataDATA: $(mimetypemessagedata_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(mimetypemessagedatadir)" || $(mkdir_p) "$(DESTDIR)$(mimetypemessagedatadir)"
+	test -z "$(mimetypemessagedatadir)" || $(MKDIR_P) "$(DESTDIR)$(mimetypemessagedatadir)"
 	@list='$(mimetypemessagedata_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -566,22 +449,21 @@
 
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -597,7 +479,7 @@
 all-am: Makefile $(DATA)
 installdirs:
 	for dir in "$(DESTDIR)$(mimetypemessagedatadir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -633,7 +515,7 @@
 
 distclean: distclean-am
 	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool
+distclean-am: clean-am distclean-generic
 
 dvi: dvi-am
 
@@ -647,12 +529,20 @@
 
 install-data-am: install-mimetypemessagedataDATA
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -671,18 +561,22 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-mimetypemessagedataDATA
+uninstall-am: uninstall-mimetypemessagedataDATA
+
+.MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
 	distclean distclean-generic distclean-libtool distdir dvi \
 	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-exec install-exec-am \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
 	install-info install-info-am install-man \
-	install-mimetypemessagedataDATA install-strip installcheck \
+	install-mimetypemessagedataDATA install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
 	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-generic \
 	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
-	uninstall-info-am uninstall-mimetypemessagedataDATA
+	uninstall-mimetypemessagedataDATA
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- kdelibs-3.5.7.orig/mimetypes/uri/Makefile.in
+++ kdelibs-3.5.7/mimetypes/uri/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -15,15 +15,11 @@
 
 @SET_MAKE@
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -69,8 +65,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -78,13 +72,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -98,8 +92,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -120,17 +112,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -199,7 +188,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -236,12 +224,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -286,87 +276,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -390,75 +336,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -466,16 +354,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -489,7 +376,7 @@
 all: docs-am  all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -527,9 +414,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 mostlyclean-libtool:
@@ -537,13 +424,9 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 install-mimetypeuridataDATA: $(mimetypeuridata_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(mimetypeuridatadir)" || $(mkdir_p) "$(DESTDIR)$(mimetypeuridatadir)"
+	test -z "$(mimetypeuridatadir)" || $(MKDIR_P) "$(DESTDIR)$(mimetypeuridatadir)"
 	@list='$(mimetypeuridata_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -566,22 +449,21 @@
 
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -597,7 +479,7 @@
 all-am: Makefile $(DATA)
 installdirs:
 	for dir in "$(DESTDIR)$(mimetypeuridatadir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -633,7 +515,7 @@
 
 distclean: distclean-am
 	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool
+distclean-am: clean-am distclean-generic
 
 dvi: dvi-am
 
@@ -647,12 +529,20 @@
 
 install-data-am: install-mimetypeuridataDATA
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -671,18 +561,22 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-mimetypeuridataDATA
+uninstall-am: uninstall-mimetypeuridataDATA
+
+.MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
 	distclean distclean-generic distclean-libtool distdir dvi \
 	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-exec install-exec-am \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
 	install-info install-info-am install-man \
-	install-mimetypeuridataDATA install-strip installcheck \
+	install-mimetypeuridataDATA install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
 	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-generic \
 	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
-	uninstall-info-am uninstall-mimetypeuridataDATA
+	uninstall-mimetypeuridataDATA
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- kdelibs-3.5.7.orig/mimetypes/text/Makefile.in
+++ kdelibs-3.5.7/mimetypes/text/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -15,15 +15,11 @@
 
 @SET_MAKE@
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -69,8 +65,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -78,13 +72,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -98,8 +92,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -120,17 +112,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -199,7 +188,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -236,12 +224,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -286,87 +276,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -390,75 +336,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -466,16 +354,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -497,7 +384,7 @@
 all: docs-am  all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -535,9 +422,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 mostlyclean-libtool:
@@ -545,13 +432,9 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 install-mimetypetextdataDATA: $(mimetypetextdata_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(mimetypetextdatadir)" || $(mkdir_p) "$(DESTDIR)$(mimetypetextdatadir)"
+	test -z "$(mimetypetextdatadir)" || $(MKDIR_P) "$(DESTDIR)$(mimetypetextdatadir)"
 	@list='$(mimetypetextdata_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -574,22 +457,21 @@
 
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -605,7 +487,7 @@
 all-am: Makefile $(DATA)
 installdirs:
 	for dir in "$(DESTDIR)$(mimetypetextdatadir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -641,7 +523,7 @@
 
 distclean: distclean-am
 	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool
+distclean-am: clean-am distclean-generic
 
 dvi: dvi-am
 
@@ -655,12 +537,20 @@
 
 install-data-am: install-data-local install-mimetypetextdataDATA
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -679,18 +569,22 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-mimetypetextdataDATA
+uninstall-am: uninstall-mimetypetextdataDATA
+
+.MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
 	distclean distclean-generic distclean-libtool distdir dvi \
 	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-data-local install-exec \
-	install-exec-am install-info install-info-am install-man \
-	install-mimetypetextdataDATA install-strip installcheck \
+	install-data install-data-am install-data-local install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-mimetypetextdataDATA install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
 	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-generic \
 	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
-	uninstall-info-am uninstall-mimetypetextdataDATA
+	uninstall-mimetypetextdataDATA
 
 
 install-data-local: uninstall.desktop
--- kdelibs-3.5.7.orig/mimetypes/image/Makefile.in
+++ kdelibs-3.5.7/mimetypes/image/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -15,15 +15,11 @@
 
 @SET_MAKE@
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -69,8 +65,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -78,13 +72,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -98,8 +92,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -120,17 +112,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -199,7 +188,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -236,12 +224,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -286,87 +276,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -390,75 +336,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -466,16 +354,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -499,7 +386,7 @@
 all: docs-am  all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -537,9 +424,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 mostlyclean-libtool:
@@ -547,13 +434,9 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 install-mimetypeimagedataDATA: $(mimetypeimagedata_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(mimetypeimagedatadir)" || $(mkdir_p) "$(DESTDIR)$(mimetypeimagedatadir)"
+	test -z "$(mimetypeimagedatadir)" || $(MKDIR_P) "$(DESTDIR)$(mimetypeimagedatadir)"
 	@list='$(mimetypeimagedata_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -576,22 +459,21 @@
 
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -607,7 +489,7 @@
 all-am: Makefile $(DATA)
 installdirs:
 	for dir in "$(DESTDIR)$(mimetypeimagedatadir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -643,7 +525,7 @@
 
 distclean: distclean-am
 	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool
+distclean-am: clean-am distclean-generic
 
 dvi: dvi-am
 
@@ -657,12 +539,20 @@
 
 install-data-am: install-data-local install-mimetypeimagedataDATA
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -681,18 +571,22 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-mimetypeimagedataDATA
+uninstall-am: uninstall-mimetypeimagedataDATA
+
+.MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
 	distclean distclean-generic distclean-libtool distdir dvi \
 	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-data-local install-exec \
-	install-exec-am install-info install-info-am install-man \
-	install-mimetypeimagedataDATA install-strip installcheck \
+	install-data install-data-am install-data-local install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-mimetypeimagedataDATA install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
 	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-generic \
 	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
-	uninstall-info-am uninstall-mimetypeimagedataDATA
+	uninstall-mimetypeimagedataDATA
 
 
 install-data-local: uninstall.desktop
--- kdelibs-3.5.7.orig/mimetypes/Makefile.in
+++ kdelibs-3.5.7/mimetypes/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -15,15 +15,11 @@
 
 @SET_MAKE@
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -56,17 +52,19 @@
 DIST_SOURCES =
 #>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 #>- 	html-recursive info-recursive install-data-recursive \
-#>- 	install-exec-recursive install-info-recursive \
-#>- 	install-recursive installcheck-recursive installdirs-recursive \
-#>- 	pdf-recursive ps-recursive uninstall-info-recursive \
-#>- 	uninstall-recursive
-#>+ 6
+#>- 	install-dvi-recursive install-exec-recursive \
+#>- 	install-html-recursive install-info-recursive \
+#>- 	install-pdf-recursive install-ps-recursive install-recursive \
+#>- 	installcheck-recursive installdirs-recursive pdf-recursive \
+#>- 	ps-recursive uninstall-recursive
+#>+ 7
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	html-recursive info-recursive install-data-recursive \
-	install-exec-recursive install-info-recursive \
-	install-recursive installcheck-recursive installdirs-recursive \
-	pdf-recursive ps-recursive uninstall-info-recursive \
-	uninstall-recursive nmcheck-recursive bcheck-recursive
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive nmcheck-recursive bcheck-recursive
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -76,6 +74,8 @@
 am__installdirs = "$(DESTDIR)$(mimetypesdatadir)"
 mimetypesdataDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(mimetypesdata_DATA)
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
@@ -85,8 +85,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -94,13 +92,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -114,8 +112,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -136,17 +132,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -215,7 +208,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -252,12 +244,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -302,87 +296,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -406,75 +356,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -482,16 +374,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -505,7 +396,7 @@
 all: docs-am  all-recursive
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -543,9 +434,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 mostlyclean-libtool:
@@ -553,13 +444,9 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 install-mimetypesdataDATA: $(mimetypesdata_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(mimetypesdatadir)" || $(mkdir_p) "$(DESTDIR)$(mimetypesdatadir)"
+	test -z "$(mimetypesdatadir)" || $(MKDIR_P) "$(DESTDIR)$(mimetypesdatadir)"
 	@list='$(mimetypesdata_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -606,8 +493,7 @@
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
+$(RECURSIVE_CLEAN_TARGETS):
 	@failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
@@ -708,22 +594,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -737,7 +622,7 @@
 	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
-	    || $(mkdir_p) "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 	    || exit 1; \
 	    distdir=`$(am__cd) $(distdir) && pwd`; \
 	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
@@ -745,6 +630,8 @@
 	      $(MAKE) $(AM_MAKEFLAGS) \
 	        top_distdir="$$top_distdir" \
 	        distdir="$$distdir/$$subdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -755,7 +642,7 @@
 installdirs: installdirs-recursive
 installdirs-am:
 	for dir in "$(DESTDIR)$(mimetypesdatadir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-recursive
 install-exec: install-exec-recursive
@@ -791,8 +678,7 @@
 
 distclean: distclean-recursive
 	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool \
-	distclean-tags
+distclean-am: clean-am distclean-generic distclean-tags
 
 dvi: dvi-recursive
 
@@ -806,12 +692,20 @@
 
 install-data-am: install-mimetypesdataDATA
 
+install-dvi: install-dvi-recursive
+
 install-exec-am:
 
+install-html: install-html-recursive
+
 install-info: install-info-recursive
 
 install-man:
 
+install-pdf: install-pdf-recursive
+
+install-ps: install-ps-recursive
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
@@ -830,22 +724,24 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-mimetypesdataDATA
+uninstall-am: uninstall-mimetypesdataDATA
 
-uninstall-info: uninstall-info-recursive
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+	install-strip
 
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-	clean clean-generic clean-libtool clean-recursive ctags \
-	ctags-recursive distclean distclean-generic distclean-libtool \
-	distclean-recursive distclean-tags distdir dvi dvi-am html \
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+	all all-am check check-am clean clean-generic clean-libtool \
+	ctags ctags-recursive distclean distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
 	html-am info info-am install install-am install-data \
-	install-data-am install-exec install-exec-am install-info \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
 	install-info-am install-man install-mimetypesdataDATA \
+	install-pdf install-pdf-am install-ps install-ps-am \
 	install-strip installcheck installcheck-am installdirs \
 	installdirs-am maintainer-clean maintainer-clean-generic \
-	maintainer-clean-recursive mostlyclean mostlyclean-generic \
-	mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
-	tags tags-recursive uninstall uninstall-am uninstall-info-am \
+	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+	ps ps-am tags tags-recursive uninstall uninstall-am \
 	uninstall-mimetypesdataDATA
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
--- kdelibs-3.5.7.orig/mimetypes/video/Makefile.in
+++ kdelibs-3.5.7/mimetypes/video/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -15,15 +15,11 @@
 
 @SET_MAKE@
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -69,8 +65,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -78,13 +72,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -98,8 +92,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -120,17 +112,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -199,7 +188,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -236,12 +224,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -286,87 +276,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -390,75 +336,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -466,16 +354,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -493,7 +380,7 @@
 all: docs-am  all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -531,9 +418,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 mostlyclean-libtool:
@@ -541,13 +428,9 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 install-mimetypevideodataDATA: $(mimetypevideodata_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(mimetypevideodatadir)" || $(mkdir_p) "$(DESTDIR)$(mimetypevideodatadir)"
+	test -z "$(mimetypevideodatadir)" || $(MKDIR_P) "$(DESTDIR)$(mimetypevideodatadir)"
 	@list='$(mimetypevideodata_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -570,22 +453,21 @@
 
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -601,7 +483,7 @@
 all-am: Makefile $(DATA)
 installdirs:
 	for dir in "$(DESTDIR)$(mimetypevideodatadir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -637,7 +519,7 @@
 
 distclean: distclean-am
 	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool
+distclean-am: clean-am distclean-generic
 
 dvi: dvi-am
 
@@ -651,12 +533,20 @@
 
 install-data-am: install-mimetypevideodataDATA
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -675,18 +565,22 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-mimetypevideodataDATA
+uninstall-am: uninstall-mimetypevideodataDATA
+
+.MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
 	distclean distclean-generic distclean-libtool distdir dvi \
 	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-exec install-exec-am \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
 	install-info install-info-am install-man \
-	install-mimetypevideodataDATA install-strip installcheck \
+	install-mimetypevideodataDATA install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
 	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-generic \
 	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
-	uninstall-info-am uninstall-mimetypevideodataDATA
+	uninstall-mimetypevideodataDATA
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- kdelibs-3.5.7.orig/mimetypes/application/Makefile.in
+++ kdelibs-3.5.7/mimetypes/application/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -15,15 +15,11 @@
 
 @SET_MAKE@
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -69,8 +65,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -78,13 +72,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -98,8 +92,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -120,17 +112,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -199,7 +188,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -236,12 +224,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -286,87 +276,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -390,75 +336,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -466,16 +354,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -549,7 +436,7 @@
 	x-java-jnlp-file.desktop xml-dtd.desktop fits.desktop \
 	x-rar-compressed.desktop \
 	x-sqlite2.desktop x-sqlite3.desktop chm.desktop \
-	x-mplayer2.desktop
+	x-mplayer2.desktop x-nzb.desktop
 
 mimetypeapplicationdatadir = $(kde_mimedir)/application
 EXTRA_DIST = $(mimetypeapplicationdata_DATA)
@@ -558,7 +445,7 @@
 all: docs-am  all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -596,9 +483,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 mostlyclean-libtool:
@@ -606,13 +493,9 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 install-mimetypeapplicationdataDATA: $(mimetypeapplicationdata_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(mimetypeapplicationdatadir)" || $(mkdir_p) "$(DESTDIR)$(mimetypeapplicationdatadir)"
+	test -z "$(mimetypeapplicationdatadir)" || $(MKDIR_P) "$(DESTDIR)$(mimetypeapplicationdatadir)"
 	@list='$(mimetypeapplicationdata_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -635,22 +518,21 @@
 
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -666,7 +548,7 @@
 all-am: Makefile $(DATA)
 installdirs:
 	for dir in "$(DESTDIR)$(mimetypeapplicationdatadir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -702,7 +584,7 @@
 
 distclean: distclean-am
 	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool
+distclean-am: clean-am distclean-generic
 
 dvi: dvi-am
 
@@ -717,12 +599,20 @@
 install-data-am: install-data-local \
 	install-mimetypeapplicationdataDATA
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -741,18 +631,22 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-mimetypeapplicationdataDATA
+uninstall-am: uninstall-mimetypeapplicationdataDATA
+
+.MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
 	distclean distclean-generic distclean-libtool distdir dvi \
 	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-data-local install-exec \
-	install-exec-am install-info install-info-am install-man \
-	install-mimetypeapplicationdataDATA install-strip installcheck \
+	install-data install-data-am install-data-local install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-mimetypeapplicationdataDATA install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
 	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-generic \
 	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
-	uninstall-info-am uninstall-mimetypeapplicationdataDATA
+	uninstall-mimetypeapplicationdataDATA
 
 
 install-data-local: uninstall.desktop
@@ -765,7 +659,7 @@
 .NOEXPORT:
 
 #>+ 2
-KDE_DIST=x-karbon.desktop vnd.rn-realmedia.desktop x-tbz.desktop x-gnumeric.desktop x-ruby.desktop pdf.desktop x-kontour.desktop x-sharedlib.desktop x-compress.desktop x-zip-compressed.desktop msexcel.desktop x-tgif.desktop x-x509-ca-cert.desktop java.desktop x-font-bdf.desktop x-javascript.desktop x-font-ttc.desktop pkcs7-signature.desktop x-abiword.desktop vnd.sun.xml.impress.desktop x-kugar.desktop pkcs7-mime.desktop vnd.sun.xml.impress.template.desktop vnd.stardivision.impress.desktop x-kspread.desktop ogg.desktop x-troff-man.desktop x-dvi.desktop x-arj.desktop x-lha.desktop Makefile.in x-bzip.desktop x-archive.desktop x-debian-package.desktop x-kformula.desktop x-kde-wallet.desktop uninstall.desktop x-rpm.desktop pgp.desktop msword.desktop x-sqlite2.desktop x-mswrite.desktop x-java.desktop x-pkcs12.desktop x-afm.desktop x-executable-script.desktop x-gzip.desktop vnd.sun.xml.base.desktop mathml+xml.desktop x-font-snf.desktop smil.desktop x-kcsrc.desktop x-msdos-program.desktop x-kivio.desktop x-applixword.desktop x-pw.desktop pgp-keys.desktop x-font-ttf.desktop vnd.mozilla.xul+xml.desktop x-egon.desktop x-rar.desktop x-object.desktop x-executable.desktop x-trash.desktop x-shockwave-flash.desktop x-perl-module.desktop x-perl.desktop x-kchart.desktop xml-dtd.desktop x-cue.desktop x-font-ghostscript.desktop x-python.desktop x-lyx.desktop vnd.ms-powerpoint.desktop vnd.sun.xml.calc.desktop x-bzip2.desktop illustrator.desktop chm.desktop vnd.sun.xml.calc.template.desktop x-kword.desktop vnd.sun.xml.draw.template.desktop vnd.stardivision.math.desktop x-java-jnlp-file.desktop x-zoo.desktop x-core.desktop pkcs10.desktop x-designer.desktop mspowerpoint.desktop x-troff.desktop x-kpresenter.desktop x-krita.desktop vnd.palm.desktop vnd.sun.xml.writer.desktop postscript.desktop vnd.stardivision.chart.desktop x-desktop.desktop x-cpio.desktop x-sqlite3.desktop x-ace.desktop x-quattropro.desktop x-applixspread.desktop x-7z.desktop x-tex-gf.desktop x-xliff.desktop x-java-applet.desktop pgp-encrypted.desktop x-tar.desktop x-arc.desktop x-font-otf.desktop x-webarchive.desktop vnd.ms-excel.desktop vnd.stardivision.writer-global.desktop x-applixgraphics.desktop x-zip.desktop x-msmetafile.desktop fits.desktop vnd.sun.xml.draw.desktop x-ogg.desktop xsd.desktop x-dbase.desktop x-awk.desktop vnd.sun.xml.writer.master.desktop x-ica.desktop x-kudesigner.desktop x-gzdvi.desktop x-bz2dvi.desktop wordperfect.desktop x-python-bytecode.desktop x-msaccess.desktop x-tgz.desktop x-font-pcf.desktop x-zerosize.desktop x-gettext.desktop x-iso.desktop x-mimearchive.desktop mbox.desktop vnd.stardivision.draw.desktop x-cda.desktop x-bittorrent.desktop x-mplayer2.desktop xml.desktop x-jar.desktop octet-stream.desktop x-magicpoint.desktop x-rar-compressed.desktop x-siag.desktop x-font-type1.desktop x-tarz.desktop vnd.stardivision.writer.desktop sieve.desktop vnd.sun.xml.writer.template.desktop x-tex-pk.desktop x-php.desktop x-gzpostscript.desktop x-pak.desktop x-vnd.kde.kugar.mixed.desktop x-lzop.desktop x-amipro.desktop x-vnd.kde.kplato.desktop x-vnd.kde.kexi.desktop x-hancomword.desktop x-deb.desktop x-shellscript.desktop xhtml+xml.desktop pgp-signature.desktop x-tzo.desktop vnd.ms-word.desktop x-kpovmodeler.desktop relaxng.desktop x-graphite.desktop vnd.stardivision.calc.desktop vnd.ms-asf.desktop Makefile.am x-font-speedo.desktop x-linguist.desktop 
+KDE_DIST=x-karbon.desktop vnd.rn-realmedia.desktop x-tbz.desktop x-gnumeric.desktop x-ruby.desktop pdf.desktop x-kontour.desktop x-sharedlib.desktop x-compress.desktop x-zip-compressed.desktop msexcel.desktop x-tgif.desktop x-x509-ca-cert.desktop java.desktop x-font-bdf.desktop x-javascript.desktop x-font-ttc.desktop pkcs7-signature.desktop x-abiword.desktop vnd.sun.xml.impress.desktop x-kugar.desktop pkcs7-mime.desktop vnd.sun.xml.impress.template.desktop vnd.stardivision.impress.desktop x-kspread.desktop ogg.desktop x-troff-man.desktop x-dvi.desktop x-arj.desktop x-lha.desktop Makefile.in x-bzip.desktop x-archive.desktop x-debian-package.desktop x-kformula.desktop x-kde-wallet.desktop uninstall.desktop x-rpm.desktop pgp.desktop msword.desktop x-sqlite2.desktop x-mswrite.desktop x-java.desktop x-pkcs12.desktop x-afm.desktop x-executable-script.desktop x-gzip.desktop vnd.sun.xml.base.desktop mathml+xml.desktop x-font-snf.desktop smil.desktop x-kcsrc.desktop x-msdos-program.desktop x-kivio.desktop x-applixword.desktop x-nzb.desktop x-pw.desktop pgp-keys.desktop x-font-ttf.desktop vnd.mozilla.xul+xml.desktop x-egon.desktop x-rar.desktop x-object.desktop x-executable.desktop x-trash.desktop x-shockwave-flash.desktop x-perl-module.desktop x-perl.desktop x-kchart.desktop xml-dtd.desktop x-cue.desktop x-font-ghostscript.desktop x-python.desktop x-lyx.desktop vnd.ms-powerpoint.desktop vnd.sun.xml.calc.desktop x-bzip2.desktop illustrator.desktop chm.desktop vnd.sun.xml.calc.template.desktop x-kword.desktop vnd.sun.xml.draw.template.desktop vnd.stardivision.math.desktop x-java-jnlp-file.desktop x-zoo.desktop x-core.desktop pkcs10.desktop x-designer.desktop mspowerpoint.desktop x-troff.desktop x-kpresenter.desktop x-krita.desktop vnd.palm.desktop vnd.sun.xml.writer.desktop postscript.desktop vnd.stardivision.chart.desktop x-desktop.desktop x-cpio.desktop x-sqlite3.desktop x-ace.desktop x-quattropro.desktop x-applixspread.desktop x-7z.desktop x-tex-gf.desktop x-xliff.desktop x-java-applet.desktop pgp-encrypted.desktop x-tar.desktop x-arc.desktop x-font-otf.desktop x-webarchive.desktop vnd.ms-excel.desktop vnd.stardivision.writer-global.desktop x-applixgraphics.desktop x-zip.desktop x-msmetafile.desktop fits.desktop vnd.sun.xml.draw.desktop x-ogg.desktop xsd.desktop x-dbase.desktop x-awk.desktop vnd.sun.xml.writer.master.desktop x-ica.desktop x-kudesigner.desktop x-gzdvi.desktop x-bz2dvi.desktop wordperfect.desktop x-python-bytecode.desktop x-msaccess.desktop x-tgz.desktop x-font-pcf.desktop x-zerosize.desktop x-gettext.desktop x-iso.desktop x-mimearchive.desktop mbox.desktop vnd.stardivision.draw.desktop x-cda.desktop x-bittorrent.desktop x-mplayer2.desktop xml.desktop x-jar.desktop octet-stream.desktop x-magicpoint.desktop x-rar-compressed.desktop x-siag.desktop x-font-type1.desktop x-tarz.desktop vnd.stardivision.writer.desktop sieve.desktop vnd.sun.xml.writer.template.desktop x-tex-pk.desktop x-php.desktop x-gzpostscript.desktop x-pak.desktop x-vnd.kde.kugar.mixed.desktop x-lzop.desktop x-amipro.desktop x-vnd.kde.kplato.desktop x-vnd.kde.kexi.desktop x-hancomword.desktop x-deb.desktop x-shellscript.desktop xhtml+xml.desktop pgp-signature.desktop x-tzo.desktop vnd.ms-word.desktop x-kpovmodeler.desktop relaxng.desktop x-graphite.desktop vnd.stardivision.calc.desktop vnd.ms-asf.desktop Makefile.am x-font-speedo.desktop x-linguist.desktop 
 
 #>+ 2
 docs-am:
--- kdelibs-3.5.7.orig/mimetypes/audio/Makefile.in
+++ kdelibs-3.5.7/mimetypes/audio/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -15,15 +15,11 @@
 
 @SET_MAKE@
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -69,8 +65,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -78,13 +72,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -98,8 +92,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -120,17 +112,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -199,7 +188,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -236,12 +224,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -286,87 +276,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -390,75 +336,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -466,16 +354,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -498,7 +385,7 @@
 all: docs-am  all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -536,9 +423,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 mostlyclean-libtool:
@@ -546,13 +433,9 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 install-mimetypeaudiodataDATA: $(mimetypeaudiodata_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(mimetypeaudiodatadir)" || $(mkdir_p) "$(DESTDIR)$(mimetypeaudiodatadir)"
+	test -z "$(mimetypeaudiodatadir)" || $(MKDIR_P) "$(DESTDIR)$(mimetypeaudiodatadir)"
 	@list='$(mimetypeaudiodata_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -575,22 +458,21 @@
 
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -606,7 +488,7 @@
 all-am: Makefile $(DATA)
 installdirs:
 	for dir in "$(DESTDIR)$(mimetypeaudiodatadir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -642,7 +524,7 @@
 
 distclean: distclean-am
 	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool
+distclean-am: clean-am distclean-generic
 
 dvi: dvi-am
 
@@ -656,12 +538,20 @@
 
 install-data-am: install-mimetypeaudiodataDATA
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -680,18 +570,22 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-mimetypeaudiodataDATA
+uninstall-am: uninstall-mimetypeaudiodataDATA
+
+.MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
 	distclean distclean-generic distclean-libtool distdir dvi \
 	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-exec install-exec-am \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
 	install-info install-info-am install-man \
-	install-mimetypeaudiodataDATA install-strip installcheck \
+	install-mimetypeaudiodataDATA install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
 	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-generic \
 	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
-	uninstall-info-am uninstall-mimetypeaudiodataDATA
+	uninstall-mimetypeaudiodataDATA
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- kdelibs-3.5.7.orig/mimetypes/inode/Makefile.in
+++ kdelibs-3.5.7/mimetypes/inode/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -15,15 +15,11 @@
 
 @SET_MAKE@
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -69,8 +65,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -78,13 +72,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -98,8 +92,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -120,17 +112,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -199,7 +188,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -236,12 +224,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -286,87 +276,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -390,75 +336,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -466,16 +354,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -491,7 +378,7 @@
 all: docs-am  all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -529,9 +416,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 mostlyclean-libtool:
@@ -539,13 +426,9 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 install-mimetypeinodedataDATA: $(mimetypeinodedata_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(mimetypeinodedatadir)" || $(mkdir_p) "$(DESTDIR)$(mimetypeinodedatadir)"
+	test -z "$(mimetypeinodedatadir)" || $(MKDIR_P) "$(DESTDIR)$(mimetypeinodedatadir)"
 	@list='$(mimetypeinodedata_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -568,22 +451,21 @@
 
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -599,7 +481,7 @@
 all-am: Makefile $(DATA)
 installdirs:
 	for dir in "$(DESTDIR)$(mimetypeinodedatadir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -635,7 +517,7 @@
 
 distclean: distclean-am
 	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool
+distclean-am: clean-am distclean-generic
 
 dvi: dvi-am
 
@@ -649,12 +531,20 @@
 
 install-data-am: install-mimetypeinodedataDATA
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -673,18 +563,22 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-mimetypeinodedataDATA
+uninstall-am: uninstall-mimetypeinodedataDATA
+
+.MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
 	distclean distclean-generic distclean-libtool distdir dvi \
 	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-exec install-exec-am \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
 	install-info install-info-am install-man \
-	install-mimetypeinodedataDATA install-strip installcheck \
+	install-mimetypeinodedataDATA install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
 	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-generic \
 	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
-	uninstall-info-am uninstall-mimetypeinodedataDATA
+	uninstall-mimetypeinodedataDATA
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- kdelibs-3.5.7.orig/mimetypes/multipart/Makefile.in
+++ kdelibs-3.5.7/mimetypes/multipart/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -15,15 +15,11 @@
 
 @SET_MAKE@
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -69,8 +65,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -78,13 +72,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -98,8 +92,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -120,17 +112,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -199,7 +188,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -236,12 +224,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -286,87 +276,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -390,75 +336,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -466,16 +354,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -489,7 +376,7 @@
 all: docs-am  all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -527,9 +414,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 mostlyclean-libtool:
@@ -537,13 +424,9 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 install-mimetypemultipartdataDATA: $(mimetypemultipartdata_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(mimetypemultipartdatadir)" || $(mkdir_p) "$(DESTDIR)$(mimetypemultipartdatadir)"
+	test -z "$(mimetypemultipartdatadir)" || $(MKDIR_P) "$(DESTDIR)$(mimetypemultipartdatadir)"
 	@list='$(mimetypemultipartdata_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -566,22 +449,21 @@
 
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -597,7 +479,7 @@
 all-am: Makefile $(DATA)
 installdirs:
 	for dir in "$(DESTDIR)$(mimetypemultipartdatadir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -633,7 +515,7 @@
 
 distclean: distclean-am
 	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool
+distclean-am: clean-am distclean-generic
 
 dvi: dvi-am
 
@@ -647,12 +529,20 @@
 
 install-data-am: install-mimetypemultipartdataDATA
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -671,18 +561,22 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-mimetypemultipartdataDATA
+uninstall-am: uninstall-mimetypemultipartdataDATA
+
+.MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
 	distclean distclean-generic distclean-libtool distdir dvi \
 	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-exec install-exec-am \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
 	install-info install-info-am install-man \
-	install-mimetypemultipartdataDATA install-strip installcheck \
+	install-mimetypemultipartdataDATA install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
 	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-generic \
 	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
-	uninstall-info-am uninstall-mimetypemultipartdataDATA
+	uninstall-mimetypemultipartdataDATA
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- kdelibs-3.5.7.orig/mimetypes/message/Makefile.in
+++ kdelibs-3.5.7/mimetypes/message/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -15,15 +15,11 @@
 
 @SET_MAKE@
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -69,8 +65,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -78,13 +72,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -98,8 +92,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -120,17 +112,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -199,7 +188,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -236,12 +224,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -286,87 +276,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -390,75 +336,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -466,16 +354,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -489,7 +376,7 @@
 all: docs-am  all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -527,9 +414,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 mostlyclean-libtool:
@@ -537,13 +424,9 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 install-mimetypemessagedataDATA: $(mimetypemessagedata_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(mimetypemessagedatadir)" || $(mkdir_p) "$(DESTDIR)$(mimetypemessagedatadir)"
+	test -z "$(mimetypemessagedatadir)" || $(MKDIR_P) "$(DESTDIR)$(mimetypemessagedatadir)"
 	@list='$(mimetypemessagedata_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -566,22 +449,21 @@
 
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -597,7 +479,7 @@
 all-am: Makefile $(DATA)
 installdirs:
 	for dir in "$(DESTDIR)$(mimetypemessagedatadir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -633,7 +515,7 @@
 
 distclean: distclean-am
 	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool
+distclean-am: clean-am distclean-generic
 
 dvi: dvi-am
 
@@ -647,12 +529,20 @@
 
 install-data-am: install-mimetypemessagedataDATA
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -671,18 +561,22 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-mimetypemessagedataDATA
+uninstall-am: uninstall-mimetypemessagedataDATA
+
+.MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
 	distclean distclean-generic distclean-libtool distdir dvi \
 	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-exec install-exec-am \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
 	install-info install-info-am install-man \
-	install-mimetypemessagedataDATA install-strip installcheck \
+	install-mimetypemessagedataDATA install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
 	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-generic \
 	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
-	uninstall-info-am uninstall-mimetypemessagedataDATA
+	uninstall-mimetypemessagedataDATA
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- kdelibs-3.5.7.orig/kdeui/tests/Makefile.in
+++ kdelibs-3.5.7/kdeui/tests/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -33,15 +33,11 @@
 #    along with this library; see the file COPYING.LIB.  If not, write to
 #    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 #    Boston, MA 02110-1301, USA.
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -444,7 +440,7 @@
 qxembedtest_OBJECTS = qxembedtest.$(OBJEXT)
 qxembedtest_LDADD = $(LDADD)
 qxembedtest_DEPENDENCIES = ../libkdeui.la
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -452,19 +448,21 @@
 #>+ 2
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
-#>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+#>+ 3
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
 CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 3
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(itemcontainertest_SOURCES) $(kaboutdialogtest_SOURCES) \
 	$(kaccelgentest_SOURCES) $(kactiontest_SOURCES) \
 	$(kblendtest_SOURCES) $(kbuttonboxtest_SOURCES) \
@@ -533,8 +531,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -542,13 +538,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -562,8 +558,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -584,17 +578,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -663,7 +654,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -700,12 +690,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -750,87 +742,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -854,75 +802,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -930,16 +820,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -1014,7 +903,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -1052,9 +941,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 clean-checkPROGRAMS:
@@ -1065,175 +954,175 @@
 	done
 itemcontainertest$(EXEEXT): $(itemcontainertest_OBJECTS) $(itemcontainertest_DEPENDENCIES) 
 	@rm -f itemcontainertest$(EXEEXT)
-	$(CXXLINK) $(itemcontainertest_LDFLAGS) $(itemcontainertest_OBJECTS) $(itemcontainertest_LDADD) $(LIBS)
+	$(CXXLINK) $(itemcontainertest_OBJECTS) $(itemcontainertest_LDADD) $(LIBS)
 kaboutdialogtest$(EXEEXT): $(kaboutdialogtest_OBJECTS) $(kaboutdialogtest_DEPENDENCIES) 
 	@rm -f kaboutdialogtest$(EXEEXT)
-	$(CXXLINK) $(kaboutdialogtest_LDFLAGS) $(kaboutdialogtest_OBJECTS) $(kaboutdialogtest_LDADD) $(LIBS)
+	$(CXXLINK) $(kaboutdialogtest_OBJECTS) $(kaboutdialogtest_LDADD) $(LIBS)
 kaccelgentest$(EXEEXT): $(kaccelgentest_OBJECTS) $(kaccelgentest_DEPENDENCIES) 
 	@rm -f kaccelgentest$(EXEEXT)
-	$(CXXLINK) $(kaccelgentest_LDFLAGS) $(kaccelgentest_OBJECTS) $(kaccelgentest_LDADD) $(LIBS)
+	$(CXXLINK) $(kaccelgentest_OBJECTS) $(kaccelgentest_LDADD) $(LIBS)
 kactiontest$(EXEEXT): $(kactiontest_OBJECTS) $(kactiontest_DEPENDENCIES) 
 	@rm -f kactiontest$(EXEEXT)
-	$(CXXLINK) $(kactiontest_LDFLAGS) $(kactiontest_OBJECTS) $(kactiontest_LDADD) $(LIBS)
+	$(CXXLINK) $(kactiontest_OBJECTS) $(kactiontest_LDADD) $(LIBS)
 kblendtest$(EXEEXT): $(kblendtest_OBJECTS) $(kblendtest_DEPENDENCIES) 
 	@rm -f kblendtest$(EXEEXT)
-	$(CXXLINK) $(kblendtest_LDFLAGS) $(kblendtest_OBJECTS) $(kblendtest_LDADD) $(LIBS)
+	$(CXXLINK) $(kblendtest_OBJECTS) $(kblendtest_LDADD) $(LIBS)
 kbuttonboxtest$(EXEEXT): $(kbuttonboxtest_OBJECTS) $(kbuttonboxtest_DEPENDENCIES) 
 	@rm -f kbuttonboxtest$(EXEEXT)
-	$(CXXLINK) $(kbuttonboxtest_LDFLAGS) $(kbuttonboxtest_OBJECTS) $(kbuttonboxtest_LDADD) $(LIBS)
+	$(CXXLINK) $(kbuttonboxtest_OBJECTS) $(kbuttonboxtest_LDADD) $(LIBS)
 kcharselecttest$(EXEEXT): $(kcharselecttest_OBJECTS) $(kcharselecttest_DEPENDENCIES) 
 	@rm -f kcharselecttest$(EXEEXT)
-	$(CXXLINK) $(kcharselecttest_LDFLAGS) $(kcharselecttest_OBJECTS) $(kcharselecttest_LDADD) $(LIBS)
+	$(CXXLINK) $(kcharselecttest_OBJECTS) $(kcharselecttest_LDADD) $(LIBS)
 kcolordlgtest$(EXEEXT): $(kcolordlgtest_OBJECTS) $(kcolordlgtest_DEPENDENCIES) 
 	@rm -f kcolordlgtest$(EXEEXT)
-	$(CXXLINK) $(kcolordlgtest_LDFLAGS) $(kcolordlgtest_OBJECTS) $(kcolordlgtest_LDADD) $(LIBS)
+	$(CXXLINK) $(kcolordlgtest_OBJECTS) $(kcolordlgtest_LDADD) $(LIBS)
 kcolortest$(EXEEXT): $(kcolortest_OBJECTS) $(kcolortest_DEPENDENCIES) 
 	@rm -f kcolortest$(EXEEXT)
-	$(CXXLINK) $(kcolortest_LDFLAGS) $(kcolortest_OBJECTS) $(kcolortest_LDADD) $(LIBS)
+	$(CXXLINK) $(kcolortest_OBJECTS) $(kcolortest_LDADD) $(LIBS)
 kcomboboxtest$(EXEEXT): $(kcomboboxtest_OBJECTS) $(kcomboboxtest_DEPENDENCIES) 
 	@rm -f kcomboboxtest$(EXEEXT)
-	$(CXXLINK) $(kcomboboxtest_LDFLAGS) $(kcomboboxtest_OBJECTS) $(kcomboboxtest_LDADD) $(LIBS)
+	$(CXXLINK) $(kcomboboxtest_OBJECTS) $(kcomboboxtest_LDADD) $(LIBS)
 kcompletiontest$(EXEEXT): $(kcompletiontest_OBJECTS) $(kcompletiontest_DEPENDENCIES) 
 	@rm -f kcompletiontest$(EXEEXT)
-	$(CXXLINK) $(kcompletiontest_LDFLAGS) $(kcompletiontest_OBJECTS) $(kcompletiontest_LDADD) $(LIBS)
+	$(CXXLINK) $(kcompletiontest_OBJECTS) $(kcompletiontest_LDADD) $(LIBS)
 kdatepicktest$(EXEEXT): $(kdatepicktest_OBJECTS) $(kdatepicktest_DEPENDENCIES) 
 	@rm -f kdatepicktest$(EXEEXT)
-	$(CXXLINK) $(kdatepicktest_LDFLAGS) $(kdatepicktest_OBJECTS) $(kdatepicktest_LDADD) $(LIBS)
+	$(CXXLINK) $(kdatepicktest_OBJECTS) $(kdatepicktest_LDADD) $(LIBS)
 kdatetimewidgettest$(EXEEXT): $(kdatetimewidgettest_OBJECTS) $(kdatetimewidgettest_DEPENDENCIES) 
 	@rm -f kdatetimewidgettest$(EXEEXT)
-	$(CXXLINK) $(kdatetimewidgettest_LDFLAGS) $(kdatetimewidgettest_OBJECTS) $(kdatetimewidgettest_LDADD) $(LIBS)
+	$(CXXLINK) $(kdatetimewidgettest_OBJECTS) $(kdatetimewidgettest_LDADD) $(LIBS)
 kdatewidgettest$(EXEEXT): $(kdatewidgettest_OBJECTS) $(kdatewidgettest_DEPENDENCIES) 
 	@rm -f kdatewidgettest$(EXEEXT)
-	$(CXXLINK) $(kdatewidgettest_LDFLAGS) $(kdatewidgettest_OBJECTS) $(kdatewidgettest_LDADD) $(LIBS)
+	$(CXXLINK) $(kdatewidgettest_OBJECTS) $(kdatewidgettest_LDADD) $(LIBS)
 kdesattest$(EXEEXT): $(kdesattest_OBJECTS) $(kdesattest_DEPENDENCIES) 
 	@rm -f kdesattest$(EXEEXT)
-	$(CXXLINK) $(kdesattest_LDFLAGS) $(kdesattest_OBJECTS) $(kdesattest_LDADD) $(LIBS)
+	$(CXXLINK) $(kdesattest_OBJECTS) $(kdesattest_LDADD) $(LIBS)
 kdialogbasetest$(EXEEXT): $(kdialogbasetest_OBJECTS) $(kdialogbasetest_DEPENDENCIES) 
 	@rm -f kdialogbasetest$(EXEEXT)
-	$(CXXLINK) $(kdialogbasetest_LDFLAGS) $(kdialogbasetest_OBJECTS) $(kdialogbasetest_LDADD) $(LIBS)
+	$(CXXLINK) $(kdialogbasetest_OBJECTS) $(kdialogbasetest_LDADD) $(LIBS)
 kdocktest$(EXEEXT): $(kdocktest_OBJECTS) $(kdocktest_DEPENDENCIES) 
 	@rm -f kdocktest$(EXEEXT)
-	$(CXXLINK) $(kdocktest_LDFLAGS) $(kdocktest_OBJECTS) $(kdocktest_LDADD) $(LIBS)
+	$(CXXLINK) $(kdocktest_OBJECTS) $(kdocktest_LDADD) $(LIBS)
 kdockwidgetdemo$(EXEEXT): $(kdockwidgetdemo_OBJECTS) $(kdockwidgetdemo_DEPENDENCIES) 
 	@rm -f kdockwidgetdemo$(EXEEXT)
-	$(CXXLINK) $(kdockwidgetdemo_LDFLAGS) $(kdockwidgetdemo_OBJECTS) $(kdockwidgetdemo_LDADD) $(LIBS)
+	$(CXXLINK) $(kdockwidgetdemo_OBJECTS) $(kdockwidgetdemo_LDADD) $(LIBS)
 kdockwidgettest$(EXEEXT): $(kdockwidgettest_OBJECTS) $(kdockwidgettest_DEPENDENCIES) 
 	@rm -f kdockwidgettest$(EXEEXT)
-	$(CXXLINK) $(kdockwidgettest_LDFLAGS) $(kdockwidgettest_OBJECTS) $(kdockwidgettest_LDADD) $(LIBS)
+	$(CXXLINK) $(kdockwidgettest_OBJECTS) $(kdockwidgettest_LDADD) $(LIBS)
 kdualcolortest$(EXEEXT): $(kdualcolortest_OBJECTS) $(kdualcolortest_DEPENDENCIES) 
 	@rm -f kdualcolortest$(EXEEXT)
-	$(CXXLINK) $(kdualcolortest_LDFLAGS) $(kdualcolortest_OBJECTS) $(kdualcolortest_LDADD) $(LIBS)
+	$(CXXLINK) $(kdualcolortest_OBJECTS) $(kdualcolortest_LDADD) $(LIBS)
 keditlistboxtest$(EXEEXT): $(keditlistboxtest_OBJECTS) $(keditlistboxtest_DEPENDENCIES) 
 	@rm -f keditlistboxtest$(EXEEXT)
-	$(CXXLINK) $(keditlistboxtest_LDFLAGS) $(keditlistboxtest_OBJECTS) $(keditlistboxtest_LDADD) $(LIBS)
+	$(CXXLINK) $(keditlistboxtest_OBJECTS) $(keditlistboxtest_LDADD) $(LIBS)
 kedittest$(EXEEXT): $(kedittest_OBJECTS) $(kedittest_DEPENDENCIES) 
 	@rm -f kedittest$(EXEEXT)
-	$(CXXLINK) $(kedittest_LDFLAGS) $(kedittest_OBJECTS) $(kedittest_LDADD) $(LIBS)
+	$(CXXLINK) $(kedittest_OBJECTS) $(kedittest_LDADD) $(LIBS)
 kfontdialogtest$(EXEEXT): $(kfontdialogtest_OBJECTS) $(kfontdialogtest_DEPENDENCIES) 
 	@rm -f kfontdialogtest$(EXEEXT)
-	$(CXXLINK) $(kfontdialogtest_LDFLAGS) $(kfontdialogtest_OBJECTS) $(kfontdialogtest_LDADD) $(LIBS)
+	$(CXXLINK) $(kfontdialogtest_OBJECTS) $(kfontdialogtest_LDADD) $(LIBS)
 kgradienttest$(EXEEXT): $(kgradienttest_OBJECTS) $(kgradienttest_DEPENDENCIES) 
 	@rm -f kgradienttest$(EXEEXT)
-	$(CXXLINK) $(kgradienttest_LDFLAGS) $(kgradienttest_OBJECTS) $(kgradienttest_LDADD) $(LIBS)
+	$(CXXLINK) $(kgradienttest_OBJECTS) $(kgradienttest_LDADD) $(LIBS)
 khashtest$(EXEEXT): $(khashtest_OBJECTS) $(khashtest_DEPENDENCIES) 
 	@rm -f khashtest$(EXEEXT)
-	$(CXXLINK) $(khashtest_LDFLAGS) $(khashtest_OBJECTS) $(khashtest_LDADD) $(LIBS)
+	$(CXXLINK) $(khashtest_OBJECTS) $(khashtest_LDADD) $(LIBS)
 kinputdialogtest$(EXEEXT): $(kinputdialogtest_OBJECTS) $(kinputdialogtest_DEPENDENCIES) 
 	@rm -f kinputdialogtest$(EXEEXT)
-	$(CXXLINK) $(kinputdialogtest_LDFLAGS) $(kinputdialogtest_OBJECTS) $(kinputdialogtest_LDADD) $(LIBS)
+	$(CXXLINK) $(kinputdialogtest_OBJECTS) $(kinputdialogtest_LDADD) $(LIBS)
 kjanuswidgettest$(EXEEXT): $(kjanuswidgettest_OBJECTS) $(kjanuswidgettest_DEPENDENCIES) 
 	@rm -f kjanuswidgettest$(EXEEXT)
-	$(CXXLINK) $(kjanuswidgettest_LDFLAGS) $(kjanuswidgettest_OBJECTS) $(kjanuswidgettest_LDADD) $(LIBS)
+	$(CXXLINK) $(kjanuswidgettest_OBJECTS) $(kjanuswidgettest_LDADD) $(LIBS)
 kledtest$(EXEEXT): $(kledtest_OBJECTS) $(kledtest_DEPENDENCIES) 
 	@rm -f kledtest$(EXEEXT)
-	$(CXXLINK) $(kledtest_LDFLAGS) $(kledtest_OBJECTS) $(kledtest_LDADD) $(LIBS)
+	$(CXXLINK) $(kledtest_OBJECTS) $(kledtest_LDADD) $(LIBS)
 klineeditdlgtest$(EXEEXT): $(klineeditdlgtest_OBJECTS) $(klineeditdlgtest_DEPENDENCIES) 
 	@rm -f klineeditdlgtest$(EXEEXT)
-	$(CXXLINK) $(klineeditdlgtest_LDFLAGS) $(klineeditdlgtest_OBJECTS) $(klineeditdlgtest_LDADD) $(LIBS)
+	$(CXXLINK) $(klineeditdlgtest_OBJECTS) $(klineeditdlgtest_LDADD) $(LIBS)
 klineedittest$(EXEEXT): $(klineedittest_OBJECTS) $(klineedittest_DEPENDENCIES) 
 	@rm -f klineedittest$(EXEEXT)
-	$(CXXLINK) $(klineedittest_LDFLAGS) $(klineedittest_OBJECTS) $(klineedittest_LDADD) $(LIBS)
+	$(CXXLINK) $(klineedittest_OBJECTS) $(klineedittest_LDADD) $(LIBS)
 klistviewtest$(EXEEXT): $(klistviewtest_OBJECTS) $(klistviewtest_DEPENDENCIES) 
 	@rm -f klistviewtest$(EXEEXT)
-	$(CXXLINK) $(klistviewtest_LDFLAGS) $(klistviewtest_OBJECTS) $(klistviewtest_LDADD) $(LIBS)
+	$(CXXLINK) $(klistviewtest_OBJECTS) $(klistviewtest_LDADD) $(LIBS)
 kmainwindowrestoretest$(EXEEXT): $(kmainwindowrestoretest_OBJECTS) $(kmainwindowrestoretest_DEPENDENCIES) 
 	@rm -f kmainwindowrestoretest$(EXEEXT)
-	$(CXXLINK) $(kmainwindowrestoretest_LDFLAGS) $(kmainwindowrestoretest_OBJECTS) $(kmainwindowrestoretest_LDADD) $(LIBS)
+	$(CXXLINK) $(kmainwindowrestoretest_OBJECTS) $(kmainwindowrestoretest_LDADD) $(LIBS)
 kmainwindowtest$(EXEEXT): $(kmainwindowtest_OBJECTS) $(kmainwindowtest_DEPENDENCIES) 
 	@rm -f kmainwindowtest$(EXEEXT)
-	$(CXXLINK) $(kmainwindowtest_LDFLAGS) $(kmainwindowtest_OBJECTS) $(kmainwindowtest_LDADD) $(LIBS)
+	$(CXXLINK) $(kmainwindowtest_OBJECTS) $(kmainwindowtest_LDADD) $(LIBS)
 kmessageboxtest$(EXEEXT): $(kmessageboxtest_OBJECTS) $(kmessageboxtest_DEPENDENCIES) 
 	@rm -f kmessageboxtest$(EXEEXT)
-	$(CXXLINK) $(kmessageboxtest_LDFLAGS) $(kmessageboxtest_OBJECTS) $(kmessageboxtest_LDADD) $(LIBS)
+	$(CXXLINK) $(kmessageboxtest_OBJECTS) $(kmessageboxtest_LDADD) $(LIBS)
 knuminputtest$(EXEEXT): $(knuminputtest_OBJECTS) $(knuminputtest_DEPENDENCIES) 
 	@rm -f knuminputtest$(EXEEXT)
-	$(CXXLINK) $(knuminputtest_LDFLAGS) $(knuminputtest_OBJECTS) $(knuminputtest_LDADD) $(LIBS)
+	$(CXXLINK) $(knuminputtest_OBJECTS) $(knuminputtest_LDADD) $(LIBS)
 kpalettetest$(EXEEXT): $(kpalettetest_OBJECTS) $(kpalettetest_DEPENDENCIES) 
 	@rm -f kpalettetest$(EXEEXT)
-	$(CXXLINK) $(kpalettetest_LDFLAGS) $(kpalettetest_OBJECTS) $(kpalettetest_LDADD) $(LIBS)
+	$(CXXLINK) $(kpalettetest_OBJECTS) $(kpalettetest_LDADD) $(LIBS)
 kpanelmenutest$(EXEEXT): $(kpanelmenutest_OBJECTS) $(kpanelmenutest_DEPENDENCIES) 
 	@rm -f kpanelmenutest$(EXEEXT)
-	$(CXXLINK) $(kpanelmenutest_LDFLAGS) $(kpanelmenutest_OBJECTS) $(kpanelmenutest_LDADD) $(LIBS)
+	$(CXXLINK) $(kpanelmenutest_OBJECTS) $(kpanelmenutest_LDADD) $(LIBS)
 kpixmapregionselectordialogtest$(EXEEXT): $(kpixmapregionselectordialogtest_OBJECTS) $(kpixmapregionselectordialogtest_DEPENDENCIES) 
 	@rm -f kpixmapregionselectordialogtest$(EXEEXT)
-	$(CXXLINK) $(kpixmapregionselectordialogtest_LDFLAGS) $(kpixmapregionselectordialogtest_OBJECTS) $(kpixmapregionselectordialogtest_LDADD) $(LIBS)
+	$(CXXLINK) $(kpixmapregionselectordialogtest_OBJECTS) $(kpixmapregionselectordialogtest_LDADD) $(LIBS)
 kpopuptest$(EXEEXT): $(kpopuptest_OBJECTS) $(kpopuptest_DEPENDENCIES) 
 	@rm -f kpopuptest$(EXEEXT)
-	$(CXXLINK) $(kpopuptest_LDFLAGS) $(kpopuptest_OBJECTS) $(kpopuptest_LDADD) $(LIBS)
+	$(CXXLINK) $(kpopuptest_OBJECTS) $(kpopuptest_LDADD) $(LIBS)
 kprogresstest$(EXEEXT): $(kprogresstest_OBJECTS) $(kprogresstest_DEPENDENCIES) 
 	@rm -f kprogresstest$(EXEEXT)
-	$(CXXLINK) $(kprogresstest_LDFLAGS) $(kprogresstest_OBJECTS) $(kprogresstest_LDADD) $(LIBS)
+	$(CXXLINK) $(kprogresstest_OBJECTS) $(kprogresstest_LDADD) $(LIBS)
 krulertest$(EXEEXT): $(krulertest_OBJECTS) $(krulertest_DEPENDENCIES) 
 	@rm -f krulertest$(EXEEXT)
-	$(CXXLINK) $(krulertest_LDFLAGS) $(krulertest_OBJECTS) $(krulertest_LDADD) $(LIBS)
+	$(CXXLINK) $(krulertest_OBJECTS) $(krulertest_LDADD) $(LIBS)
 kseparatortest$(EXEEXT): $(kseparatortest_OBJECTS) $(kseparatortest_DEPENDENCIES) 
 	@rm -f kseparatortest$(EXEEXT)
-	$(CXXLINK) $(kseparatortest_LDFLAGS) $(kseparatortest_OBJECTS) $(kseparatortest_LDADD) $(LIBS)
+	$(CXXLINK) $(kseparatortest_OBJECTS) $(kseparatortest_LDADD) $(LIBS)
 kspelltest$(EXEEXT): $(kspelltest_OBJECTS) $(kspelltest_DEPENDENCIES) 
 	@rm -f kspelltest$(EXEEXT)
-	$(CXXLINK) $(kspelltest_LDFLAGS) $(kspelltest_OBJECTS) $(kspelltest_LDADD) $(LIBS)
+	$(CXXLINK) $(kspelltest_OBJECTS) $(kspelltest_LDADD) $(LIBS)
 ksqueezedtextlabeltest$(EXEEXT): $(ksqueezedtextlabeltest_OBJECTS) $(ksqueezedtextlabeltest_DEPENDENCIES) 
 	@rm -f ksqueezedtextlabeltest$(EXEEXT)
-	$(CXXLINK) $(ksqueezedtextlabeltest_LDFLAGS) $(ksqueezedtextlabeltest_OBJECTS) $(ksqueezedtextlabeltest_LDADD) $(LIBS)
+	$(CXXLINK) $(ksqueezedtextlabeltest_OBJECTS) $(ksqueezedtextlabeltest_LDADD) $(LIBS)
 kstatusbartest$(EXEEXT): $(kstatusbartest_OBJECTS) $(kstatusbartest_DEPENDENCIES) 
 	@rm -f kstatusbartest$(EXEEXT)
-	$(CXXLINK) $(kstatusbartest_LDFLAGS) $(kstatusbartest_OBJECTS) $(kstatusbartest_LDADD) $(LIBS)
+	$(CXXLINK) $(kstatusbartest_OBJECTS) $(kstatusbartest_LDADD) $(LIBS)
 ksystemtraytest$(EXEEXT): $(ksystemtraytest_OBJECTS) $(ksystemtraytest_DEPENDENCIES) 
 	@rm -f ksystemtraytest$(EXEEXT)
-	$(CXXLINK) $(ksystemtraytest_LDFLAGS) $(ksystemtraytest_OBJECTS) $(ksystemtraytest_LDADD) $(LIBS)
+	$(CXXLINK) $(ksystemtraytest_OBJECTS) $(ksystemtraytest_LDADD) $(LIBS)
 ktabctltest$(EXEEXT): $(ktabctltest_OBJECTS) $(ktabctltest_DEPENDENCIES) 
 	@rm -f ktabctltest$(EXEEXT)
-	$(CXXLINK) $(ktabctltest_LDFLAGS) $(ktabctltest_OBJECTS) $(ktabctltest_LDADD) $(LIBS)
+	$(CXXLINK) $(ktabctltest_OBJECTS) $(ktabctltest_LDADD) $(LIBS)
 ktabwidgettest$(EXEEXT): $(ktabwidgettest_OBJECTS) $(ktabwidgettest_DEPENDENCIES) 
 	@rm -f ktabwidgettest$(EXEEXT)
-	$(CXXLINK) $(ktabwidgettest_LDFLAGS) $(ktabwidgettest_OBJECTS) $(ktabwidgettest_LDADD) $(LIBS)
+	$(CXXLINK) $(ktabwidgettest_OBJECTS) $(ktabwidgettest_LDADD) $(LIBS)
 ktextedittest$(EXEEXT): $(ktextedittest_OBJECTS) $(ktextedittest_DEPENDENCIES) 
 	@rm -f ktextedittest$(EXEEXT)
-	$(CXXLINK) $(ktextedittest_LDFLAGS) $(ktextedittest_OBJECTS) $(ktextedittest_LDADD) $(LIBS)
+	$(CXXLINK) $(ktextedittest_OBJECTS) $(ktextedittest_LDADD) $(LIBS)
 ktimewidgettest$(EXEEXT): $(ktimewidgettest_OBJECTS) $(ktimewidgettest_DEPENDENCIES) 
 	@rm -f ktimewidgettest$(EXEEXT)
-	$(CXXLINK) $(ktimewidgettest_LDFLAGS) $(ktimewidgettest_OBJECTS) $(ktimewidgettest_LDADD) $(LIBS)
+	$(CXXLINK) $(ktimewidgettest_OBJECTS) $(ktimewidgettest_LDADD) $(LIBS)
 ktoolbarlabelactiontest$(EXEEXT): $(ktoolbarlabelactiontest_OBJECTS) $(ktoolbarlabelactiontest_DEPENDENCIES) 
 	@rm -f ktoolbarlabelactiontest$(EXEEXT)
-	$(CXXLINK) $(ktoolbarlabelactiontest_LDFLAGS) $(ktoolbarlabelactiontest_OBJECTS) $(ktoolbarlabelactiontest_LDADD) $(LIBS)
+	$(CXXLINK) $(ktoolbarlabelactiontest_OBJECTS) $(ktoolbarlabelactiontest_LDADD) $(LIBS)
 kunbalancedgrdtest$(EXEEXT): $(kunbalancedgrdtest_OBJECTS) $(kunbalancedgrdtest_DEPENDENCIES) 
 	@rm -f kunbalancedgrdtest$(EXEEXT)
-	$(CXXLINK) $(kunbalancedgrdtest_LDFLAGS) $(kunbalancedgrdtest_OBJECTS) $(kunbalancedgrdtest_LDADD) $(LIBS)
+	$(CXXLINK) $(kunbalancedgrdtest_OBJECTS) $(kunbalancedgrdtest_LDADD) $(LIBS)
 kwindowtest$(EXEEXT): $(kwindowtest_OBJECTS) $(kwindowtest_DEPENDENCIES) 
 	@rm -f kwindowtest$(EXEEXT)
-	$(CXXLINK) $(kwindowtest_LDFLAGS) $(kwindowtest_OBJECTS) $(kwindowtest_LDADD) $(LIBS)
+	$(CXXLINK) $(kwindowtest_OBJECTS) $(kwindowtest_LDADD) $(LIBS)
 kwizardtest$(EXEEXT): $(kwizardtest_OBJECTS) $(kwizardtest_DEPENDENCIES) 
 	@rm -f kwizardtest$(EXEEXT)
-	$(CXXLINK) $(kwizardtest_LDFLAGS) $(kwizardtest_OBJECTS) $(kwizardtest_LDADD) $(LIBS)
+	$(CXXLINK) $(kwizardtest_OBJECTS) $(kwizardtest_LDADD) $(LIBS)
 kwordwraptest$(EXEEXT): $(kwordwraptest_OBJECTS) $(kwordwraptest_DEPENDENCIES) 
 	@rm -f kwordwraptest$(EXEEXT)
-	$(CXXLINK) $(kwordwraptest_LDFLAGS) $(kwordwraptest_OBJECTS) $(kwordwraptest_LDADD) $(LIBS)
+	$(CXXLINK) $(kwordwraptest_OBJECTS) $(kwordwraptest_LDADD) $(LIBS)
 kxmlguitest$(EXEEXT): $(kxmlguitest_OBJECTS) $(kxmlguitest_DEPENDENCIES) 
 	@rm -f kxmlguitest$(EXEEXT)
-	$(CXXLINK) $(kxmlguitest_LDFLAGS) $(kxmlguitest_OBJECTS) $(kxmlguitest_LDADD) $(LIBS)
+	$(CXXLINK) $(kxmlguitest_OBJECTS) $(kxmlguitest_LDADD) $(LIBS)
 qxembedtest$(EXEEXT): $(qxembedtest_OBJECTS) $(qxembedtest_DEPENDENCIES) 
 	@rm -f qxembedtest$(EXEEXT)
-	$(CXXLINK) $(qxembedtest_LDFLAGS) $(qxembedtest_OBJECTS) $(qxembedtest_LDADD) $(LIBS)
+	$(CXXLINK) $(qxembedtest_OBJECTS) $(qxembedtest_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -1300,22 +1189,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/qxembedtest.Po@am__quote@
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -1326,10 +1215,6 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -1379,22 +1264,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -1448,7 +1332,7 @@
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
@@ -1462,12 +1346,20 @@
 
 install-data-am:
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -1488,19 +1380,23 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am
+uninstall-am:
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean \
 	clean-checkPROGRAMS clean-generic clean-libtool ctags \
 	distclean distclean-compile distclean-generic \
 	distclean-libtool distclean-tags distdir dvi dvi-am html \
 	html-am info info-am install install-am install-data \
-	install-data-am install-exec install-exec-am install-info \
-	install-info-am install-man install-strip installcheck \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
 	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-info-am
+	tags uninstall uninstall-am
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- kdelibs-3.5.7.orig/kdeui/kdetrayproxy/Makefile.in
+++ kdelibs-3.5.7/kdeui/kdetrayproxy/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -17,15 +17,11 @@
 
 
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -75,7 +71,14 @@
 kded_kdetrayproxy_la_nofinal_OBJECTS = kdetrayproxy.lo module.lo module_skel.lo
 @KDE_USE_FINAL_FALSE@kded_kdetrayproxy_la_OBJECTS = $(kded_kdetrayproxy_la_nofinal_OBJECTS)
 @KDE_USE_FINAL_TRUE@kded_kdetrayproxy_la_OBJECTS = $(kded_kdetrayproxy_la_final_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+#>- kded_kdetrayproxy_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(kded_kdetrayproxy_la_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+kded_kdetrayproxy_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(kded_kdetrayproxy_la_LDFLAGS) $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -83,19 +86,21 @@
 #>+ 2
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
-#>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+#>+ 3
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
 CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 3
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(kded_kdetrayproxy_la_SOURCES)
 DIST_SOURCES = $(kded_kdetrayproxy_la_SOURCES)
 servicesDATA_INSTALL = $(INSTALL_DATA)
@@ -109,8 +114,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -118,13 +121,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -138,8 +141,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -160,17 +161,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -239,7 +237,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -276,12 +273,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -326,87 +325,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -430,75 +385,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -506,16 +403,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -538,7 +434,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -576,13 +472,13 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
+	test -z "$(kde_moduledir)" || $(MKDIR_P) "$(DESTDIR)$(kde_moduledir)"
 	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
@@ -593,7 +489,7 @@
 
 uninstall-kde_moduleLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
@@ -608,7 +504,7 @@
 	  rm -f "$${dir}/so_locations"; \
 	done
 kded_kdetrayproxy.la: $(kded_kdetrayproxy_la_OBJECTS) $(kded_kdetrayproxy_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(kde_moduledir) $(kded_kdetrayproxy_la_LDFLAGS) $(kded_kdetrayproxy_la_OBJECTS) $(kded_kdetrayproxy_la_LIBADD) $(LIBS)
+	$(kded_kdetrayproxy_la_LINK) -rpath $(kde_moduledir) $(kded_kdetrayproxy_la_OBJECTS) $(kded_kdetrayproxy_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -620,22 +516,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/module.Plo@am__quote@
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -645,13 +541,9 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 install-servicesDATA: $(services_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(servicesdir)" || $(mkdir_p) "$(DESTDIR)$(servicesdir)"
+	test -z "$(servicesdir)" || $(MKDIR_P) "$(DESTDIR)$(servicesdir)"
 	@list='$(services_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -716,22 +608,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -747,7 +638,7 @@
 all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS)
 installdirs:
 	for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(servicesdir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -787,7 +678,7 @@
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
@@ -803,14 +694,22 @@
 #>+ 1
 install-data-am:   install-servicesDATA
 
+install-dvi: install-dvi-am
+
 #>- install-exec-am:
 #>+ 1
 install-exec-am:  install-kde_moduleLTLIBRARIES
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -831,22 +730,24 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-kde_moduleLTLIBRARIES \
-	uninstall-servicesDATA
+uninstall-am: uninstall-kde_moduleLTLIBRARIES uninstall-servicesDATA
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-kde_moduleLTLIBRARIES clean-libtool ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
 	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-exec \
-	install-exec-am install-info install-info-am \
-	install-kde_moduleLTLIBRARIES install-man install-servicesDATA \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am \
+	install-kde_moduleLTLIBRARIES install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-servicesDATA \
 	install-strip installcheck installcheck-am installdirs \
 	maintainer-clean maintainer-clean-generic mostlyclean \
 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
 	pdf pdf-am ps ps-am tags uninstall uninstall-am \
-	uninstall-info-am uninstall-kde_moduleLTLIBRARIES \
-	uninstall-servicesDATA
+	uninstall-kde_moduleLTLIBRARIES uninstall-servicesDATA
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- kdelibs-3.5.7.orig/kdeui/about/Makefile.in
+++ kdelibs-3.5.7/kdeui/about/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -15,15 +15,11 @@
 
 @SET_MAKE@
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -69,8 +65,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -78,13 +72,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -98,8 +92,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -120,17 +112,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -199,7 +188,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -236,12 +224,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -286,87 +276,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -390,75 +336,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -466,16 +354,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -495,7 +382,7 @@
 all: docs-am  all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -533,9 +420,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 mostlyclean-libtool:
@@ -543,13 +430,9 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 install-kde_infopage_dataDATA: $(kde_infopage_data_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(kde_infopage_datadir)" || $(mkdir_p) "$(DESTDIR)$(kde_infopage_datadir)"
+	test -z "$(kde_infopage_datadir)" || $(MKDIR_P) "$(DESTDIR)$(kde_infopage_datadir)"
 	@list='$(kde_infopage_data_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -572,22 +455,21 @@
 
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -603,7 +485,7 @@
 all-am: Makefile $(DATA)
 installdirs:
 	for dir in "$(DESTDIR)$(kde_infopage_datadir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -639,7 +521,7 @@
 
 distclean: distclean-am
 	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool
+distclean-am: clean-am distclean-generic
 
 dvi: dvi-am
 
@@ -653,12 +535,20 @@
 
 install-data-am: install-kde_infopage_dataDATA
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -677,17 +567,21 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-kde_infopage_dataDATA
+uninstall-am: uninstall-kde_infopage_dataDATA
+
+.MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
 	distclean distclean-generic distclean-libtool distdir dvi \
 	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-exec install-exec-am \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
 	install-info install-info-am install-kde_infopage_dataDATA \
-	install-man install-strip installcheck installcheck-am \
+	install-man install-pdf install-pdf-am install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
 	installdirs maintainer-clean maintainer-clean-generic \
 	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
-	ps ps-am uninstall uninstall-am uninstall-info-am \
+	ps ps-am uninstall uninstall-am \
 	uninstall-kde_infopage_dataDATA
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
--- kdelibs-3.5.7.orig/kdeui/colors/Makefile.in
+++ kdelibs-3.5.7/kdeui/colors/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,15 +14,11 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -59,8 +55,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -68,13 +62,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -88,8 +82,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -110,17 +102,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -189,7 +178,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -226,12 +214,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -276,87 +266,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -380,75 +326,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -456,16 +344,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -476,7 +363,7 @@
 all: docs-am  all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -514,9 +401,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 mostlyclean-libtool:
@@ -524,10 +411,6 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 tags: TAGS
 TAGS:
 
@@ -536,22 +419,21 @@
 
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -600,7 +482,7 @@
 
 distclean: distclean-am
 	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool
+distclean-am: clean-am distclean-generic
 
 dvi: dvi-am
 
@@ -614,12 +496,20 @@
 
 install-data-am:
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -638,17 +528,20 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am
+uninstall-am:
+
+.MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
 	distclean distclean-generic distclean-libtool distdir dvi \
 	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-exec install-exec-am \
-	install-info install-info-am install-man install-strip \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
 	installcheck installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
-	uninstall-info-am
+	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
 
 
 messages:
--- kdelibs-3.5.7.orig/kdeui/Makefile.in
+++ kdelibs-3.5.7/kdeui/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -37,15 +37,11 @@
 
 
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -163,14 +159,28 @@
 	ktoolbarlabelaction.lo kmainwindowiface_skel.lo kshortcutdialog_simple.lo kshortcutdialog_advanced.lo kspellui.lo
 @KDE_USE_FINAL_FALSE@libkdeui_la_OBJECTS = $(libkdeui_la_nofinal_OBJECTS)
 @KDE_USE_FINAL_TRUE@libkdeui_la_OBJECTS = $(libkdeui_la_final_OBJECTS)
+#>- libkdeui_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(libkdeui_la_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+libkdeui_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(libkdeui_la_LDFLAGS) $(LDFLAGS) -o $@
 libkspell_la_DEPENDENCIES = libkdeui.la
 am_libkspell_la_OBJECTS = dummy.lo
 #>- libkspell_la_OBJECTS = $(am_libkspell_la_OBJECTS)
 #>+ 1
 libkspell_la_OBJECTS = dummy.lo
+#>- libkspell_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(libkspell_la_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+libkspell_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(libkspell_la_LDFLAGS) $(LDFLAGS) -o $@
 scriptsSCRIPT_INSTALL = $(INSTALL_SCRIPT)
 SCRIPTS = $(scripts_SCRIPTS)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -178,39 +188,45 @@
 #>+ 2
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
-#>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+#>+ 3
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
 CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 3
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(libkdeui_la_SOURCES) $(libkspell_la_SOURCES)
 DIST_SOURCES = $(libkdeui_la_SOURCES) $(libkspell_la_SOURCES)
 #>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 #>- 	html-recursive info-recursive install-data-recursive \
-#>- 	install-exec-recursive install-info-recursive \
-#>- 	install-recursive installcheck-recursive installdirs-recursive \
-#>- 	pdf-recursive ps-recursive uninstall-info-recursive \
-#>- 	uninstall-recursive
-#>+ 6
+#>- 	install-dvi-recursive install-exec-recursive \
+#>- 	install-html-recursive install-info-recursive \
+#>- 	install-pdf-recursive install-ps-recursive install-recursive \
+#>- 	installcheck-recursive installdirs-recursive pdf-recursive \
+#>- 	ps-recursive uninstall-recursive
+#>+ 7
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	html-recursive info-recursive install-data-recursive \
-	install-exec-recursive install-info-recursive \
-	install-recursive installcheck-recursive installdirs-recursive \
-	pdf-recursive ps-recursive uninstall-info-recursive \
-	uninstall-recursive nmcheck-recursive bcheck-recursive
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive nmcheck-recursive bcheck-recursive
 picsDATA_INSTALL = $(INSTALL_DATA)
 rcDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(pics_DATA) $(rc_DATA)
 includeHEADERS_INSTALL = $(INSTALL_HEADER)
 HEADERS = $(include_HEADERS) $(noinst_HEADERS)
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
@@ -220,8 +236,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -229,13 +243,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -249,8 +263,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -271,17 +283,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -350,7 +359,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -387,12 +395,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -437,87 +447,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -541,75 +507,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -617,16 +525,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -639,13 +546,9 @@
 # into $(all_libraries) isn't better
 AM_LDFLAGS = $(LDFLAGS_AS_NEEDED) $(LDFLAGS_NEW_DTAGS)
 lib_LTLIBRARIES = libkdeui.la libkspell.la
-#>- libkdeui_la_LDFLAGS = $(KDE_MT_LDFLAGS) -no-undefined -version-info 6:0:2
-#>+ 1
-libkdeui_la_LDFLAGS = $(KDE_MT_LDFLAGS) -no-undefined $(KDE_NO_UNDEFINED) -version-info 6:0:2
+libkdeui_la_LDFLAGS = $(KDE_MT_LDFLAGS) -no-undefined -version-info 6:0:2
 libkdeui_la_LIBADD = ../kdecore/libkdecore.la
-#>- libkspell_la_LDFLAGS = $(KDE_MT_LDFLAGS) -version-info 6:0:2 -no-undefined
-#>+ 1
-libkspell_la_LDFLAGS = $(KDE_MT_LDFLAGS) -version-info 6:0:2 -no-undefined $(KDE_NO_UNDEFINED)
+libkspell_la_LDFLAGS = $(KDE_MT_LDFLAGS) -version-info 6:0:2 -no-undefined
 libkspell_la_LIBADD = libkdeui.la
 libkspell_la_SOURCES = dummy.cpp
 picsdir = $(kde_datadir)/kdeui/pics
@@ -808,7 +711,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(srcdir)/../admin/Doxyfile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../admin/Doxyfile.am $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -846,13 +749,13 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
@@ -863,7 +766,7 @@
 
 uninstall-libLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
@@ -877,22 +780,13 @@
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
-#>- libkdeui.la: $(libkdeui_la_OBJECTS) $(libkdeui_la_DEPENDENCIES) 
-#>+ 2
-@KDE_USE_CLOSURE_TRUE@libkdeui.la: libkdeui.la.closure $(libkdeui_la_OBJECTS) $(libkdeui_la_DEPENDENCIES) 
-@KDE_USE_CLOSURE_FALSE@libkdeui.la: $(libkdeui_la_OBJECTS) $(libkdeui_la_DEPENDENCIES) 
-#>- 	$(CXXLINK) -rpath $(libdir) $(libkdeui_la_LDFLAGS) $(libkdeui_la_OBJECTS) $(libkdeui_la_LIBADD) $(LIBS)
-#>+ 2
-	$(CXXLINK) -rpath $(libdir) $(libkdeui_la_LDFLAGS) $(libkdeui_la_OBJECTS) $(libkdeui_la_LIBADD) $(LIBS)
-@KDE_USE_NMCHECK_TRUE@	@$(MAKE) $(AM_MAKEFLAGS) nmcheck_libkdeui.la || ( rm -f libkdeui.la; exit 1 )
-#>- libkspell.la: $(libkspell_la_OBJECTS) $(libkspell_la_DEPENDENCIES) 
-#>+ 2
-@KDE_USE_CLOSURE_TRUE@libkspell.la: libkspell.la.closure $(libkspell_la_OBJECTS) $(libkspell_la_DEPENDENCIES) 
-@KDE_USE_CLOSURE_FALSE@libkspell.la: $(libkspell_la_OBJECTS) $(libkspell_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(libdir) $(libkspell_la_LDFLAGS) $(libkspell_la_OBJECTS) $(libkspell_la_LIBADD) $(LIBS)
+libkdeui.la: $(libkdeui_la_OBJECTS) $(libkdeui_la_DEPENDENCIES) 
+	$(libkdeui_la_LINK) -rpath $(libdir) $(libkdeui_la_OBJECTS) $(libkdeui_la_LIBADD) $(LIBS)
+libkspell.la: $(libkspell_la_OBJECTS) $(libkspell_la_DEPENDENCIES) 
+	$(libkspell_la_LINK) -rpath $(libdir) $(libkspell_la_OBJECTS) $(libkspell_la_LIBADD) $(LIBS)
 install-scriptsSCRIPTS: $(scripts_SCRIPTS)
 	@$(NORMAL_INSTALL)
-	test -z "$(scriptsdir)" || $(mkdir_p) "$(DESTDIR)$(scriptsdir)"
+	test -z "$(scriptsdir)" || $(MKDIR_P) "$(DESTDIR)$(scriptsdir)"
 	@list='$(scripts_SCRIPTS)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  if test -f $$d$$p; then \
@@ -1037,22 +931,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/qxembed.Plo@am__quote@
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -1062,13 +956,9 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 install-picsDATA: $(pics_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(picsdir)" || $(mkdir_p) "$(DESTDIR)$(picsdir)"
+	test -z "$(picsdir)" || $(MKDIR_P) "$(DESTDIR)$(picsdir)"
 	@list='$(pics_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -1085,7 +975,7 @@
 	done
 install-rcDATA: $(rc_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(rcdir)" || $(mkdir_p) "$(DESTDIR)$(rcdir)"
+	test -z "$(rcdir)" || $(MKDIR_P) "$(DESTDIR)$(rcdir)"
 	@list='$(rc_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -1102,7 +992,7 @@
 	done
 install-includeHEADERS: $(include_HEADERS)
 	@$(NORMAL_INSTALL)
-	test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"
+	test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)"
 	@list='$(include_HEADERS)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -1149,8 +1039,7 @@
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
+$(RECURSIVE_CLEAN_TARGETS):
 	@failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
@@ -1251,23 +1140,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	$(mkdir_p) $(distdir)/../admin
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -1281,7 +1168,7 @@
 	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
-	    || $(mkdir_p) "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 	    || exit 1; \
 	    distdir=`$(am__cd) $(distdir) && pwd`; \
 	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
@@ -1289,6 +1176,8 @@
 	      $(MAKE) $(AM_MAKEFLAGS) \
 	        top_distdir="$$top_distdir" \
 	        distdir="$$distdir/$$subdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -1299,7 +1188,7 @@
 installdirs: installdirs-recursive
 installdirs-am:
 	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(scriptsdir)" "$(DESTDIR)$(picsdir)" "$(DESTDIR)$(rcdir)" "$(DESTDIR)$(includedir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-recursive
 install-exec: install-exec-recursive
@@ -1332,14 +1221,14 @@
 #>- clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
 #>- 	mostlyclean-am
 #>+ 2
-clean-am: clean-metasources clean-idl clean-ui clean-closures clean-bcheck clean-final  clean-generic clean-libLTLIBRARIES clean-libtool \
+clean-am: clean-metasources clean-idl clean-ui clean-bcheck clean-final  clean-generic clean-libLTLIBRARIES clean-libtool \
 	mostlyclean-am
 
 distclean: distclean-recursive
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-recursive
 
@@ -1354,12 +1243,20 @@
 install-data-am: install-data-local install-includeHEADERS \
 	install-picsDATA install-rcDATA install-scriptsSCRIPTS
 
+install-dvi: install-dvi-recursive
+
 install-exec-am: install-libLTLIBRARIES
 
+install-html: install-html-recursive
+
 install-info: install-info-recursive
 
 install-man:
 
+install-pdf: install-pdf-recursive
+
+install-ps: install-ps-recursive
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
@@ -1380,30 +1277,32 @@
 
 ps-am:
 
-uninstall-am: uninstall-includeHEADERS uninstall-info-am \
-	uninstall-libLTLIBRARIES uninstall-local uninstall-picsDATA \
-	uninstall-rcDATA uninstall-scriptsSCRIPTS
-
-uninstall-info: uninstall-info-recursive
-
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-	clean clean-generic clean-libLTLIBRARIES clean-libtool \
-	clean-recursive ctags ctags-recursive distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-recursive distclean-tags distdir dvi dvi-am html \
+uninstall-am: uninstall-includeHEADERS uninstall-libLTLIBRARIES \
+	uninstall-local uninstall-picsDATA uninstall-rcDATA \
+	uninstall-scriptsSCRIPTS
+
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+	install-strip
+
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+	all all-am check check-am clean clean-generic \
+	clean-libLTLIBRARIES clean-libtool ctags ctags-recursive \
+	distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
 	html-am info info-am install install-am install-data \
-	install-data-am install-data-local install-exec \
-	install-exec-am install-includeHEADERS install-info \
-	install-info-am install-libLTLIBRARIES install-man \
-	install-picsDATA install-rcDATA install-scriptsSCRIPTS \
-	install-strip installcheck installcheck-am installdirs \
-	installdirs-am maintainer-clean maintainer-clean-generic \
-	maintainer-clean-recursive mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
-	pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
-	uninstall-includeHEADERS uninstall-info-am \
-	uninstall-libLTLIBRARIES uninstall-local uninstall-picsDATA \
-	uninstall-rcDATA uninstall-scriptsSCRIPTS
+	install-data-am install-data-local install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-includeHEADERS install-info install-info-am \
+	install-libLTLIBRARIES install-man install-pdf install-pdf-am \
+	install-picsDATA install-ps install-ps-am install-rcDATA \
+	install-scriptsSCRIPTS install-strip installcheck \
+	installcheck-am installdirs installdirs-am maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags tags-recursive uninstall uninstall-am \
+	uninstall-includeHEADERS uninstall-libLTLIBRARIES \
+	uninstall-local uninstall-picsDATA uninstall-rcDATA \
+	uninstall-scriptsSCRIPTS
 
 
 .PHONY: kdepackages
@@ -1530,15 +1429,6 @@
 kmainwindowiface_skel.cpp: kmainwindowiface.kidl
 	$(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub kmainwindowiface.kidl
 
-#>+ 8
-libkdeui.la.closure: $(libkdeui_la_OBJECTS) $(libkdeui_la_DEPENDENCIES)
-	@echo "int main() {return 0;}" > libkdeui_la_closure.cpp
-	@$(LTCXXCOMPILE) -c libkdeui_la_closure.cpp
-	$(CXXLINK) libkdeui_la_closure.lo $(libkdeui_la_LDFLAGS) $(libkdeui_la_OBJECTS) $(libkdeui_la_LIBADD) $(LIBS)
-	@rm -f libkdeui_la_closure.* libkdeui.la.closure
-	@echo "timestamp" > libkdeui.la.closure
-
-
 #>+ 5
 
 nmcheck_libkdeui.la: libkdeui.la 
@@ -2287,15 +2177,6 @@
 #>+ 2
 mocs: knumvalidator.moc
 
-#>+ 8
-libkspell.la.closure: $(libkspell_la_OBJECTS) $(libkspell_la_DEPENDENCIES)
-	@echo "int main() {return 0;}" > libkspell_la_closure.cpp
-	@$(LTCXXCOMPILE) -c libkspell_la_closure.cpp
-	$(CXXLINK) libkspell_la_closure.lo $(libkspell_la_LDFLAGS) $(libkspell_la_OBJECTS) $(libkspell_la_LIBADD) $(LIBS)
-	@rm -f libkspell_la_closure.* libkspell.la.closure
-	@echo "timestamp" > libkspell.la.closure
-
-
 #>+ 3
 clean-metasources:
 	-rm -f  kcommand.moc kruler.moc kcompletionbox.moc kauthicon.moc knuminput.moc kactionclasses.moc kshortcutdialog.moc ksyntaxhighlighter.moc kdialogbase.moc kxmlguifactory.moc klistviewlineedit.moc kbuttonbox.moc klistbox.moc kcombobox.moc kscrollview.moc krootpixmap.moc ktabbar.moc ksystemtray.moc klistview.moc kpassdlg.moc klineeditdlg.moc kwizard.moc kpopupmenu.moc kkeybutton.moc kprogress.moc kmainwindow.moc kcharselect.moc kpixmapregionselectorwidget.moc ktabwidget.moc kdialog.moc kactioncollection.moc ktoolbarhandler.moc kaction.moc kiconviewsearchline.moc kspell.moc ktextbrowser.moc khelpmenu.moc kdatepicker.moc ktoolbarradiogroup.moc kdatewidget.moc kaboutdialog_private.moc ktoolbar.moc kanimwidget.moc kcmodule.moc kfontrequester.moc ktimewidget.moc kdockwidget.moc klistviewsearchline.moc klanguagebutton.moc kstatusbar.moc kdockwindow.moc kpanelmenu.moc kcmenumngr.moc kfontdialog.moc krestrictedline.moc kled.moc kurllabel.moc ktoolbarbutton.moc kspelldlg.moc kdatetimewidget.moc ksharedpixmap.moc kinputdialog.moc kcolorbutton.moc kedittoolbar.moc kpushbutton.moc ktimezonewidget.moc kbugreport.moc klineedit.moc kkeydialog.moc kdualcolorbutton.moc karrowbutton.moc ksqueezedtextlabel.moc kwindowinfo.moc ksplashscreen.moc kaboutdialog.moc kcolorcombo.moc kdatetbl.moc kcolordrag.moc kactionselector.moc ktip.moc kpassivepopup.moc kstringvalidator.moc ktabctl.moc kjanuswidget.moc ktextedit.moc kpanelapplet.moc kseparator.moc ksconfig.moc kpanelappmenu.moc kcursor_private.moc kselect.moc kwindowlistmenu.moc kdockwidget_private.moc keditcl.moc kfontcombo.moc kcolordialog.moc kwhatsthismanager_p.moc kactivelabel.moc kconfigdialog.moc kdialogbase_priv.moc kpanelextension.moc qxembed.moc kiconview.moc keditlistbox.moc kmenubar.moc knumvalidator.moc
@@ -2315,10 +2196,6 @@
 	kshortcutdialog_advanced.cpp kshortcutdialog_advanced.h kshortcutdialog_advanced.moc \
 	kspellui.cpp kspellui.h kspellui.moc 
 
-#>+ 3
-clean-closures:
-	-rm -f  libkdeui.la.closure libkspell.la.closure
-
 #>+ 2
 docs-am:
 
--- kdelibs-3.5.7.orig/dcop/tests/Makefile.in
+++ kdelibs-3.5.7/dcop/tests/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,15 +14,11 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -61,6 +57,13 @@
 @KDE_USE_FINAL_TRUE@dcop_test_OBJECTS = $(dcop_test_final_OBJECTS)
 am__DEPENDENCIES_1 =
 dcop_test_DEPENDENCIES = $(am__DEPENDENCIES_1)
+#>- dcop_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(dcop_test_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+dcop_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(dcop_test_LDFLAGS) $(LDFLAGS) -o $@
 am_driver_OBJECTS = driver.$(OBJEXT)
 #>- driver_OBJECTS = $(am_driver_OBJECTS)
 #>+ 4
@@ -69,7 +72,14 @@
 @KDE_USE_FINAL_FALSE@driver_OBJECTS = $(driver_nofinal_OBJECTS)
 @KDE_USE_FINAL_TRUE@driver_OBJECTS = $(driver_final_OBJECTS)
 driver_DEPENDENCIES = $(am__DEPENDENCIES_1)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+#>- driver_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
+#>- 	$(driver_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+driver_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
+	$(driver_LDFLAGS) $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -77,19 +87,21 @@
 #>+ 2
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
-#>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+#>+ 3
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
 CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 3
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(dcop_test_SOURCES) $(driver_SOURCES)
 DIST_SOURCES = $(dcop_test_SOURCES) $(driver_SOURCES)
 ETAGS = etags
@@ -100,8 +112,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -109,13 +119,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -129,8 +139,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -151,17 +159,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -230,7 +235,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -267,12 +271,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -317,87 +323,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -421,75 +383,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -497,16 +401,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -534,7 +437,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -572,9 +475,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 clean-checkPROGRAMS:
@@ -585,10 +488,10 @@
 	done
 dcop_test$(EXEEXT): $(dcop_test_OBJECTS) $(dcop_test_DEPENDENCIES) 
 	@rm -f dcop_test$(EXEEXT)
-	$(CXXLINK) $(dcop_test_LDFLAGS) $(dcop_test_OBJECTS) $(dcop_test_LDADD) $(LIBS)
+	$(dcop_test_LINK) $(dcop_test_OBJECTS) $(dcop_test_LDADD) $(LIBS)
 driver$(EXEEXT): $(driver_OBJECTS) $(driver_DEPENDENCIES) 
 	@rm -f driver$(EXEEXT)
-	$(CXXLINK) $(driver_LDFLAGS) $(driver_OBJECTS) $(driver_LDADD) $(LIBS)
+	$(driver_LINK) $(driver_OBJECTS) $(driver_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -600,22 +503,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test.Po@am__quote@
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -626,10 +529,6 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -679,22 +578,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -753,7 +651,7 @@
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
@@ -767,12 +665,20 @@
 
 install-data-am:
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -793,19 +699,23 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am
+uninstall-am:
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am check-local clean \
 	clean-checkPROGRAMS clean-generic clean-libtool ctags \
 	distclean distclean-compile distclean-generic \
 	distclean-libtool distclean-tags distdir dvi dvi-am html \
 	html-am info info-am install install-am install-data \
-	install-data-am install-exec install-exec-am install-info \
-	install-info-am install-man install-strip installcheck \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
 	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-info-am
+	tags uninstall uninstall-am
 
 
 nothing:
--- kdelibs-3.5.7.orig/dcop/client/Makefile.in
+++ kdelibs-3.5.7/dcop/client/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -15,15 +15,11 @@
 
 @SET_MAKE@
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -63,8 +59,14 @@
 #>+ 1
 dcop_OBJECTS = dcop.$(OBJEXT)
 am__DEPENDENCIES_1 =
-am__DEPENDENCIES_2 = ../libDCOP.la
-dcop_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2)
+dcop_DEPENDENCIES = $(am__DEPENDENCIES_1) $(DCOP_LIB)
+#>- dcop_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
+#>- 	$(dcop_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+dcop_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
+	$(dcop_LDFLAGS) $(LDFLAGS) -o $@
 am_dcopclient_OBJECTS = dcopclient.$(OBJEXT)
 #>- dcopclient_OBJECTS = $(am_dcopclient_OBJECTS)
 #>+ 1
@@ -74,7 +76,14 @@
 #>- dcopfind_OBJECTS = $(am_dcopfind_OBJECTS)
 #>+ 1
 dcopfind_OBJECTS = dcopfind.$(OBJEXT)
-dcopfind_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2)
+dcopfind_DEPENDENCIES = $(am__DEPENDENCIES_1) $(DCOP_LIB)
+#>- dcopfind_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(dcopfind_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+dcopfind_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(dcopfind_LDFLAGS) $(LDFLAGS) -o $@
 am_dcopobject_OBJECTS = dcopobject.$(OBJEXT)
 #>- dcopobject_OBJECTS = $(am_dcopobject_OBJECTS)
 #>+ 1
@@ -84,7 +93,14 @@
 #>- dcopquit_OBJECTS = $(am_dcopquit_OBJECTS)
 #>+ 1
 dcopquit_OBJECTS = dcopquit.$(OBJEXT)
-dcopquit_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2)
+dcopquit_DEPENDENCIES = $(am__DEPENDENCIES_1) $(DCOP_LIB)
+#>- dcopquit_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(dcopquit_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+dcopquit_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(dcopquit_LDFLAGS) $(LDFLAGS) -o $@
 am_dcopref_OBJECTS = dcopref.$(OBJEXT)
 #>- dcopref_OBJECTS = $(am_dcopref_OBJECTS)
 #>+ 1
@@ -94,36 +110,46 @@
 #>- dcopstart_OBJECTS = $(am_dcopstart_OBJECTS)
 #>+ 1
 dcopstart_OBJECTS = dcopstart.$(OBJEXT)
-dcopstart_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+dcopstart_DEPENDENCIES = $(am__DEPENDENCIES_1) $(DCOP_LIB)
+#>- dcopstart_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(dcopstart_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+dcopstart_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(dcopstart_LDFLAGS) $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 #>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 #>+ 2
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
-#>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+#>+ 3
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
 CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 3
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(dcop_SOURCES) $(dcopclient_SOURCES) $(dcopfind_SOURCES) \
 	$(dcopobject_SOURCES) $(dcopquit_SOURCES) $(dcopref_SOURCES) \
 	$(dcopstart_SOURCES)
@@ -138,8 +164,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -147,13 +171,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -167,8 +191,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -189,17 +211,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -268,7 +287,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -305,12 +323,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -355,87 +375,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -459,75 +435,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -535,16 +453,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -574,7 +491,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .c .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -612,13 +529,13 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
+	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
 	  if test -f $$p \
@@ -646,25 +563,25 @@
 	done
 dcop$(EXEEXT): $(dcop_OBJECTS) $(dcop_DEPENDENCIES) 
 	@rm -f dcop$(EXEEXT)
-	$(CXXLINK) $(dcop_LDFLAGS) $(dcop_OBJECTS) $(dcop_LDADD) $(LIBS)
+	$(dcop_LINK) $(dcop_OBJECTS) $(dcop_LDADD) $(LIBS)
 dcopclient$(EXEEXT): $(dcopclient_OBJECTS) $(dcopclient_DEPENDENCIES) 
 	@rm -f dcopclient$(EXEEXT)
-	$(LINK) $(dcopclient_LDFLAGS) $(dcopclient_OBJECTS) $(dcopclient_LDADD) $(LIBS)
+	$(LINK) $(dcopclient_OBJECTS) $(dcopclient_LDADD) $(LIBS)
 dcopfind$(EXEEXT): $(dcopfind_OBJECTS) $(dcopfind_DEPENDENCIES) 
 	@rm -f dcopfind$(EXEEXT)
-	$(CXXLINK) $(dcopfind_LDFLAGS) $(dcopfind_OBJECTS) $(dcopfind_LDADD) $(LIBS)
+	$(dcopfind_LINK) $(dcopfind_OBJECTS) $(dcopfind_LDADD) $(LIBS)
 dcopobject$(EXEEXT): $(dcopobject_OBJECTS) $(dcopobject_DEPENDENCIES) 
 	@rm -f dcopobject$(EXEEXT)
-	$(LINK) $(dcopobject_LDFLAGS) $(dcopobject_OBJECTS) $(dcopobject_LDADD) $(LIBS)
+	$(LINK) $(dcopobject_OBJECTS) $(dcopobject_LDADD) $(LIBS)
 dcopquit$(EXEEXT): $(dcopquit_OBJECTS) $(dcopquit_DEPENDENCIES) 
 	@rm -f dcopquit$(EXEEXT)
-	$(CXXLINK) $(dcopquit_LDFLAGS) $(dcopquit_OBJECTS) $(dcopquit_LDADD) $(LIBS)
+	$(dcopquit_LINK) $(dcopquit_OBJECTS) $(dcopquit_LDADD) $(LIBS)
 dcopref$(EXEEXT): $(dcopref_OBJECTS) $(dcopref_DEPENDENCIES) 
 	@rm -f dcopref$(EXEEXT)
-	$(LINK) $(dcopref_LDFLAGS) $(dcopref_OBJECTS) $(dcopref_LDADD) $(LIBS)
+	$(LINK) $(dcopref_OBJECTS) $(dcopref_LDADD) $(LIBS)
 dcopstart$(EXEEXT): $(dcopstart_OBJECTS) $(dcopstart_DEPENDENCIES) 
 	@rm -f dcopstart$(EXEEXT)
-	$(CXXLINK) $(dcopstart_LDFLAGS) $(dcopstart_OBJECTS) $(dcopstart_LDADD) $(LIBS)
+	$(dcopstart_LINK) $(dcopstart_OBJECTS) $(dcopstart_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -681,43 +598,43 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dcopstart.Po@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -728,10 +645,6 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -781,22 +694,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -812,7 +724,7 @@
 all-am: Makefile $(PROGRAMS)
 installdirs:
 	for dir in "$(DESTDIR)$(bindir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -850,7 +762,7 @@
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
@@ -864,12 +776,20 @@
 
 install-data-am:
 
+install-dvi: install-dvi-am
+
 install-exec-am: install-binPROGRAMS
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -890,19 +810,23 @@
 
 ps-am:
 
-uninstall-am: uninstall-binPROGRAMS uninstall-info-am
+uninstall-am: uninstall-binPROGRAMS
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
 	clean-generic clean-libtool ctags distclean distclean-compile \
 	distclean-generic distclean-libtool distclean-tags distdir dvi \
 	dvi-am html html-am info info-am install install-am \
-	install-binPROGRAMS install-data install-data-am install-exec \
-	install-exec-am install-info install-info-am install-man \
+	install-binPROGRAMS install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
 	install-strip installcheck installcheck-am installdirs \
 	maintainer-clean maintainer-clean-generic mostlyclean \
 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
 	pdf pdf-am ps ps-am tags uninstall uninstall-am \
-	uninstall-binPROGRAMS uninstall-info-am
+	uninstall-binPROGRAMS
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- kdelibs-3.5.7.orig/dcop/KDE-ICE/Makefile.in
+++ kdelibs-3.5.7/dcop/KDE-ICE/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,15 +16,11 @@
 @SET_MAKE@
 
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -69,17 +65,18 @@
 	setauth.lo shutdown.lo watch.lo transport.lo globals.lo
 @KDE_USE_FINAL_FALSE@libkICE_la_OBJECTS = $(libkICE_la_nofinal_OBJECTS)
 @KDE_USE_FINAL_TRUE@libkICE_la_OBJECTS = $(libkICE_la_final_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(libkICE_la_SOURCES)
 DIST_SOURCES = $(libkICE_la_SOURCES)
 HEADERS = $(noinst_HEADERS)
@@ -91,8 +88,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -100,13 +95,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -120,8 +115,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -142,17 +135,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -221,7 +211,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -258,12 +247,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -308,87 +299,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -412,75 +359,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -488,16 +377,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -545,7 +433,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -583,9 +471,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 clean-noinstLTLIBRARIES:
@@ -597,7 +485,7 @@
 	  rm -f "$${dir}/so_locations"; \
 	done
 libkICE.la: $(libkICE_la_OBJECTS) $(libkICE_la_DEPENDENCIES) 
-	$(LINK)  $(libkICE_la_LDFLAGS) $(libkICE_la_OBJECTS) $(libkICE_la_LIBADD) $(LIBS)
+	$(LINK)  $(libkICE_la_OBJECTS) $(libkICE_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -627,22 +515,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/watch.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
@@ -653,10 +541,6 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -706,22 +590,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -774,7 +657,7 @@
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
@@ -788,12 +671,20 @@
 
 install-data-am:
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -814,19 +705,22 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am
+uninstall-am:
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-libtool clean-noinstLTLIBRARIES ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
 	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-exec \
-	install-exec-am install-info install-info-am install-man \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
 	install-strip installcheck installcheck-am installdirs \
 	maintainer-clean maintainer-clean-generic mostlyclean \
 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-	pdf pdf-am ps ps-am tags uninstall uninstall-am \
-	uninstall-info-am
+	pdf pdf-am ps ps-am tags uninstall uninstall-am
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- kdelibs-3.5.7.orig/dcop/Makefile.in
+++ kdelibs-3.5.7/dcop/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -40,15 +40,11 @@
 
 
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -101,6 +97,13 @@
 #>- dcopserver_la_OBJECTS = $(am_dcopserver_la_OBJECTS)
 #>+ 1
 dcopserver_la_OBJECTS = dcopserver_dummy.lo
+#>- dcopserver_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(dcopserver_la_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+dcopserver_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(dcopserver_la_LDFLAGS) $(LDFLAGS) -o $@
 am__DEPENDENCIES_1 =
 libDCOP_la_DEPENDENCIES = KDE-ICE/libkICE.la $(am__DEPENDENCIES_1)
 am_libDCOP_la_OBJECTS = dcopstub.lo dcopref.lo dcopobject.lo \
@@ -112,6 +115,13 @@
 	dcopclient.lo
 @KDE_USE_FINAL_FALSE@libDCOP_la_OBJECTS = $(libDCOP_la_nofinal_OBJECTS)
 @KDE_USE_FINAL_TRUE@libDCOP_la_OBJECTS = $(libDCOP_la_final_OBJECTS)
+#>- libDCOP_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(libDCOP_la_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+libDCOP_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(libDCOP_la_LDFLAGS) $(LDFLAGS) -o $@
 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 #>- PROGRAMS = $(bin_PROGRAMS)
 #>+ 2
@@ -122,6 +132,13 @@
 #>+ 1
 dcop_deadlock_test_OBJECTS = dcop_deadlock_test.$(OBJEXT)
 dcop_deadlock_test_DEPENDENCIES = ../kdecore/libkdecore.la
+#>- dcop_deadlock_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(dcop_deadlock_test_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+dcop_deadlock_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(dcop_deadlock_test_LDFLAGS) $(LDFLAGS) -o $@
 am_dcopserver_shutdown_OBJECTS = dcopserver_shutdown.$(OBJEXT)
 #>- dcopserver_shutdown_OBJECTS = $(am_dcopserver_shutdown_OBJECTS)
 #>+ 1
@@ -132,6 +149,13 @@
 #>+ 1
 testdcop_OBJECTS = testdcop.$(OBJEXT)
 testdcop_DEPENDENCIES = libDCOP.la
+#>- testdcop_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(testdcop_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+testdcop_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(testdcop_LDFLAGS) $(LDFLAGS) -o $@
 am_testdcopc_OBJECTS = testdcopc.$(OBJEXT) dcopc.$(OBJEXT)
 #>- testdcopc_OBJECTS = $(am_testdcopc_OBJECTS)
 #>+ 4
@@ -140,35 +164,41 @@
 @KDE_USE_FINAL_FALSE@testdcopc_OBJECTS = $(testdcopc_nofinal_OBJECTS)
 @KDE_USE_FINAL_TRUE@testdcopc_OBJECTS = $(testdcopc_final_OBJECTS)
 testdcopc_DEPENDENCIES = KDE-ICE/libkICE.la $(am__DEPENDENCIES_1)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I. -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+testdcopc_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(testdcopc_LDFLAGS) $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 #>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 #>+ 2
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 #>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
 CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 3
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 #>- SOURCES = $(dcopserver_la_SOURCES) $(libDCOP_la_SOURCES) \
 #>- 	$(dcop_deadlock_test_SOURCES) $(dcopserver_shutdown_SOURCES) \
 #>- 	$(testdcop_SOURCES) $(testdcopc_SOURCES)
@@ -185,19 +215,23 @@
 	$(testdcop_SOURCES) $(testdcopc_SOURCES) $(dcopserver_SOURCES) 
 #>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 #>- 	html-recursive info-recursive install-data-recursive \
-#>- 	install-exec-recursive install-info-recursive \
-#>- 	install-recursive installcheck-recursive installdirs-recursive \
-#>- 	pdf-recursive ps-recursive uninstall-info-recursive \
-#>- 	uninstall-recursive
-#>+ 6
+#>- 	install-dvi-recursive install-exec-recursive \
+#>- 	install-html-recursive install-info-recursive \
+#>- 	install-pdf-recursive install-ps-recursive install-recursive \
+#>- 	installcheck-recursive installdirs-recursive pdf-recursive \
+#>- 	ps-recursive uninstall-recursive
+#>+ 7
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	html-recursive info-recursive install-data-recursive \
-	install-exec-recursive install-info-recursive \
-	install-recursive installcheck-recursive installdirs-recursive \
-	pdf-recursive ps-recursive uninstall-info-recursive \
-	uninstall-recursive nmcheck-recursive bcheck-recursive
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive nmcheck-recursive bcheck-recursive
 includeHEADERS_INSTALL = $(INSTALL_HEADER)
 HEADERS = $(include_HEADERS) $(noinst_HEADERS)
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
@@ -207,8 +241,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -216,13 +248,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -236,8 +268,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -258,17 +288,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -337,7 +364,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -374,12 +400,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -424,87 +452,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -528,75 +512,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -604,16 +530,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -626,9 +551,7 @@
 #>+ 1
 lib_LTLIBRARIES = libDCOP.la   libkdeinit_dcopserver.la
 libDCOP_la_LIBADD = KDE-ICE/libkICE.la $(LIB_QT)
-#>- libDCOP_la_LDFLAGS = $(KDE_RPATH) -version-info 6:0:2 -no-undefined $(all_libraries)
-#>+ 1
-libDCOP_la_LDFLAGS = $(KDE_RPATH) -version-info 6:0:2 -no-undefined $(KDE_NO_UNDEFINED) $(all_libraries)
+libDCOP_la_LDFLAGS = $(KDE_RPATH) -version-info 6:0:2 -no-undefined $(all_libraries)
 libDCOP_la_NMCHECK = $(srcdir)/libDCOP.nmcheck
 libDCOP_la_NMCHECKWEAK = $(srcdir)/libDCOP_weak.nmcheck $(top_srcdir)/kdecore/libqt-mt_weak.nmcheck
 include_HEADERS = dcopclient.h dcopobject.h dcopstub.h dcopref.h dcoptypes.h kdatastream.h
@@ -663,7 +586,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .c .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(srcdir)/../admin/Doxyfile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../admin/Doxyfile.am $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -701,21 +624,21 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 dcop-path.h: stamp-h2
 	@if test ! -f $@; then \
 	  rm -f stamp-h2; \
-	  $(MAKE) stamp-h2; \
+	  $(MAKE) $(AM_MAKEFLAGS) stamp-h2; \
 	else :; fi
 
 stamp-h2: $(srcdir)/dcop-path.h.in $(top_builddir)/config.status
 	@rm -f stamp-h2
 	cd $(top_builddir) && $(SHELL) ./config.status dcop/dcop-path.h
-$(srcdir)/dcop-path.h.in:  $(am__configure_deps) 
+$(srcdir)/dcop-path.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) 
 	cd $(top_srcdir) && $(AUTOHEADER)
 	rm -f stamp-h2
 	touch $@
@@ -724,7 +647,7 @@
 	-rm -f dcop-path.h stamp-h2
 install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(kdeinitdir)" || $(mkdir_p) "$(DESTDIR)$(kdeinitdir)"
+	test -z "$(kdeinitdir)" || $(MKDIR_P) "$(DESTDIR)$(kdeinitdir)"
 	@list='$(kdeinit_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
@@ -735,7 +658,7 @@
 
 uninstall-kdeinitLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@set -x; list='$(kdeinit_LTLIBRARIES)'; for p in $$list; do \
+	@list='$(kdeinit_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kdeinitdir)/$$p'"; \
 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kdeinitdir)/$$p"; \
@@ -751,7 +674,7 @@
 	done
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
@@ -762,7 +685,7 @@
 
 uninstall-libLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
@@ -777,18 +700,12 @@
 	  rm -f "$${dir}/so_locations"; \
 	done
 dcopserver.la: $(dcopserver_la_OBJECTS) $(dcopserver_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(kdeinitdir) $(dcopserver_la_LDFLAGS) $(dcopserver_la_OBJECTS) $(dcopserver_la_LIBADD) $(LIBS)
-#>- libDCOP.la: $(libDCOP_la_OBJECTS) $(libDCOP_la_DEPENDENCIES) 
-#>+ 2
-@KDE_USE_CLOSURE_TRUE@libDCOP.la: libDCOP.la.closure $(libDCOP_la_OBJECTS) $(libDCOP_la_DEPENDENCIES) 
-@KDE_USE_CLOSURE_FALSE@libDCOP.la: $(libDCOP_la_OBJECTS) $(libDCOP_la_DEPENDENCIES) 
-#>- 	$(CXXLINK) -rpath $(libdir) $(libDCOP_la_LDFLAGS) $(libDCOP_la_OBJECTS) $(libDCOP_la_LIBADD) $(LIBS)
-#>+ 2
-	$(CXXLINK) -rpath $(libdir) $(libDCOP_la_LDFLAGS) $(libDCOP_la_OBJECTS) $(libDCOP_la_LIBADD) $(LIBS)
-@KDE_USE_NMCHECK_TRUE@	@$(MAKE) $(AM_MAKEFLAGS) nmcheck_libDCOP.la || ( rm -f libDCOP.la; exit 1 )
+	$(dcopserver_la_LINK) -rpath $(kdeinitdir) $(dcopserver_la_OBJECTS) $(dcopserver_la_LIBADD) $(LIBS)
+libDCOP.la: $(libDCOP_la_OBJECTS) $(libDCOP_la_DEPENDENCIES) 
+	$(libDCOP_la_LINK) -rpath $(libdir) $(libDCOP_la_OBJECTS) $(libDCOP_la_LIBADD) $(LIBS)
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
+	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
 	  if test -f $$p \
@@ -823,16 +740,16 @@
 	done
 dcop_deadlock_test$(EXEEXT): $(dcop_deadlock_test_OBJECTS) $(dcop_deadlock_test_DEPENDENCIES) 
 	@rm -f dcop_deadlock_test$(EXEEXT)
-	$(CXXLINK) $(dcop_deadlock_test_LDFLAGS) $(dcop_deadlock_test_OBJECTS) $(dcop_deadlock_test_LDADD) $(LIBS)
+	$(dcop_deadlock_test_LINK) $(dcop_deadlock_test_OBJECTS) $(dcop_deadlock_test_LDADD) $(LIBS)
 dcopserver_shutdown$(EXEEXT): $(dcopserver_shutdown_OBJECTS) $(dcopserver_shutdown_DEPENDENCIES) 
 	@rm -f dcopserver_shutdown$(EXEEXT)
-	$(LINK) $(dcopserver_shutdown_LDFLAGS) $(dcopserver_shutdown_OBJECTS) $(dcopserver_shutdown_LDADD) $(LIBS)
+	$(LINK) $(dcopserver_shutdown_OBJECTS) $(dcopserver_shutdown_LDADD) $(LIBS)
 testdcop$(EXEEXT): $(testdcop_OBJECTS) $(testdcop_DEPENDENCIES) 
 	@rm -f testdcop$(EXEEXT)
-	$(CXXLINK) $(testdcop_LDFLAGS) $(testdcop_OBJECTS) $(testdcop_LDADD) $(LIBS)
+	$(testdcop_LINK) $(testdcop_OBJECTS) $(testdcop_LDADD) $(LIBS)
 testdcopc$(EXEEXT): $(testdcopc_OBJECTS) $(testdcopc_DEPENDENCIES) 
 	@rm -f testdcopc$(EXEEXT)
-	$(LINK) $(testdcopc_LDFLAGS) $(testdcopc_OBJECTS) $(testdcopc_LDADD) $(LIBS)
+	$(testdcopc_LINK) $(testdcopc_OBJECTS) $(testdcopc_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -853,43 +770,43 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testdcopc.Po@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -899,13 +816,9 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 install-includeHEADERS: $(include_HEADERS)
 	@$(NORMAL_INSTALL)
-	test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"
+	test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)"
 	@list='$(include_HEADERS)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -952,8 +865,7 @@
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
+$(RECURSIVE_CLEAN_TARGETS):
 	@failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
@@ -1054,23 +966,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	$(mkdir_p) $(distdir)/../admin
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -1084,7 +994,7 @@
 	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
-	    || $(mkdir_p) "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 	    || exit 1; \
 	    distdir=`$(am__cd) $(distdir) && pwd`; \
 	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
@@ -1092,6 +1002,8 @@
 	      $(MAKE) $(AM_MAKEFLAGS) \
 	        top_distdir="$$top_distdir" \
 	        distdir="$$distdir/$$subdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -1105,7 +1017,7 @@
 installdirs: installdirs-recursive
 installdirs-am:
 	for dir in "$(DESTDIR)$(kdeinitdir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(includedir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-recursive
 install-exec: install-exec-recursive
@@ -1139,7 +1051,7 @@
 #>- 	clean-kdeinitLTLIBRARIES clean-libLTLIBRARIES clean-libtool \
 #>- 	mostlyclean-am
 #>+ 3
-clean-am: clean-metasources clean-closures clean-bcheck clean-final  clean-binPROGRAMS clean-checkPROGRAMS clean-generic \
+clean-am: clean-metasources clean-bcheck clean-final  clean-binPROGRAMS clean-checkPROGRAMS clean-generic \
 	clean-kdeinitLTLIBRARIES clean-libLTLIBRARIES clean-libtool \
 	mostlyclean-am
 
@@ -1147,7 +1059,7 @@
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-hdr distclean-libtool distclean-tags
+	distclean-hdr distclean-tags
 
 dvi: dvi-recursive
 
@@ -1162,12 +1074,20 @@
 install-data-am: install-data-local install-includeHEADERS \
 	install-kdeinitLTLIBRARIES
 
+install-dvi: install-dvi-recursive
+
 install-exec-am: install-binPROGRAMS install-libLTLIBRARIES
 
+install-html: install-html-recursive
+
 install-info: install-info-recursive
 
 install-man:
 
+install-pdf: install-pdf-recursive
+
+install-ps: install-ps-recursive
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
@@ -1189,30 +1109,32 @@
 ps-am:
 
 uninstall-am: uninstall-binPROGRAMS uninstall-includeHEADERS \
-	uninstall-info-am uninstall-kdeinitLTLIBRARIES \
-	uninstall-libLTLIBRARIES uninstall-local
+	uninstall-kdeinitLTLIBRARIES uninstall-libLTLIBRARIES \
+	uninstall-local
 
-uninstall-info: uninstall-info-recursive
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+	install-strip
 
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-	clean clean-binPROGRAMS clean-checkPROGRAMS clean-generic \
-	clean-kdeinitLTLIBRARIES clean-libLTLIBRARIES clean-libtool \
-	clean-recursive ctags ctags-recursive distclean \
-	distclean-compile distclean-generic distclean-hdr \
-	distclean-libtool distclean-recursive distclean-tags distdir \
-	dvi dvi-am html html-am info info-am install install-am \
-	install-binPROGRAMS install-data install-data-am \
-	install-data-local install-exec install-exec-am \
-	install-includeHEADERS install-info install-info-am \
-	install-kdeinitLTLIBRARIES install-libLTLIBRARIES install-man \
-	install-strip installcheck installcheck-am installdirs \
-	installdirs-am maintainer-clean maintainer-clean-generic \
-	maintainer-clean-recursive mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
-	pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+	all all-am check check-am clean clean-binPROGRAMS \
+	clean-checkPROGRAMS clean-generic clean-kdeinitLTLIBRARIES \
+	clean-libLTLIBRARIES clean-libtool ctags ctags-recursive \
+	distclean distclean-compile distclean-generic distclean-hdr \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-binPROGRAMS \
+	install-data install-data-am install-data-local install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-includeHEADERS install-info \
+	install-info-am install-kdeinitLTLIBRARIES \
+	install-libLTLIBRARIES install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs installdirs-am maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags tags-recursive uninstall uninstall-am \
 	uninstall-binPROGRAMS uninstall-includeHEADERS \
-	uninstall-info-am uninstall-kdeinitLTLIBRARIES \
-	uninstall-libLTLIBRARIES uninstall-local
+	uninstall-kdeinitLTLIBRARIES uninstall-libLTLIBRARIES \
+	uninstall-local
 
 apidox-am-yes:
 	@if test \! -d "$(top_srcdir)/doc/common/" && test -z "$$DOXDATA" ; then \
@@ -1364,15 +1286,6 @@
 #>+ 2
 mocs: dcop_deadlock_test.moc
 
-#>+ 8
-libDCOP.la.closure: $(libDCOP_la_OBJECTS) $(libDCOP_la_DEPENDENCIES)
-	@echo "int main() {return 0;}" > libDCOP_la_closure.cpp
-	@$(LTCXXCOMPILE) -c libDCOP_la_closure.cpp
-	$(CXXLINK) libDCOP_la_closure.lo $(libDCOP_la_LDFLAGS) $(libDCOP_la_OBJECTS) $(libDCOP_la_LIBADD) $(LIBS)
-	@rm -f libDCOP_la_closure.* libDCOP.la.closure
-	@echo "timestamp" > libDCOP.la.closure
-
-
 #>+ 4
 
 nmcheck_libDCOP.la: libDCOP.la 
@@ -1385,10 +1298,6 @@
 #>+ 2
 KDE_DIST=dcop-path.h.in dcopserver_shutdown_win.cpp configure.in.in Makefile.in dcopc.h libDCOP.nmcheck dcop_deadlock_test.h dcopserver_win.cpp Makefile.am libDCOP_weak.nmcheck 
 
-#>+ 3
-clean-closures:
-	-rm -f  libDCOP.la.closure
-
 #>+ 2
 docs-am:
 
--- kdelibs-3.5.7.orig/dcop/dcopidl/Makefile.in
+++ kdelibs-3.5.7/dcop/dcopidl/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,15 +16,11 @@
 @SET_MAKE@
 
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -67,7 +63,14 @@
 @KDE_USE_FINAL_TRUE@dcopidl_OBJECTS = $(dcopidl_final_OBJECTS)
 am__DEPENDENCIES_1 =
 dcopidl_DEPENDENCIES = $(am__DEPENDENCIES_1)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+#>- dcopidl_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
+#>- 	$(dcopidl_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+dcopidl_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
+	$(dcopidl_LDFLAGS) $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -75,19 +78,21 @@
 #>+ 2
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 #>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
 CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 3
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(dcopidl_SOURCES)
 DIST_SOURCES = $(dcopidl_SOURCES)
 HEADERS = $(noinst_HEADERS)
@@ -99,8 +104,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -108,13 +111,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -128,8 +131,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -150,17 +151,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -229,7 +227,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -266,12 +263,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -316,87 +315,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -420,75 +375,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -496,16 +393,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -526,7 +422,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cc .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -564,13 +460,13 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
+	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
 	  if test -f $$p \
@@ -598,7 +494,7 @@
 	done
 dcopidl$(EXEEXT): $(dcopidl_OBJECTS) $(dcopidl_DEPENDENCIES) 
 	@rm -f dcopidl$(EXEEXT)
-	$(CXXLINK) $(dcopidl_LDFLAGS) $(dcopidl_OBJECTS) $(dcopidl_LDADD) $(LIBS)
+	$(dcopidl_LINK) $(dcopidl_OBJECTS) $(dcopidl_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -611,43 +507,43 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/yacc.Po@am__quote@
 
 .cc.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cc.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cc.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -658,10 +554,6 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -711,22 +603,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -743,7 +634,7 @@
 all-am: Makefile $(PROGRAMS) $(HEADERS)
 installdirs:
 	for dir in "$(DESTDIR)$(bindir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -782,7 +673,7 @@
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
@@ -796,12 +687,20 @@
 
 install-data-am:
 
+install-dvi: install-dvi-am
+
 install-exec-am: install-binPROGRAMS
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -822,20 +721,23 @@
 
 ps-am:
 
-uninstall-am: uninstall-binPROGRAMS uninstall-info-am
+uninstall-am: uninstall-binPROGRAMS
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am check-local clean \
 	clean-binPROGRAMS clean-generic clean-libtool ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
 	distclean-tags distdir dvi dvi-am html html-am info info-am \
 	install install-am install-binPROGRAMS install-data \
-	install-data-am install-exec install-exec-am install-info \
-	install-info-am install-man install-strip installcheck \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
 	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-binPROGRAMS \
-	uninstall-info-am
+	tags uninstall uninstall-am uninstall-binPROGRAMS
 
 
 ####### Build rules
--- kdelibs-3.5.7.orig/dcop/dcopidlng/Makefile.in
+++ kdelibs-3.5.7/dcop/dcopidlng/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,15 +16,11 @@
 @SET_MAKE@
 
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -74,8 +70,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -83,13 +77,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -103,8 +97,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -125,17 +117,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -204,7 +193,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -241,12 +229,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -291,87 +281,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -395,75 +341,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -471,16 +359,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -495,7 +382,7 @@
 all: docs-am  all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -533,13 +420,13 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-binSCRIPTS: $(bin_SCRIPTS)
 	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
+	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
 	@list='$(bin_SCRIPTS)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  if test -f $$d$$p; then \
@@ -558,7 +445,7 @@
 	done
 install-dcopidlnglibSCRIPTS: $(dcopidlnglib_SCRIPTS)
 	@$(NORMAL_INSTALL)
-	test -z "$(dcopidlnglibdir)" || $(mkdir_p) "$(DESTDIR)$(dcopidlnglibdir)"
+	test -z "$(dcopidlnglibdir)" || $(MKDIR_P) "$(DESTDIR)$(dcopidlnglibdir)"
 	@list='$(dcopidlnglib_SCRIPTS)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  if test -f $$d$$p; then \
@@ -581,13 +468,9 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 install-dcopidlnglibDATA: $(dcopidlnglib_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(dcopidlnglibdir)" || $(mkdir_p) "$(DESTDIR)$(dcopidlnglibdir)"
+	test -z "$(dcopidlnglibdir)" || $(MKDIR_P) "$(DESTDIR)$(dcopidlnglibdir)"
 	@list='$(dcopidlnglib_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -610,22 +493,21 @@
 
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -642,7 +524,7 @@
 all-am: Makefile $(SCRIPTS) $(DATA)
 installdirs:
 	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(dcopidlnglibdir)" "$(DESTDIR)$(dcopidlnglibdir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -678,7 +560,7 @@
 
 distclean: distclean-am
 	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool
+distclean-am: clean-am distclean-generic
 
 dvi: dvi-am
 
@@ -692,12 +574,20 @@
 
 install-data-am: install-dcopidlnglibDATA install-dcopidlnglibSCRIPTS
 
+install-dvi: install-dvi-am
+
 install-exec-am: install-binSCRIPTS
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -717,20 +607,23 @@
 ps-am:
 
 uninstall-am: uninstall-binSCRIPTS uninstall-dcopidlnglibDATA \
-	uninstall-dcopidlnglibSCRIPTS uninstall-info-am
+	uninstall-dcopidlnglibSCRIPTS
+
+.MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am check-local clean clean-generic \
 	clean-libtool distclean distclean-generic distclean-libtool \
 	distdir dvi dvi-am html html-am info info-am install \
 	install-am install-binSCRIPTS install-data install-data-am \
 	install-dcopidlnglibDATA install-dcopidlnglibSCRIPTS \
-	install-exec install-exec-am install-info install-info-am \
-	install-man install-strip installcheck installcheck-am \
+	install-dvi install-dvi-am install-exec install-exec-am \
+	install-html install-html-am install-info install-info-am \
+	install-man install-pdf install-pdf-am install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
 	installdirs maintainer-clean maintainer-clean-generic \
 	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
 	ps ps-am uninstall uninstall-am uninstall-binSCRIPTS \
-	uninstall-dcopidlnglibDATA uninstall-dcopidlnglibSCRIPTS \
-	uninstall-info-am
+	uninstall-dcopidlnglibDATA uninstall-dcopidlnglibSCRIPTS
 
 
 check-local:
--- kdelibs-3.5.7.orig/dcop/dcopidl2cpp/Makefile.in
+++ kdelibs-3.5.7/dcop/dcopidl2cpp/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,15 +16,11 @@
 @SET_MAKE@
 
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -69,7 +65,14 @@
 @KDE_USE_FINAL_TRUE@dcopidl2cpp_OBJECTS = $(dcopidl2cpp_final_OBJECTS)
 am__DEPENDENCIES_1 =
 dcopidl2cpp_DEPENDENCIES = $(am__DEPENDENCIES_1)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+#>- dcopidl2cpp_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(dcopidl2cpp_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+dcopidl2cpp_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(dcopidl2cpp_LDFLAGS) $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -77,19 +80,21 @@
 #>+ 2
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 #>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
 CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 3
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(dcopidl2cpp_SOURCES)
 DIST_SOURCES = $(dcopidl2cpp_SOURCES)
 HEADERS = $(noinst_HEADERS)
@@ -101,8 +106,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -110,13 +113,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -130,8 +133,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -152,17 +153,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -231,7 +229,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -268,12 +265,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -318,87 +317,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -422,75 +377,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -498,16 +395,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -525,7 +421,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -563,13 +459,13 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
+	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
 	  if test -f $$p \
@@ -597,7 +493,7 @@
 	done
 dcopidl2cpp$(EXEEXT): $(dcopidl2cpp_OBJECTS) $(dcopidl2cpp_DEPENDENCIES) 
 	@rm -f dcopidl2cpp$(EXEEXT)
-	$(CXXLINK) $(dcopidl2cpp_LDFLAGS) $(dcopidl2cpp_OBJECTS) $(dcopidl2cpp_LDADD) $(LIBS)
+	$(dcopidl2cpp_LINK) $(dcopidl2cpp_OBJECTS) $(dcopidl2cpp_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -611,22 +507,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stubimpl.Po@am__quote@
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -637,10 +533,6 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -690,22 +582,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -722,7 +613,7 @@
 all-am: Makefile $(PROGRAMS) $(HEADERS)
 installdirs:
 	for dir in "$(DESTDIR)$(bindir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -760,7 +651,7 @@
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
@@ -774,12 +665,20 @@
 
 install-data-am:
 
+install-dvi: install-dvi-am
+
 install-exec-am: install-binPROGRAMS
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -800,20 +699,23 @@
 
 ps-am:
 
-uninstall-am: uninstall-binPROGRAMS uninstall-info-am
+uninstall-am: uninstall-binPROGRAMS
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am check-local clean \
 	clean-binPROGRAMS clean-generic clean-libtool ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
 	distclean-tags distdir dvi dvi-am html html-am info info-am \
 	install install-am install-binPROGRAMS install-data \
-	install-data-am install-exec install-exec-am install-info \
-	install-info-am install-man install-strip installcheck \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
 	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-binPROGRAMS \
-	uninstall-info-am
+	tags uninstall uninstall-am uninstall-binPROGRAMS
 
 
 dcopidl_output.kidl: ../dcopidl/dcopidl $(srcdir)/dcopidl_test.h
--- kdelibs-3.5.7.orig/kunittest/Makefile.in
+++ kdelibs-3.5.7/kunittest/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -17,15 +17,11 @@
 
 
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -73,6 +69,15 @@
 #>- 	$(am_kunittest_samplemodule_la_OBJECTS)
 #>+ 1
 kunittest_samplemodule_la_OBJECTS = samplemodule.lo
+#>- kunittest_samplemodule_la_LINK = $(LIBTOOL) --tag=CXX \
+#>- 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
+#>- 	$(AM_CXXFLAGS) $(CXXFLAGS) \
+#>- 	$(kunittest_samplemodule_la_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 4
+kunittest_samplemodule_la_LINK = $(LIBTOOL) --tag=CXX \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
+	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
+	$(kunittest_samplemodule_la_LDFLAGS) $(LDFLAGS) -o $@
 am__DEPENDENCIES_1 =
 libkunittest_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
 am_libkunittest_la_OBJECTS = runner.lo tester.lo
@@ -82,6 +87,13 @@
 libkunittest_la_nofinal_OBJECTS = runner.lo tester.lo
 @KDE_USE_FINAL_FALSE@libkunittest_la_OBJECTS = $(libkunittest_la_nofinal_OBJECTS)
 @KDE_USE_FINAL_TRUE@libkunittest_la_OBJECTS = $(libkunittest_la_final_OBJECTS)
+#>- libkunittest_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(libkunittest_la_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+libkunittest_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(libkunittest_la_LDFLAGS) $(LDFLAGS) -o $@
 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(bin_PROGRAMS)
 am_kunittestmodrunner_OBJECTS = modrunner.$(OBJEXT)
@@ -90,7 +102,14 @@
 kunittestmodrunner_OBJECTS = modrunner.$(OBJEXT)
 kunittestmodrunner_DEPENDENCIES = libkunittest.la \
 	$(am__DEPENDENCIES_1)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+#>- kunittestmodrunner_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(kunittestmodrunner_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+kunittestmodrunner_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(kunittestmodrunner_LDFLAGS) $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -98,19 +117,21 @@
 #>+ 2
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 #>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
 CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 3
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(kunittest_samplemodule_la_SOURCES) \
 	$(libkunittest_la_SOURCES) $(kunittestmodrunner_SOURCES)
 DIST_SOURCES = $(kunittest_samplemodule_la_SOURCES) \
@@ -125,8 +146,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -134,13 +153,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -154,8 +173,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -176,17 +193,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -255,7 +269,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -292,12 +305,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -342,87 +357,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -446,75 +417,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -522,16 +435,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -561,7 +473,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(srcdir)/../admin/Doxyfile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../admin/Doxyfile.am $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -599,9 +511,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 clean-checkLTLIBRARIES:
@@ -614,7 +526,7 @@
 	done
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
@@ -625,7 +537,7 @@
 
 uninstall-libLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
@@ -640,12 +552,12 @@
 	  rm -f "$${dir}/so_locations"; \
 	done
 kunittest_samplemodule.la: $(kunittest_samplemodule_la_OBJECTS) $(kunittest_samplemodule_la_DEPENDENCIES) 
-	$(CXXLINK)  $(kunittest_samplemodule_la_LDFLAGS) $(kunittest_samplemodule_la_OBJECTS) $(kunittest_samplemodule_la_LIBADD) $(LIBS)
+	$(kunittest_samplemodule_la_LINK)  $(kunittest_samplemodule_la_OBJECTS) $(kunittest_samplemodule_la_LIBADD) $(LIBS)
 libkunittest.la: $(libkunittest_la_OBJECTS) $(libkunittest_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(libdir) $(libkunittest_la_LDFLAGS) $(libkunittest_la_OBJECTS) $(libkunittest_la_LIBADD) $(LIBS)
+	$(libkunittest_la_LINK) -rpath $(libdir) $(libkunittest_la_OBJECTS) $(libkunittest_la_LIBADD) $(LIBS)
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
+	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
 	  if test -f $$p \
@@ -673,7 +585,7 @@
 	done
 kunittestmodrunner$(EXEEXT): $(kunittestmodrunner_OBJECTS) $(kunittestmodrunner_DEPENDENCIES) 
 	@rm -f kunittestmodrunner$(EXEEXT)
-	$(CXXLINK) $(kunittestmodrunner_LDFLAGS) $(kunittestmodrunner_OBJECTS) $(kunittestmodrunner_LDADD) $(LIBS)
+	$(kunittestmodrunner_LINK) $(kunittestmodrunner_OBJECTS) $(kunittestmodrunner_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -687,22 +599,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tester.Plo@am__quote@
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -712,13 +624,9 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 install-libkunittestincludeHEADERS: $(libkunittestinclude_HEADERS)
 	@$(NORMAL_INSTALL)
-	test -z "$(libkunittestincludedir)" || $(mkdir_p) "$(DESTDIR)$(libkunittestincludedir)"
+	test -z "$(libkunittestincludedir)" || $(MKDIR_P) "$(DESTDIR)$(libkunittestincludedir)"
 	@list='$(libkunittestinclude_HEADERS)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -783,23 +691,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	$(mkdir_p) $(distdir)/../admin
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -819,7 +725,7 @@
 
 installdirs:
 	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libkunittestincludedir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -859,7 +765,7 @@
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
@@ -873,12 +779,20 @@
 
 install-data-am: install-data-local install-libkunittestincludeHEADERS
 
+install-dvi: install-dvi-am
+
 install-exec-am: install-binPROGRAMS install-libLTLIBRARIES
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -899,9 +813,10 @@
 
 ps-am:
 
-uninstall-am: uninstall-binPROGRAMS uninstall-info-am \
-	uninstall-libLTLIBRARIES uninstall-libkunittestincludeHEADERS \
-	uninstall-local
+uninstall-am: uninstall-binPROGRAMS uninstall-libLTLIBRARIES \
+	uninstall-libkunittestincludeHEADERS uninstall-local
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am check-local clean \
 	clean-binPROGRAMS clean-checkLTLIBRARIES clean-generic \
@@ -909,14 +824,15 @@
 	distclean-compile distclean-generic distclean-libtool \
 	distclean-tags distdir dvi dvi-am html html-am info info-am \
 	install install-am install-binPROGRAMS install-data \
-	install-data-am install-data-local install-exec \
-	install-exec-am install-info install-info-am \
-	install-libLTLIBRARIES install-libkunittestincludeHEADERS \
-	install-man install-strip installcheck installcheck-am \
-	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
-	uninstall-am uninstall-binPROGRAMS uninstall-info-am \
+	install-data-am install-data-local install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-libLTLIBRARIES \
+	install-libkunittestincludeHEADERS install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags uninstall uninstall-am uninstall-binPROGRAMS \
 	uninstall-libLTLIBRARIES uninstall-libkunittestincludeHEADERS \
 	uninstall-local
 
--- kdelibs-3.5.7.orig/kconf_update/Makefile.in
+++ kdelibs-3.5.7/kconf_update/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -34,15 +34,11 @@
 #    Boston, MA 02110-1301, USA.
 
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -93,12 +89,19 @@
 #>- kconf_update_la_OBJECTS = $(am_kconf_update_la_OBJECTS)
 #>+ 1
 kconf_update_la_OBJECTS = kconf_update_dummy.lo
+#>- kconf_update_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(kconf_update_la_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+kconf_update_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(kconf_update_la_LDFLAGS) $(LDFLAGS) -o $@
 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 #>- PROGRAMS = $(bin_PROGRAMS)
 #>+ 2
 bin_PROGRAMS += kconf_update$(EXEEXT) 
 PROGRAMS = $(bin_PROGRAMS)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -106,19 +109,21 @@
 #>+ 2
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 #>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
 CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 3
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 #>- SOURCES = $(kconf_update_la_SOURCES)
 #>+ 1
 SOURCES = $(kconf_update_la_SOURCES) $(kconf_update_SOURCES) 
@@ -133,8 +138,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -142,13 +145,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -162,8 +165,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -184,17 +185,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -263,7 +261,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -300,12 +297,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -350,87 +349,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -454,75 +409,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -530,16 +427,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -562,7 +458,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -600,13 +496,13 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(kdeinitdir)" || $(mkdir_p) "$(DESTDIR)$(kdeinitdir)"
+	test -z "$(kdeinitdir)" || $(MKDIR_P) "$(DESTDIR)$(kdeinitdir)"
 	@list='$(kdeinit_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
@@ -617,7 +513,7 @@
 
 uninstall-kdeinitLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@set -x; list='$(kdeinit_LTLIBRARIES)'; for p in $$list; do \
+	@list='$(kdeinit_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kdeinitdir)/$$p'"; \
 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kdeinitdir)/$$p"; \
@@ -633,7 +529,7 @@
 	done
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
@@ -644,7 +540,7 @@
 
 uninstall-libLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
@@ -659,10 +555,10 @@
 	  rm -f "$${dir}/so_locations"; \
 	done
 kconf_update.la: $(kconf_update_la_OBJECTS) $(kconf_update_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(kdeinitdir) $(kconf_update_la_LDFLAGS) $(kconf_update_la_OBJECTS) $(kconf_update_la_LIBADD) $(LIBS)
+	$(kconf_update_la_LINK) -rpath $(kdeinitdir) $(kconf_update_la_OBJECTS) $(kconf_update_la_LIBADD) $(LIBS)
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
+	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
 	  if test -f $$p \
@@ -698,22 +594,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kconf_update.Plo@am__quote@
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -724,10 +620,6 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -777,22 +669,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -810,7 +701,7 @@
 
 installdirs:
 	for dir in "$(DESTDIR)$(kdeinitdir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -850,7 +741,7 @@
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
@@ -864,12 +755,20 @@
 
 install-data-am: install-kdeinitLTLIBRARIES
 
+install-dvi: install-dvi-am
+
 install-exec-am: install-binPROGRAMS install-libLTLIBRARIES
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -890,23 +789,27 @@
 
 ps-am:
 
-uninstall-am: uninstall-binPROGRAMS uninstall-info-am \
-	uninstall-kdeinitLTLIBRARIES uninstall-libLTLIBRARIES
+uninstall-am: uninstall-binPROGRAMS uninstall-kdeinitLTLIBRARIES \
+	uninstall-libLTLIBRARIES
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
 	clean-generic clean-kdeinitLTLIBRARIES clean-libLTLIBRARIES \
 	clean-libtool ctags distclean distclean-compile \
 	distclean-generic distclean-libtool distclean-tags distdir dvi \
 	dvi-am html html-am info info-am install install-am \
-	install-binPROGRAMS install-data install-data-am install-exec \
-	install-exec-am install-info install-info-am \
+	install-binPROGRAMS install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am \
 	install-kdeinitLTLIBRARIES install-libLTLIBRARIES install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
 	install-strip installcheck installcheck-am installdirs \
 	maintainer-clean maintainer-clean-generic mostlyclean \
 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
 	pdf pdf-am ps ps-am tags uninstall uninstall-am \
-	uninstall-binPROGRAMS uninstall-info-am \
-	uninstall-kdeinitLTLIBRARIES uninstall-libLTLIBRARIES
+	uninstall-binPROGRAMS uninstall-kdeinitLTLIBRARIES \
+	uninstall-libLTLIBRARIES
 
 
 # Internal
--- kdelibs-3.5.7.orig/kdecore/tests/Makefile.in
+++ kdelibs-3.5.7/kdecore/tests/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -34,15 +34,11 @@
 #    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 #    Boston, MA 02110-1301, USA.
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -75,6 +71,7 @@
 	kxerrorhandlertest$(EXEEXT) startserviceby$(EXEEXT) \
 	kstdacceltest$(EXEEXT) kglobaltest$(EXEEXT) \
 	ktimezonestest$(EXEEXT)
+TESTS = kurltest$(EXEEXT) kstdacceltest$(EXEEXT)
 subdir = kdecore/tests
 DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in
@@ -96,6 +93,13 @@
 #>- kunittest_kconfig_la_OBJECTS = $(am_kunittest_kconfig_la_OBJECTS)
 #>+ 1
 kunittest_kconfig_la_OBJECTS = kconfigtest.lo
+#>- kunittest_kconfig_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(kunittest_kconfig_la_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+kunittest_kconfig_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(kunittest_kconfig_la_LDFLAGS) $(LDFLAGS) -o $@
 am_cplusplustest_OBJECTS = cplusplustest.$(OBJEXT)
 #>- cplusplustest_OBJECTS = $(am_cplusplustest_OBJECTS)
 #>+ 1
@@ -324,7 +328,7 @@
 testqtargs_OBJECTS = testqtargs.$(OBJEXT)
 testqtargs_LDADD = $(LDADD)
 testqtargs_DEPENDENCIES = ../libkdecore.la
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -332,19 +336,21 @@
 #>+ 2
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 #>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
 CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 3
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(kunittest_kconfig_la_SOURCES) $(cplusplustest_SOURCES) \
 	$(dcopkonqtest_SOURCES) $(kapptest_SOURCES) \
 	$(kcalendartest_SOURCES) $(kcharsetstest_SOURCES) \
@@ -393,8 +399,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -402,13 +406,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -422,8 +426,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -444,17 +446,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -523,7 +522,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -560,12 +558,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -610,87 +610,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -714,75 +670,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -790,16 +688,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -807,7 +704,6 @@
 xdg_menudir = @xdg_menudir@
 INCLUDES = -I$(top_srcdir)/kdecore $(all_includes)
 AM_LDFLAGS = $(QT_LDFLAGS) $(X_LDFLAGS) $(KDE_RPATH)
-TESTS = kurltest kstdacceltest
 noinst_HEADERS = klocaletest.h kprocesstest.h KIDLTest.h \
 		kipctest.h kprociotest.h
 
@@ -866,7 +762,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -904,9 +800,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 clean-checkLTLIBRARIES:
@@ -918,7 +814,7 @@
 	  rm -f "$${dir}/so_locations"; \
 	done
 kunittest_kconfig.la: $(kunittest_kconfig_la_OBJECTS) $(kunittest_kconfig_la_DEPENDENCIES) 
-	$(CXXLINK)  $(kunittest_kconfig_la_LDFLAGS) $(kunittest_kconfig_la_OBJECTS) $(kunittest_kconfig_la_LIBADD) $(LIBS)
+	$(kunittest_kconfig_la_LINK)  $(kunittest_kconfig_la_OBJECTS) $(kunittest_kconfig_la_LIBADD) $(LIBS)
 
 clean-checkPROGRAMS:
 	@list='$(check_PROGRAMS)'; for p in $$list; do \
@@ -928,115 +824,115 @@
 	done
 cplusplustest$(EXEEXT): $(cplusplustest_OBJECTS) $(cplusplustest_DEPENDENCIES) 
 	@rm -f cplusplustest$(EXEEXT)
-	$(CXXLINK) $(cplusplustest_LDFLAGS) $(cplusplustest_OBJECTS) $(cplusplustest_LDADD) $(LIBS)
+	$(CXXLINK) $(cplusplustest_OBJECTS) $(cplusplustest_LDADD) $(LIBS)
 dcopkonqtest$(EXEEXT): $(dcopkonqtest_OBJECTS) $(dcopkonqtest_DEPENDENCIES) 
 	@rm -f dcopkonqtest$(EXEEXT)
-	$(CXXLINK) $(dcopkonqtest_LDFLAGS) $(dcopkonqtest_OBJECTS) $(dcopkonqtest_LDADD) $(LIBS)
+	$(CXXLINK) $(dcopkonqtest_OBJECTS) $(dcopkonqtest_LDADD) $(LIBS)
 kapptest$(EXEEXT): $(kapptest_OBJECTS) $(kapptest_DEPENDENCIES) 
 	@rm -f kapptest$(EXEEXT)
-	$(CXXLINK) $(kapptest_LDFLAGS) $(kapptest_OBJECTS) $(kapptest_LDADD) $(LIBS)
+	$(CXXLINK) $(kapptest_OBJECTS) $(kapptest_LDADD) $(LIBS)
 kcalendartest$(EXEEXT): $(kcalendartest_OBJECTS) $(kcalendartest_DEPENDENCIES) 
 	@rm -f kcalendartest$(EXEEXT)
-	$(CXXLINK) $(kcalendartest_LDFLAGS) $(kcalendartest_OBJECTS) $(kcalendartest_LDADD) $(LIBS)
+	$(CXXLINK) $(kcalendartest_OBJECTS) $(kcalendartest_LDADD) $(LIBS)
 kcharsetstest$(EXEEXT): $(kcharsetstest_OBJECTS) $(kcharsetstest_DEPENDENCIES) 
 	@rm -f kcharsetstest$(EXEEXT)
-	$(CXXLINK) $(kcharsetstest_LDFLAGS) $(kcharsetstest_OBJECTS) $(kcharsetstest_LDADD) $(LIBS)
+	$(CXXLINK) $(kcharsetstest_OBJECTS) $(kcharsetstest_LDADD) $(LIBS)
 kcmdlineargstest$(EXEEXT): $(kcmdlineargstest_OBJECTS) $(kcmdlineargstest_DEPENDENCIES) 
 	@rm -f kcmdlineargstest$(EXEEXT)
-	$(CXXLINK) $(kcmdlineargstest_LDFLAGS) $(kcmdlineargstest_OBJECTS) $(kcmdlineargstest_LDADD) $(LIBS)
+	$(CXXLINK) $(kcmdlineargstest_OBJECTS) $(kcmdlineargstest_LDADD) $(LIBS)
 kconfigtestgui$(EXEEXT): $(kconfigtestgui_OBJECTS) $(kconfigtestgui_DEPENDENCIES) 
 	@rm -f kconfigtestgui$(EXEEXT)
-	$(CXXLINK) $(kconfigtestgui_LDFLAGS) $(kconfigtestgui_OBJECTS) $(kconfigtestgui_LDADD) $(LIBS)
+	$(CXXLINK) $(kconfigtestgui_OBJECTS) $(kconfigtestgui_LDADD) $(LIBS)
 kdebugtest$(EXEEXT): $(kdebugtest_OBJECTS) $(kdebugtest_DEPENDENCIES) 
 	@rm -f kdebugtest$(EXEEXT)
-	$(CXXLINK) $(kdebugtest_LDFLAGS) $(kdebugtest_OBJECTS) $(kdebugtest_LDADD) $(LIBS)
+	$(CXXLINK) $(kdebugtest_OBJECTS) $(kdebugtest_LDADD) $(LIBS)
 kglobaltest$(EXEEXT): $(kglobaltest_OBJECTS) $(kglobaltest_DEPENDENCIES) 
 	@rm -f kglobaltest$(EXEEXT)
-	$(CXXLINK) $(kglobaltest_LDFLAGS) $(kglobaltest_OBJECTS) $(kglobaltest_LDADD) $(LIBS)
+	$(CXXLINK) $(kglobaltest_OBJECTS) $(kglobaltest_LDADD) $(LIBS)
 kiconloadertest$(EXEEXT): $(kiconloadertest_OBJECTS) $(kiconloadertest_DEPENDENCIES) 
 	@rm -f kiconloadertest$(EXEEXT)
-	$(CXXLINK) $(kiconloadertest_LDFLAGS) $(kiconloadertest_OBJECTS) $(kiconloadertest_LDADD) $(LIBS)
+	$(CXXLINK) $(kiconloadertest_OBJECTS) $(kiconloadertest_LDADD) $(LIBS)
 kidlclienttest$(EXEEXT): $(kidlclienttest_OBJECTS) $(kidlclienttest_DEPENDENCIES) 
 	@rm -f kidlclienttest$(EXEEXT)
-	$(CXXLINK) $(kidlclienttest_LDFLAGS) $(kidlclienttest_OBJECTS) $(kidlclienttest_LDADD) $(LIBS)
+	$(CXXLINK) $(kidlclienttest_OBJECTS) $(kidlclienttest_LDADD) $(LIBS)
 kidlservertest$(EXEEXT): $(kidlservertest_OBJECTS) $(kidlservertest_DEPENDENCIES) 
 	@rm -f kidlservertest$(EXEEXT)
-	$(CXXLINK) $(kidlservertest_LDFLAGS) $(kidlservertest_OBJECTS) $(kidlservertest_LDADD) $(LIBS)
+	$(CXXLINK) $(kidlservertest_OBJECTS) $(kidlservertest_LDADD) $(LIBS)
 kipctest$(EXEEXT): $(kipctest_OBJECTS) $(kipctest_DEPENDENCIES) 
 	@rm -f kipctest$(EXEEXT)
-	$(CXXLINK) $(kipctest_LDFLAGS) $(kipctest_OBJECTS) $(kipctest_LDADD) $(LIBS)
+	$(CXXLINK) $(kipctest_OBJECTS) $(kipctest_LDADD) $(LIBS)
 klocaletest$(EXEEXT): $(klocaletest_OBJECTS) $(klocaletest_DEPENDENCIES) 
 	@rm -f klocaletest$(EXEEXT)
-	$(CXXLINK) $(klocaletest_LDFLAGS) $(klocaletest_OBJECTS) $(klocaletest_LDADD) $(LIBS)
+	$(CXXLINK) $(klocaletest_OBJECTS) $(klocaletest_LDADD) $(LIBS)
 kmacroexpandertest$(EXEEXT): $(kmacroexpandertest_OBJECTS) $(kmacroexpandertest_DEPENDENCIES) 
 	@rm -f kmacroexpandertest$(EXEEXT)
-	$(CXXLINK) $(kmacroexpandertest_LDFLAGS) $(kmacroexpandertest_OBJECTS) $(kmacroexpandertest_LDADD) $(LIBS)
+	$(CXXLINK) $(kmacroexpandertest_OBJECTS) $(kmacroexpandertest_LDADD) $(LIBS)
 kmdcodectest$(EXEEXT): $(kmdcodectest_OBJECTS) $(kmdcodectest_DEPENDENCIES) 
 	@rm -f kmdcodectest$(EXEEXT)
-	$(CXXLINK) $(kmdcodectest_LDFLAGS) $(kmdcodectest_OBJECTS) $(kmdcodectest_LDADD) $(LIBS)
+	$(CXXLINK) $(kmdcodectest_OBJECTS) $(kmdcodectest_LDADD) $(LIBS)
 kmemtest$(EXEEXT): $(kmemtest_OBJECTS) $(kmemtest_DEPENDENCIES) 
 	@rm -f kmemtest$(EXEEXT)
-	$(CXXLINK) $(kmemtest_LDFLAGS) $(kmemtest_OBJECTS) $(kmemtest_LDADD) $(LIBS)
+	$(CXXLINK) $(kmemtest_OBJECTS) $(kmemtest_LDADD) $(LIBS)
 knotifytest$(EXEEXT): $(knotifytest_OBJECTS) $(knotifytest_DEPENDENCIES) 
 	@rm -f knotifytest$(EXEEXT)
-	$(CXXLINK) $(knotifytest_LDFLAGS) $(knotifytest_OBJECTS) $(knotifytest_LDADD) $(LIBS)
+	$(CXXLINK) $(knotifytest_OBJECTS) $(knotifytest_LDADD) $(LIBS)
 kprocesstest$(EXEEXT): $(kprocesstest_OBJECTS) $(kprocesstest_DEPENDENCIES) 
 	@rm -f kprocesstest$(EXEEXT)
-	$(CXXLINK) $(kprocesstest_LDFLAGS) $(kprocesstest_OBJECTS) $(kprocesstest_LDADD) $(LIBS)
+	$(CXXLINK) $(kprocesstest_OBJECTS) $(kprocesstest_LDADD) $(LIBS)
 kprociotest$(EXEEXT): $(kprociotest_OBJECTS) $(kprociotest_DEPENDENCIES) 
 	@rm -f kprociotest$(EXEEXT)
-	$(CXXLINK) $(kprociotest_LDFLAGS) $(kprociotest_OBJECTS) $(kprociotest_LDADD) $(LIBS)
+	$(CXXLINK) $(kprociotest_OBJECTS) $(kprociotest_LDADD) $(LIBS)
 krandomsequencetest$(EXEEXT): $(krandomsequencetest_OBJECTS) $(krandomsequencetest_DEPENDENCIES) 
 	@rm -f krandomsequencetest$(EXEEXT)
-	$(CXXLINK) $(krandomsequencetest_LDFLAGS) $(krandomsequencetest_OBJECTS) $(krandomsequencetest_LDADD) $(LIBS)
+	$(CXXLINK) $(krandomsequencetest_OBJECTS) $(krandomsequencetest_LDADD) $(LIBS)
 kresolvertest$(EXEEXT): $(kresolvertest_OBJECTS) $(kresolvertest_DEPENDENCIES) 
 	@rm -f kresolvertest$(EXEEXT)
-	$(CXXLINK) $(kresolvertest_LDFLAGS) $(kresolvertest_OBJECTS) $(kresolvertest_LDADD) $(LIBS)
+	$(CXXLINK) $(kresolvertest_OBJECTS) $(kresolvertest_LDADD) $(LIBS)
 krfcdatetest$(EXEEXT): $(krfcdatetest_OBJECTS) $(krfcdatetest_DEPENDENCIES) 
 	@rm -f krfcdatetest$(EXEEXT)
-	$(CXXLINK) $(krfcdatetest_LDFLAGS) $(krfcdatetest_OBJECTS) $(krfcdatetest_LDADD) $(LIBS)
+	$(CXXLINK) $(krfcdatetest_OBJECTS) $(krfcdatetest_LDADD) $(LIBS)
 kshelltest$(EXEEXT): $(kshelltest_OBJECTS) $(kshelltest_DEPENDENCIES) 
 	@rm -f kshelltest$(EXEEXT)
-	$(CXXLINK) $(kshelltest_LDFLAGS) $(kshelltest_OBJECTS) $(kshelltest_LDADD) $(LIBS)
+	$(CXXLINK) $(kshelltest_OBJECTS) $(kshelltest_LDADD) $(LIBS)
 ksimpleconfigtest$(EXEEXT): $(ksimpleconfigtest_OBJECTS) $(ksimpleconfigtest_DEPENDENCIES) 
 	@rm -f ksimpleconfigtest$(EXEEXT)
-	$(CXXLINK) $(ksimpleconfigtest_LDFLAGS) $(ksimpleconfigtest_OBJECTS) $(ksimpleconfigtest_LDADD) $(LIBS)
+	$(CXXLINK) $(ksimpleconfigtest_OBJECTS) $(ksimpleconfigtest_LDADD) $(LIBS)
 ksocktest$(EXEEXT): $(ksocktest_OBJECTS) $(ksocktest_DEPENDENCIES) 
 	@rm -f ksocktest$(EXEEXT)
-	$(CXXLINK) $(ksocktest_LDFLAGS) $(ksocktest_OBJECTS) $(ksocktest_LDADD) $(LIBS)
+	$(CXXLINK) $(ksocktest_OBJECTS) $(ksocktest_LDADD) $(LIBS)
 ksortablevaluelisttest$(EXEEXT): $(ksortablevaluelisttest_OBJECTS) $(ksortablevaluelisttest_DEPENDENCIES) 
 	@rm -f ksortablevaluelisttest$(EXEEXT)
-	$(CXXLINK) $(ksortablevaluelisttest_LDFLAGS) $(ksortablevaluelisttest_OBJECTS) $(ksortablevaluelisttest_LDADD) $(LIBS)
+	$(CXXLINK) $(ksortablevaluelisttest_OBJECTS) $(ksortablevaluelisttest_LDADD) $(LIBS)
 kstdacceltest$(EXEEXT): $(kstdacceltest_OBJECTS) $(kstdacceltest_DEPENDENCIES) 
 	@rm -f kstdacceltest$(EXEEXT)
-	$(CXXLINK) $(kstdacceltest_LDFLAGS) $(kstdacceltest_OBJECTS) $(kstdacceltest_LDADD) $(LIBS)
+	$(CXXLINK) $(kstdacceltest_OBJECTS) $(kstdacceltest_LDADD) $(LIBS)
 kstddirstest$(EXEEXT): $(kstddirstest_OBJECTS) $(kstddirstest_DEPENDENCIES) 
 	@rm -f kstddirstest$(EXEEXT)
-	$(CXXLINK) $(kstddirstest_LDFLAGS) $(kstddirstest_OBJECTS) $(kstddirstest_LDADD) $(LIBS)
+	$(CXXLINK) $(kstddirstest_OBJECTS) $(kstddirstest_LDADD) $(LIBS)
 kstringhandlertest$(EXEEXT): $(kstringhandlertest_OBJECTS) $(kstringhandlertest_DEPENDENCIES) 
 	@rm -f kstringhandlertest$(EXEEXT)
-	$(CXXLINK) $(kstringhandlertest_LDFLAGS) $(kstringhandlertest_OBJECTS) $(kstringhandlertest_LDADD) $(LIBS)
+	$(CXXLINK) $(kstringhandlertest_OBJECTS) $(kstringhandlertest_LDADD) $(LIBS)
 ktempfiletest$(EXEEXT): $(ktempfiletest_OBJECTS) $(ktempfiletest_DEPENDENCIES) 
 	@rm -f ktempfiletest$(EXEEXT)
-	$(CXXLINK) $(ktempfiletest_LDFLAGS) $(ktempfiletest_OBJECTS) $(ktempfiletest_LDADD) $(LIBS)
+	$(CXXLINK) $(ktempfiletest_OBJECTS) $(ktempfiletest_LDADD) $(LIBS)
 ktimezonestest$(EXEEXT): $(ktimezonestest_OBJECTS) $(ktimezonestest_DEPENDENCIES) 
 	@rm -f ktimezonestest$(EXEEXT)
-	$(CXXLINK) $(ktimezonestest_LDFLAGS) $(ktimezonestest_OBJECTS) $(ktimezonestest_LDADD) $(LIBS)
+	$(CXXLINK) $(ktimezonestest_OBJECTS) $(ktimezonestest_LDADD) $(LIBS)
 kuniqueapptest$(EXEEXT): $(kuniqueapptest_OBJECTS) $(kuniqueapptest_DEPENDENCIES) 
 	@rm -f kuniqueapptest$(EXEEXT)
-	$(CXXLINK) $(kuniqueapptest_LDFLAGS) $(kuniqueapptest_OBJECTS) $(kuniqueapptest_LDADD) $(LIBS)
+	$(CXXLINK) $(kuniqueapptest_OBJECTS) $(kuniqueapptest_LDADD) $(LIBS)
 kurltest$(EXEEXT): $(kurltest_OBJECTS) $(kurltest_DEPENDENCIES) 
 	@rm -f kurltest$(EXEEXT)
-	$(CXXLINK) $(kurltest_LDFLAGS) $(kurltest_OBJECTS) $(kurltest_LDADD) $(LIBS)
+	$(CXXLINK) $(kurltest_OBJECTS) $(kurltest_LDADD) $(LIBS)
 kxerrorhandlertest$(EXEEXT): $(kxerrorhandlertest_OBJECTS) $(kxerrorhandlertest_DEPENDENCIES) 
 	@rm -f kxerrorhandlertest$(EXEEXT)
-	$(CXXLINK) $(kxerrorhandlertest_LDFLAGS) $(kxerrorhandlertest_OBJECTS) $(kxerrorhandlertest_LDADD) $(LIBS)
+	$(CXXLINK) $(kxerrorhandlertest_OBJECTS) $(kxerrorhandlertest_LDADD) $(LIBS)
 startserviceby$(EXEEXT): $(startserviceby_OBJECTS) $(startserviceby_DEPENDENCIES) 
 	@rm -f startserviceby$(EXEEXT)
-	$(CXXLINK) $(startserviceby_LDFLAGS) $(startserviceby_OBJECTS) $(startserviceby_LDADD) $(LIBS)
+	$(CXXLINK) $(startserviceby_OBJECTS) $(startserviceby_LDADD) $(LIBS)
 testqtargs$(EXEEXT): $(testqtargs_OBJECTS) $(testqtargs_DEPENDENCIES) 
 	@rm -f testqtargs$(EXEEXT)
-	$(CXXLINK) $(testqtargs_LDFLAGS) $(testqtargs_OBJECTS) $(testqtargs_LDADD) $(LIBS)
+	$(CXXLINK) $(testqtargs_OBJECTS) $(testqtargs_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -1084,22 +980,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testqtargs.Po@am__quote@
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -1110,10 +1006,6 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -1163,9 +1055,9 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 check-TESTS: $(TESTS)
-	@failed=0; all=0; xfail=0; xpass=0; skip=0; \
+	@failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[	 ]'; \
 	srcdir=$(srcdir); export srcdir; \
-	list='$(TESTS)'; \
+	list=' $(TESTS) '; \
 	if test -n "$$list"; then \
 	  for tst in $$list; do \
 	    if test -f ./$$tst; then dir=./; \
@@ -1174,7 +1066,7 @@
 	    if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
 	      all=`expr $$all + 1`; \
 	      case " $(XFAIL_TESTS) " in \
-	      *" $$tst "*) \
+	      *$$ws$$tst$$ws*) \
 		xpass=`expr $$xpass + 1`; \
 		failed=`expr $$failed + 1`; \
 		echo "XPASS: $$tst"; \
@@ -1186,7 +1078,7 @@
 	    elif test $$? -ne 77; then \
 	      all=`expr $$all + 1`; \
 	      case " $(XFAIL_TESTS) " in \
-	      *" $$tst "*) \
+	      *$$ws$$tst$$ws*) \
 		xfail=`expr $$xfail + 1`; \
 		echo "XFAIL: $$tst"; \
 	      ;; \
@@ -1236,22 +1128,21 @@
 	else :; fi
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -1306,7 +1197,7 @@
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
@@ -1320,12 +1211,20 @@
 
 install-data-am:
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -1346,19 +1245,23 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am
+uninstall-am:
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
 	clean-checkLTLIBRARIES clean-checkPROGRAMS clean-generic \
 	clean-libtool ctags distclean distclean-compile \
 	distclean-generic distclean-libtool distclean-tags distdir dvi \
 	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-exec install-exec-am \
-	install-info install-info-am install-man install-strip \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
 	installcheck installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-info-am
+	tags uninstall uninstall-am
 
 #>- $(srcdir)/KIDLTestClient.cpp: KIDLTest_stub.h
 #>+ 1
--- kdelibs-3.5.7.orig/kdecore/kconfig_compiler/tests/Makefile.in
+++ kdelibs-3.5.7/kdecore/kconfig_compiler/tests/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,15 +14,11 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -62,6 +58,15 @@
 #>- 	$(am_kunittest_kconfigcompiler_test_la_OBJECTS)
 #>+ 1
 kunittest_kconfigcompiler_test_la_OBJECTS = kconfigcompiler_test.lo
+#>- kunittest_kconfigcompiler_test_la_LINK = $(LIBTOOL) --tag=CXX \
+#>- 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
+#>- 	$(AM_CXXFLAGS) $(CXXFLAGS) \
+#>- 	$(kunittest_kconfigcompiler_test_la_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 4
+kunittest_kconfigcompiler_test_la_LINK = $(LIBTOOL) --tag=CXX \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
+	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
+	$(kunittest_kconfigcompiler_test_la_LDFLAGS) $(LDFLAGS) -o $@
 am_test1_OBJECTS = test1main.$(OBJEXT) test1.$(OBJEXT)
 #>- test1_OBJECTS = $(am_test1_OBJECTS)
 #>+ 4
@@ -71,6 +76,13 @@
 @KDE_USE_FINAL_TRUE@test1_OBJECTS = $(test1_final_OBJECTS)
 am__DEPENDENCIES_1 =
 test1_DEPENDENCIES = $(am__DEPENDENCIES_1)
+#>- test1_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
+#>- 	$(test1_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+test1_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
+	$(test1_LDFLAGS) $(LDFLAGS) -o $@
 am_test2_OBJECTS = test2main.$(OBJEXT) test2.$(OBJEXT)
 #>- test2_OBJECTS = $(am_test2_OBJECTS)
 #>+ 4
@@ -79,6 +91,13 @@
 @KDE_USE_FINAL_FALSE@test2_OBJECTS = $(test2_nofinal_OBJECTS)
 @KDE_USE_FINAL_TRUE@test2_OBJECTS = $(test2_final_OBJECTS)
 test2_DEPENDENCIES = $(am__DEPENDENCIES_1)
+#>- test2_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
+#>- 	$(test2_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+test2_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
+	$(test2_LDFLAGS) $(LDFLAGS) -o $@
 am_test3_OBJECTS = test3main.$(OBJEXT) test3.$(OBJEXT)
 #>- test3_OBJECTS = $(am_test3_OBJECTS)
 #>+ 4
@@ -87,6 +106,13 @@
 @KDE_USE_FINAL_FALSE@test3_OBJECTS = $(test3_nofinal_OBJECTS)
 @KDE_USE_FINAL_TRUE@test3_OBJECTS = $(test3_final_OBJECTS)
 test3_DEPENDENCIES = $(am__DEPENDENCIES_1)
+#>- test3_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
+#>- 	$(test3_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+test3_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
+	$(test3_LDFLAGS) $(LDFLAGS) -o $@
 am_test4_OBJECTS = test4main.$(OBJEXT) test4.$(OBJEXT)
 #>- test4_OBJECTS = $(am_test4_OBJECTS)
 #>+ 4
@@ -95,6 +121,13 @@
 @KDE_USE_FINAL_FALSE@test4_OBJECTS = $(test4_nofinal_OBJECTS)
 @KDE_USE_FINAL_TRUE@test4_OBJECTS = $(test4_final_OBJECTS)
 test4_DEPENDENCIES = $(am__DEPENDENCIES_1)
+#>- test4_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
+#>- 	$(test4_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+test4_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
+	$(test4_LDFLAGS) $(LDFLAGS) -o $@
 am_test5_OBJECTS = test5main.$(OBJEXT) test5.$(OBJEXT)
 #>- test5_OBJECTS = $(am_test5_OBJECTS)
 #>+ 4
@@ -103,6 +136,13 @@
 @KDE_USE_FINAL_FALSE@test5_OBJECTS = $(test5_nofinal_OBJECTS)
 @KDE_USE_FINAL_TRUE@test5_OBJECTS = $(test5_final_OBJECTS)
 test5_DEPENDENCIES = $(am__DEPENDENCIES_1)
+#>- test5_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
+#>- 	$(test5_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+test5_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
+	$(test5_LDFLAGS) $(LDFLAGS) -o $@
 am_test6_OBJECTS = test6main.$(OBJEXT) test6.$(OBJEXT)
 #>- test6_OBJECTS = $(am_test6_OBJECTS)
 #>+ 4
@@ -111,6 +151,13 @@
 @KDE_USE_FINAL_FALSE@test6_OBJECTS = $(test6_nofinal_OBJECTS)
 @KDE_USE_FINAL_TRUE@test6_OBJECTS = $(test6_final_OBJECTS)
 test6_DEPENDENCIES = $(am__DEPENDENCIES_1)
+#>- test6_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
+#>- 	$(test6_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+test6_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
+	$(test6_LDFLAGS) $(LDFLAGS) -o $@
 am_test7_OBJECTS = test7main.$(OBJEXT) test7.$(OBJEXT)
 #>- test7_OBJECTS = $(am_test7_OBJECTS)
 #>+ 4
@@ -119,6 +166,13 @@
 @KDE_USE_FINAL_FALSE@test7_OBJECTS = $(test7_nofinal_OBJECTS)
 @KDE_USE_FINAL_TRUE@test7_OBJECTS = $(test7_final_OBJECTS)
 test7_DEPENDENCIES = $(am__DEPENDENCIES_1)
+#>- test7_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
+#>- 	$(test7_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+test7_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
+	$(test7_LDFLAGS) $(LDFLAGS) -o $@
 am_test8_OBJECTS = test8main.$(OBJEXT) test8a.$(OBJEXT) \
 	test8b.$(OBJEXT)
 #>- test8_OBJECTS = $(am_test8_OBJECTS)
@@ -129,6 +183,13 @@
 @KDE_USE_FINAL_FALSE@test8_OBJECTS = $(test8_nofinal_OBJECTS)
 @KDE_USE_FINAL_TRUE@test8_OBJECTS = $(test8_final_OBJECTS)
 test8_DEPENDENCIES = $(am__DEPENDENCIES_1)
+#>- test8_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
+#>- 	$(test8_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+test8_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
+	$(test8_LDFLAGS) $(LDFLAGS) -o $@
 am_test9_OBJECTS = test9main.$(OBJEXT) test9.$(OBJEXT)
 #>- test9_OBJECTS = $(am_test9_OBJECTS)
 #>+ 4
@@ -137,6 +198,13 @@
 @KDE_USE_FINAL_FALSE@test9_OBJECTS = $(test9_nofinal_OBJECTS)
 @KDE_USE_FINAL_TRUE@test9_OBJECTS = $(test9_final_OBJECTS)
 test9_DEPENDENCIES = $(am__DEPENDENCIES_1)
+#>- test9_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
+#>- 	$(test9_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+test9_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
+	$(test9_LDFLAGS) $(LDFLAGS) -o $@
 am_test_dpointer_OBJECTS = test_dpointer_main.$(OBJEXT) \
 	test_dpointer.$(OBJEXT)
 #>- test_dpointer_OBJECTS = $(am_test_dpointer_OBJECTS)
@@ -147,7 +215,14 @@
 @KDE_USE_FINAL_FALSE@test_dpointer_OBJECTS = $(test_dpointer_nofinal_OBJECTS)
 @KDE_USE_FINAL_TRUE@test_dpointer_OBJECTS = $(test_dpointer_final_OBJECTS)
 test_dpointer_DEPENDENCIES = $(am__DEPENDENCIES_1)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+#>- test_dpointer_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(test_dpointer_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+test_dpointer_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(test_dpointer_LDFLAGS) $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -155,19 +230,21 @@
 #>+ 2
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 #>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
 CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 3
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(kunittest_kconfigcompiler_test_la_SOURCES) \
 	$(test1_SOURCES) $(test2_SOURCES) $(test3_SOURCES) \
 	$(test4_SOURCES) $(test5_SOURCES) $(test6_SOURCES) \
@@ -186,8 +263,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -195,13 +270,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -215,8 +290,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -237,17 +310,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -316,7 +386,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -353,12 +422,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -403,87 +474,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -507,75 +534,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -583,16 +552,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -655,7 +623,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -693,9 +661,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 clean-checkLTLIBRARIES:
@@ -707,7 +675,7 @@
 	  rm -f "$${dir}/so_locations"; \
 	done
 kunittest_kconfigcompiler_test.la: $(kunittest_kconfigcompiler_test_la_OBJECTS) $(kunittest_kconfigcompiler_test_la_DEPENDENCIES) 
-	$(CXXLINK)  $(kunittest_kconfigcompiler_test_la_LDFLAGS) $(kunittest_kconfigcompiler_test_la_OBJECTS) $(kunittest_kconfigcompiler_test_la_LIBADD) $(LIBS)
+	$(kunittest_kconfigcompiler_test_la_LINK)  $(kunittest_kconfigcompiler_test_la_OBJECTS) $(kunittest_kconfigcompiler_test_la_LIBADD) $(LIBS)
 
 clean-checkPROGRAMS:
 	@list='$(check_PROGRAMS)'; for p in $$list; do \
@@ -717,34 +685,34 @@
 	done
 test1$(EXEEXT): $(test1_OBJECTS) $(test1_DEPENDENCIES) 
 	@rm -f test1$(EXEEXT)
-	$(CXXLINK) $(test1_LDFLAGS) $(test1_OBJECTS) $(test1_LDADD) $(LIBS)
+	$(test1_LINK) $(test1_OBJECTS) $(test1_LDADD) $(LIBS)
 test2$(EXEEXT): $(test2_OBJECTS) $(test2_DEPENDENCIES) 
 	@rm -f test2$(EXEEXT)
-	$(CXXLINK) $(test2_LDFLAGS) $(test2_OBJECTS) $(test2_LDADD) $(LIBS)
+	$(test2_LINK) $(test2_OBJECTS) $(test2_LDADD) $(LIBS)
 test3$(EXEEXT): $(test3_OBJECTS) $(test3_DEPENDENCIES) 
 	@rm -f test3$(EXEEXT)
-	$(CXXLINK) $(test3_LDFLAGS) $(test3_OBJECTS) $(test3_LDADD) $(LIBS)
+	$(test3_LINK) $(test3_OBJECTS) $(test3_LDADD) $(LIBS)
 test4$(EXEEXT): $(test4_OBJECTS) $(test4_DEPENDENCIES) 
 	@rm -f test4$(EXEEXT)
-	$(CXXLINK) $(test4_LDFLAGS) $(test4_OBJECTS) $(test4_LDADD) $(LIBS)
+	$(test4_LINK) $(test4_OBJECTS) $(test4_LDADD) $(LIBS)
 test5$(EXEEXT): $(test5_OBJECTS) $(test5_DEPENDENCIES) 
 	@rm -f test5$(EXEEXT)
-	$(CXXLINK) $(test5_LDFLAGS) $(test5_OBJECTS) $(test5_LDADD) $(LIBS)
+	$(test5_LINK) $(test5_OBJECTS) $(test5_LDADD) $(LIBS)
 test6$(EXEEXT): $(test6_OBJECTS) $(test6_DEPENDENCIES) 
 	@rm -f test6$(EXEEXT)
-	$(CXXLINK) $(test6_LDFLAGS) $(test6_OBJECTS) $(test6_LDADD) $(LIBS)
+	$(test6_LINK) $(test6_OBJECTS) $(test6_LDADD) $(LIBS)
 test7$(EXEEXT): $(test7_OBJECTS) $(test7_DEPENDENCIES) 
 	@rm -f test7$(EXEEXT)
-	$(CXXLINK) $(test7_LDFLAGS) $(test7_OBJECTS) $(test7_LDADD) $(LIBS)
+	$(test7_LINK) $(test7_OBJECTS) $(test7_LDADD) $(LIBS)
 test8$(EXEEXT): $(test8_OBJECTS) $(test8_DEPENDENCIES) 
 	@rm -f test8$(EXEEXT)
-	$(CXXLINK) $(test8_LDFLAGS) $(test8_OBJECTS) $(test8_LDADD) $(LIBS)
+	$(test8_LINK) $(test8_OBJECTS) $(test8_LDADD) $(LIBS)
 test9$(EXEEXT): $(test9_OBJECTS) $(test9_DEPENDENCIES) 
 	@rm -f test9$(EXEEXT)
-	$(CXXLINK) $(test9_LDFLAGS) $(test9_OBJECTS) $(test9_LDADD) $(LIBS)
+	$(test9_LINK) $(test9_OBJECTS) $(test9_LDADD) $(LIBS)
 test_dpointer$(EXEEXT): $(test_dpointer_OBJECTS) $(test_dpointer_DEPENDENCIES) 
 	@rm -f test_dpointer$(EXEEXT)
-	$(CXXLINK) $(test_dpointer_LDFLAGS) $(test_dpointer_OBJECTS) $(test_dpointer_LDADD) $(LIBS)
+	$(test_dpointer_LINK) $(test_dpointer_OBJECTS) $(test_dpointer_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -776,22 +744,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_dpointer_main.Po@am__quote@
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -802,10 +770,6 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -855,22 +819,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -925,7 +888,7 @@
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
@@ -939,12 +902,20 @@
 
 install-data-am:
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -965,19 +936,23 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am
+uninstall-am:
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean \
 	clean-checkLTLIBRARIES clean-checkPROGRAMS clean-generic \
 	clean-libtool ctags distclean distclean-compile \
 	distclean-generic distclean-libtool distclean-tags distdir dvi \
 	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-exec install-exec-am \
-	install-info install-info-am install-man install-strip \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
 	installcheck installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-info-am
+	tags uninstall uninstall-am
 
 
 test1main.o test1.o: test1.h
--- kdelibs-3.5.7.orig/kdecore/kconfig_compiler/example/Makefile.in
+++ kdelibs-3.5.7/kdecore/kconfig_compiler/example/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,15 +14,11 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -64,6 +60,13 @@
 @KDE_USE_FINAL_TRUE@autoexample_OBJECTS = $(autoexample_final_OBJECTS)
 am__DEPENDENCIES_1 =
 autoexample_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+#>- autoexample_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(autoexample_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+autoexample_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(autoexample_LDFLAGS) $(LDFLAGS) -o $@
 am_example_OBJECTS = example.$(OBJEXT) exampleprefs_base.$(OBJEXT)
 #>- example_OBJECTS = $(am_example_OBJECTS)
 #>+ 4
@@ -72,7 +75,14 @@
 @KDE_USE_FINAL_FALSE@example_OBJECTS = $(example_nofinal_OBJECTS)
 @KDE_USE_FINAL_TRUE@example_OBJECTS = $(example_final_OBJECTS)
 example_DEPENDENCIES = $(am__DEPENDENCIES_1)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+#>- example_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
+#>- 	$(example_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+example_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
+	$(example_LDFLAGS) $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -80,19 +90,21 @@
 #>+ 2
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 #>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
 CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 3
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(autoexample_SOURCES) $(example_SOURCES)
 DIST_SOURCES = $(autoexample_SOURCES) $(example_SOURCES)
 ETAGS = etags
@@ -103,8 +115,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -112,13 +122,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -132,8 +142,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -154,17 +162,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -233,7 +238,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -270,12 +274,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -320,87 +326,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -424,75 +386,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -500,16 +404,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -535,7 +438,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -573,9 +476,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 clean-checkPROGRAMS:
@@ -586,10 +489,10 @@
 	done
 autoexample$(EXEEXT): $(autoexample_OBJECTS) $(autoexample_DEPENDENCIES) 
 	@rm -f autoexample$(EXEEXT)
-	$(CXXLINK) $(autoexample_LDFLAGS) $(autoexample_OBJECTS) $(autoexample_LDADD) $(LIBS)
+	$(autoexample_LINK) $(autoexample_OBJECTS) $(autoexample_LDADD) $(LIBS)
 example$(EXEEXT): $(example_OBJECTS) $(example_DEPENDENCIES) 
 	@rm -f example$(EXEEXT)
-	$(CXXLINK) $(example_LDFLAGS) $(example_OBJECTS) $(example_LDADD) $(LIBS)
+	$(example_LINK) $(example_OBJECTS) $(example_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -602,22 +505,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/exampleprefs_base.Po@am__quote@
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -628,10 +531,6 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -681,22 +580,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -751,7 +649,7 @@
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
@@ -765,12 +663,20 @@
 
 install-data-am:
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -791,19 +697,23 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am
+uninstall-am:
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean \
 	clean-checkPROGRAMS clean-generic clean-libtool ctags \
 	distclean distclean-compile distclean-generic \
 	distclean-libtool distclean-tags distdir dvi dvi-am html \
 	html-am info info-am install install-am install-data \
-	install-data-am install-exec install-exec-am install-info \
-	install-info-am install-man install-strip installcheck \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
 	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-info-am
+	tags uninstall uninstall-am
 
 
 example.o exampleprefs_base.o: exampleprefs_base.h
--- kdelibs-3.5.7.orig/kdecore/kconfig_compiler/Makefile.in
+++ kdelibs-3.5.7/kdecore/kconfig_compiler/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -15,15 +15,11 @@
 
 @SET_MAKE@
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -62,7 +58,14 @@
 kconfig_compiler_OBJECTS = kconfig_compiler.$(OBJEXT)
 am__DEPENDENCIES_1 =
 kconfig_compiler_DEPENDENCIES = $(am__DEPENDENCIES_1)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+#>- kconfig_compiler_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(kconfig_compiler_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+kconfig_compiler_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(kconfig_compiler_LDFLAGS) $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -70,34 +73,40 @@
 #>+ 2
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 #>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
 CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 3
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(kconfig_compiler_SOURCES)
 DIST_SOURCES = $(kconfig_compiler_SOURCES)
 #>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 #>- 	html-recursive info-recursive install-data-recursive \
-#>- 	install-exec-recursive install-info-recursive \
-#>- 	install-recursive installcheck-recursive installdirs-recursive \
-#>- 	pdf-recursive ps-recursive uninstall-info-recursive \
-#>- 	uninstall-recursive
-#>+ 6
+#>- 	install-dvi-recursive install-exec-recursive \
+#>- 	install-html-recursive install-info-recursive \
+#>- 	install-pdf-recursive install-ps-recursive install-recursive \
+#>- 	installcheck-recursive installdirs-recursive pdf-recursive \
+#>- 	ps-recursive uninstall-recursive
+#>+ 7
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	html-recursive info-recursive install-data-recursive \
-	install-exec-recursive install-info-recursive \
-	install-recursive installcheck-recursive installdirs-recursive \
-	pdf-recursive ps-recursive uninstall-info-recursive \
-	uninstall-recursive nmcheck-recursive bcheck-recursive
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive nmcheck-recursive bcheck-recursive
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
@@ -107,8 +116,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -116,13 +123,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -136,8 +143,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -158,17 +163,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -237,7 +239,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -274,12 +275,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -324,87 +327,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -428,75 +387,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -504,16 +405,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -531,7 +431,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -569,13 +469,13 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
+	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
 	  if test -f $$p \
@@ -603,7 +503,7 @@
 	done
 kconfig_compiler$(EXEEXT): $(kconfig_compiler_OBJECTS) $(kconfig_compiler_DEPENDENCIES) 
 	@rm -f kconfig_compiler$(EXEEXT)
-	$(CXXLINK) $(kconfig_compiler_LDFLAGS) $(kconfig_compiler_OBJECTS) $(kconfig_compiler_LDADD) $(LIBS)
+	$(kconfig_compiler_LINK) $(kconfig_compiler_OBJECTS) $(kconfig_compiler_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -614,22 +514,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kconfig_compiler.Po@am__quote@
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -640,10 +540,6 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
 # To change the values of `make' variables: instead of editing Makefiles,
@@ -675,8 +571,7 @@
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
+$(RECURSIVE_CLEAN_TARGETS):
 	@failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
@@ -777,22 +672,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -806,7 +700,7 @@
 	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
-	    || $(mkdir_p) "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 	    || exit 1; \
 	    distdir=`$(am__cd) $(distdir) && pwd`; \
 	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
@@ -814,6 +708,8 @@
 	      $(MAKE) $(AM_MAKEFLAGS) \
 	        top_distdir="$$top_distdir" \
 	        distdir="$$distdir/$$subdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -825,7 +721,7 @@
 installdirs: installdirs-recursive
 installdirs-am:
 	for dir in "$(DESTDIR)$(bindir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-recursive
 install-exec: install-exec-recursive
@@ -863,7 +759,7 @@
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-recursive
 
@@ -877,12 +773,20 @@
 
 install-data-am:
 
+install-dvi: install-dvi-recursive
+
 install-exec-am: install-binPROGRAMS
 
+install-html: install-html-recursive
+
 install-info: install-info-recursive
 
 install-man:
 
+install-pdf: install-pdf-recursive
+
+install-ps: install-ps-recursive
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
@@ -903,24 +807,26 @@
 
 ps-am:
 
-uninstall-am: uninstall-binPROGRAMS uninstall-info-am
+uninstall-am: uninstall-binPROGRAMS
 
-uninstall-info: uninstall-info-recursive
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+	install-strip
 
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-	check-local clean clean-binPROGRAMS clean-generic \
-	clean-libtool clean-recursive ctags ctags-recursive distclean \
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+	all all-am check check-am check-local clean clean-binPROGRAMS \
+	clean-generic clean-libtool ctags ctags-recursive distclean \
 	distclean-compile distclean-generic distclean-libtool \
-	distclean-recursive distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-binPROGRAMS \
-	install-data install-data-am install-exec install-exec-am \
-	install-info install-info-am install-man install-strip \
-	installcheck installcheck-am installdirs installdirs-am \
-	maintainer-clean maintainer-clean-generic \
-	maintainer-clean-recursive mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
-	pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
-	uninstall-binPROGRAMS uninstall-info-am
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-binPROGRAMS install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs installdirs-am maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags tags-recursive uninstall uninstall-am \
+	uninstall-binPROGRAMS
 
 
 check-local:
--- kdelibs-3.5.7.orig/kdecore/svgicons/Makefile.in
+++ kdelibs-3.5.7/kdecore/svgicons/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,15 +16,11 @@
 @SET_MAKE@
 
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -63,7 +59,7 @@
 libkdesvgicons_la_nofinal_OBJECTS = ksvgiconengine.lo ksvgiconpainter.lo
 @KDE_USE_FINAL_FALSE@libkdesvgicons_la_OBJECTS = $(libkdesvgicons_la_nofinal_OBJECTS)
 @KDE_USE_FINAL_TRUE@libkdesvgicons_la_OBJECTS = $(libkdesvgicons_la_final_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -71,19 +67,21 @@
 #>+ 2
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 #>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
 CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 3
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(libkdesvgicons_la_SOURCES)
 DIST_SOURCES = $(libkdesvgicons_la_SOURCES)
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -103,8 +101,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -112,13 +108,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -132,8 +128,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -154,17 +148,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -233,7 +224,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -270,12 +260,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -320,87 +312,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -424,75 +372,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -500,16 +390,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -525,7 +414,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -563,9 +452,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 clean-noinstLTLIBRARIES:
@@ -577,7 +466,7 @@
 	  rm -f "$${dir}/so_locations"; \
 	done
 libkdesvgicons.la: $(libkdesvgicons_la_OBJECTS) $(libkdesvgicons_la_DEPENDENCIES) 
-	$(CXXLINK)  $(libkdesvgicons_la_LDFLAGS) $(libkdesvgicons_la_OBJECTS) $(libkdesvgicons_la_LIBADD) $(LIBS)
+	$(CXXLINK)  $(libkdesvgicons_la_OBJECTS) $(libkdesvgicons_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -589,22 +478,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ksvgiconpainter.Plo@am__quote@
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -614,13 +503,9 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 install-includeHEADERS: $(include_HEADERS)
 	@$(NORMAL_INSTALL)
-	test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"
+	test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)"
 	@list='$(include_HEADERS)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -685,22 +570,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -716,7 +600,7 @@
 all-am: Makefile $(LTLIBRARIES) $(HEADERS)
 installdirs:
 	for dir in "$(DESTDIR)$(includedir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -756,7 +640,7 @@
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
@@ -770,12 +654,20 @@
 
 install-data-am: install-includeHEADERS
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -796,20 +688,23 @@
 
 ps-am:
 
-uninstall-am: uninstall-includeHEADERS uninstall-info-am
+uninstall-am: uninstall-includeHEADERS
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-libtool clean-noinstLTLIBRARIES ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
 	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-exec \
-	install-exec-am install-includeHEADERS install-info \
-	install-info-am install-man install-strip installcheck \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-includeHEADERS install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
 	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-includeHEADERS \
-	uninstall-info-am
+	tags uninstall uninstall-am uninstall-includeHEADERS
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- kdelibs-3.5.7.orig/kdecore/network/Makefile.in
+++ kdelibs-3.5.7/kdecore/network/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -17,15 +17,11 @@
 
 
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -76,7 +72,7 @@
 	kbufferedsocket.lo ksocketbuffer.lo ksrvresolverworker.lo
 @KDE_USE_FINAL_FALSE@libkdecorenetwork_la_OBJECTS = $(libkdecorenetwork_la_nofinal_OBJECTS)
 @KDE_USE_FINAL_TRUE@libkdecorenetwork_la_OBJECTS = $(libkdecorenetwork_la_final_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -84,19 +80,21 @@
 #>+ 2
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 #>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
 CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 3
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(libkdecorenetwork_la_SOURCES)
 DIST_SOURCES = $(libkdecorenetwork_la_SOURCES)
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -118,8 +116,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -127,13 +123,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -147,8 +143,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -169,17 +163,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -248,7 +239,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -285,12 +275,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -335,87 +327,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -439,75 +387,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -515,16 +405,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -595,7 +484,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -633,9 +522,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 clean-noinstLTLIBRARIES:
@@ -647,7 +536,7 @@
 	  rm -f "$${dir}/so_locations"; \
 	done
 libkdecorenetwork.la: $(libkdecorenetwork_la_OBJECTS) $(libkdecorenetwork_la_DEPENDENCIES) 
-	$(CXXLINK)  $(libkdecorenetwork_la_LDFLAGS) $(libkdecorenetwork_la_OBJECTS) $(libkdecorenetwork_la_LIBADD) $(LIBS)
+	$(CXXLINK)  $(libkdecorenetwork_la_OBJECTS) $(libkdecorenetwork_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -674,22 +563,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kstreamsocket.Plo@am__quote@
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -699,13 +588,9 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 install-configDATA: $(config_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(configdir)" || $(mkdir_p) "$(DESTDIR)$(configdir)"
+	test -z "$(configdir)" || $(MKDIR_P) "$(DESTDIR)$(configdir)"
 	@list='$(config_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -722,7 +607,7 @@
 	done
 install-includeHEADERS: $(include_HEADERS)
 	@$(NORMAL_INSTALL)
-	test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"
+	test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)"
 	@list='$(include_HEADERS)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -787,22 +672,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -818,7 +702,7 @@
 all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS)
 installdirs:
 	for dir in "$(DESTDIR)$(configdir)" "$(DESTDIR)$(includedir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -858,7 +742,7 @@
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
@@ -872,12 +756,20 @@
 
 install-data-am: install-configDATA install-includeHEADERS
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -898,22 +790,24 @@
 
 ps-am:
 
-uninstall-am: uninstall-configDATA uninstall-includeHEADERS \
-	uninstall-info-am
+uninstall-am: uninstall-configDATA uninstall-includeHEADERS
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-libtool clean-noinstLTLIBRARIES ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
 	distclean-tags distdir dvi dvi-am html html-am info info-am \
 	install install-am install-configDATA install-data \
-	install-data-am install-exec install-exec-am \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am \
 	install-includeHEADERS install-info install-info-am \
-	install-man install-strip installcheck installcheck-am \
+	install-man install-pdf install-pdf-am install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
 	installdirs maintainer-clean maintainer-clean-generic \
 	mostlyclean mostlyclean-compile mostlyclean-generic \
 	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
-	uninstall-am uninstall-configDATA uninstall-includeHEADERS \
-	uninstall-info-am
+	uninstall-am uninstall-configDATA uninstall-includeHEADERS
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- kdelibs-3.5.7.orig/kdecore/Makefile.in
+++ kdelibs-3.5.7/kdecore/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -41,15 +41,11 @@
 
 
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -104,17 +100,21 @@
 	vsnprintf_nonpic.$(OBJEXT)
 @KDE_USE_FINAL_FALSE@libkdefakes_nonpic_a_OBJECTS = $(libkdefakes_nonpic_a_nofinal_OBJECTS)
 @KDE_USE_FINAL_TRUE@libkdefakes_nonpic_a_OBJECTS = $(libkdefakes_nonpic_a_final_OBJECTS)
+libkdefakes_pic_a_AR = $(AR) $(ARFLAGS)
+libkdefakes_pic_a_LIBADD =
+libkdefakes_pic_a_SOURCES = libkdefakes_pic.c
+#>- libkdefakes_pic_a_OBJECTS = libkdefakes_pic.$(OBJEXT)
+#>+ 1
+libkdefakes_pic_a_OBJECTS = libkdefakes_pic.$(OBJEXT)
 libLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(lib_LTLIBRARIES)
-@include_SVGICONS_TRUE@am__DEPENDENCIES_1 =  \
-@include_SVGICONS_TRUE@	svgicons/libkdesvgicons.la
-am__DEPENDENCIES_2 =
+am__DEPENDENCIES_1 =
 libkdecore_la_DEPENDENCIES = malloc/libklmalloc.la \
-	network/libkdecorenetwork.la $(am__DEPENDENCIES_1) \
-	../dcop/libDCOP.la ../libltdl/libltdlc.la \
-	$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_2) \
-	$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_2) \
-	$(am__DEPENDENCIES_2) ../kdefx/libkdefx.la
+	network/libkdecorenetwork.la $(SVGICON_LIB) ../dcop/libDCOP.la \
+	../libltdl/libltdlc.la $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	../kdefx/libkdefx.la
 am_libkdecore_la_OBJECTS = libintl.lo kapplication.lo kdebug.lo \
 	netwm.lo kconfigbase.lo kconfig.lo ksimpleconfig.lo \
 	kconfigbackend.lo kmanagerselection.lo kdesktopfile.lo \
@@ -182,7 +182,14 @@
 	ktimezones.lo ksycoca_skel.lo kappdcopiface_skel.lo kdebugdcopiface_skel.lo
 @KDE_USE_FINAL_FALSE@libkdecore_la_OBJECTS = $(libkdecore_la_nofinal_OBJECTS)
 @KDE_USE_FINAL_TRUE@libkdecore_la_OBJECTS = $(libkdecore_la_final_OBJECTS)
-libkdefakes_la_DEPENDENCIES = $(am__DEPENDENCIES_2)
+#>- libkdecore_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(libkdecore_la_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+libkdecore_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(libkdecore_la_LDFLAGS) $(LDFLAGS) -o $@
+libkdefakes_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
 am_libkdefakes_la_OBJECTS = fakes.lo vsnprintf.lo
 #>- libkdefakes_la_OBJECTS = $(am_libkdefakes_la_OBJECTS)
 #>+ 4
@@ -190,6 +197,9 @@
 libkdefakes_la_nofinal_OBJECTS = fakes.lo vsnprintf.lo
 @KDE_USE_FINAL_FALSE@libkdefakes_la_OBJECTS = $(libkdefakes_la_nofinal_OBJECTS)
 @KDE_USE_FINAL_TRUE@libkdefakes_la_OBJECTS = $(libkdefakes_la_final_OBJECTS)
+libkdefakes_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(libkdefakes_la_LDFLAGS) $(LDFLAGS) -o $@
 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(bin_PROGRAMS)
 am_kde_config_OBJECTS = kde-config.$(OBJEXT)
@@ -197,64 +207,81 @@
 #>+ 1
 kde_config_OBJECTS = kde-config.$(OBJEXT)
 kde_config_DEPENDENCIES = ./libkdecore.la
+#>- kde_config_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(kde_config_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+kde_config_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(kde_config_LDFLAGS) $(LDFLAGS) -o $@
 am_kgrantpty_OBJECTS = kgrantpty-kgrantpty.$(OBJEXT)
 #>- kgrantpty_OBJECTS = $(am_kgrantpty_OBJECTS)
 #>+ 1
 kgrantpty_OBJECTS = kgrantpty-kgrantpty.$(OBJEXT)
 kgrantpty_DEPENDENCIES = ./libkdefakes.la
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I. -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+kgrantpty_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(kgrantpty_CFLAGS) \
+	$(CFLAGS) $(kgrantpty_LDFLAGS) $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 #>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 #>+ 2
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
-#>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+#>+ 3
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
 CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-SOURCES = $(libkdefakes_nonpic_a_SOURCES) $(libkdecore_la_SOURCES) \
-	$(libkdefakes_la_SOURCES) $(kde_config_SOURCES) \
-	$(kgrantpty_SOURCES)
-DIST_SOURCES = $(libkdefakes_nonpic_a_SOURCES) \
+#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 3
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
+SOURCES = $(libkdefakes_nonpic_a_SOURCES) libkdefakes_pic.c \
+	$(libkdecore_la_SOURCES) $(libkdefakes_la_SOURCES) \
+	$(kde_config_SOURCES) $(kgrantpty_SOURCES)
+DIST_SOURCES = $(libkdefakes_nonpic_a_SOURCES) libkdefakes_pic.c \
 	$(libkdecore_la_SOURCES) $(libkdefakes_la_SOURCES) \
 	$(kde_config_SOURCES) $(kgrantpty_SOURCES)
 #>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 #>- 	html-recursive info-recursive install-data-recursive \
-#>- 	install-exec-recursive install-info-recursive \
-#>- 	install-recursive installcheck-recursive installdirs-recursive \
-#>- 	pdf-recursive ps-recursive uninstall-info-recursive \
-#>- 	uninstall-recursive
-#>+ 6
+#>- 	install-dvi-recursive install-exec-recursive \
+#>- 	install-html-recursive install-info-recursive \
+#>- 	install-pdf-recursive install-ps-recursive install-recursive \
+#>- 	installcheck-recursive installdirs-recursive pdf-recursive \
+#>- 	ps-recursive uninstall-recursive
+#>+ 7
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	html-recursive info-recursive install-data-recursive \
-	install-exec-recursive install-info-recursive \
-	install-recursive installcheck-recursive installdirs-recursive \
-	pdf-recursive ps-recursive uninstall-info-recursive \
-	uninstall-recursive nmcheck-recursive bcheck-recursive
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive nmcheck-recursive bcheck-recursive
 colorsDATA_INSTALL = $(INSTALL_DATA)
 kdebugDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(colors_DATA) $(kdebug_DATA)
 includeHEADERS_INSTALL = $(INSTALL_HEADER)
 HEADERS = $(include_HEADERS) $(noinst_HEADERS)
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = malloc network svgicons . kconfig_compiler tests
@@ -264,8 +291,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -273,13 +298,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -293,8 +318,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -315,17 +338,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -394,7 +414,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -431,12 +450,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -481,87 +502,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -585,75 +562,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -661,16 +580,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -685,7 +603,7 @@
 # into $(all_libraries) isn't better
 AM_LDFLAGS = $(LDFLAGS_AS_NEEDED) $(LDFLAGS_NEW_DTAGS)
 lib_LTLIBRARIES = libkdefakes.la libkdecore.la
-lib_LIBRARIES = libkdefakes_nonpic.a
+lib_LIBRARIES = libkdefakes_nonpic.a libkdefakes_pic.a
 include_HEADERS = kconfig.h kconfigskeleton.h \
 	kconfigdata.h ksimpleconfig.h kconfigdialogmanager.h \
 	kconfigbase.h kdesktopfile.h kurl.h ksock.h kaboutdata.h \
@@ -787,9 +705,7 @@
 	kuser.cpp kconfigskeleton.cpp kconfigdialogmanager.cpp klockfile.cpp \
 	kqiodevicegzip_p.cpp ktimezones.cpp ksycoca_skel.cpp kappdcopiface_skel.cpp kdebugdcopiface_skel.cpp
 
-#>- libkdecore_la_LDFLAGS = $(QT_LDFLAGS) $(KDE_RPATH) $(KDE_MT_LDFLAGS) $(X_LDFLAGS) $(USER_LDFLAGS) -version-info 6:0:2 -no-undefined
-#>+ 1
-libkdecore_la_LDFLAGS = $(QT_LDFLAGS) $(KDE_RPATH) $(KDE_MT_LDFLAGS) $(X_LDFLAGS) $(USER_LDFLAGS) -version-info 6:0:2 -no-undefined $(KDE_NO_UNDEFINED)
+libkdecore_la_LDFLAGS = $(QT_LDFLAGS) $(KDE_RPATH) $(KDE_MT_LDFLAGS) $(X_LDFLAGS) $(USER_LDFLAGS) -version-info 6:0:2 -no-undefined
 libkdecore_la_LIBADD = malloc/libklmalloc.la network/libkdecorenetwork.la $(SVGICON_LIB) ../dcop/libDCOP.la ../libltdl/libltdlc.la $(LIB_XEXT) $(LIBRESOLV) $(LIBUTIL) $(LIBART_LIBS) $(LIB_IDN) ../kdefx/libkdefx.la
 libkdecore_la_NMCHECK = $(srcdir)/libkdecore.nmcheck
 libkdecore_la_NMCHECKWEAK = $(srcdir)/libkdecore_weak.nmcheck $(srcdir)/libqt-mt_weak.nmcheck \
@@ -826,7 +742,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .c .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(srcdir)/../admin/Doxyfile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../admin/Doxyfile.am $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -864,21 +780,21 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 kdemacros.h: stamp-h3
 	@if test ! -f $@; then \
 	  rm -f stamp-h3; \
-	  $(MAKE) stamp-h3; \
+	  $(MAKE) $(AM_MAKEFLAGS) stamp-h3; \
 	else :; fi
 
 stamp-h3: $(srcdir)/kdemacros.h.in $(top_builddir)/config.status
 	@rm -f stamp-h3
 	cd $(top_builddir) && $(SHELL) ./config.status kdecore/kdemacros.h
-$(srcdir)/kdemacros.h.in:  $(am__configure_deps) 
+$(srcdir)/kdemacros.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) 
 	cd $(top_srcdir) && $(AUTOHEADER)
 	rm -f stamp-h3
 	touch $@
@@ -889,7 +805,7 @@
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 install-libLIBRARIES: $(lib_LIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
 	@list='$(lib_LIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
@@ -922,7 +838,7 @@
 	$(RANLIB) libkdefakes_nonpic.a
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
@@ -933,7 +849,7 @@
 
 uninstall-libLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
@@ -947,19 +863,13 @@
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
-#>- libkdecore.la: $(libkdecore_la_OBJECTS) $(libkdecore_la_DEPENDENCIES) 
-#>+ 2
-@KDE_USE_CLOSURE_TRUE@libkdecore.la: libkdecore.la.closure $(libkdecore_la_OBJECTS) $(libkdecore_la_DEPENDENCIES) 
-@KDE_USE_CLOSURE_FALSE@libkdecore.la: $(libkdecore_la_OBJECTS) $(libkdecore_la_DEPENDENCIES) 
-#>- 	$(CXXLINK) -rpath $(libdir) $(libkdecore_la_LDFLAGS) $(libkdecore_la_OBJECTS) $(libkdecore_la_LIBADD) $(LIBS)
-#>+ 2
-	$(CXXLINK) -rpath $(libdir) $(libkdecore_la_LDFLAGS) $(libkdecore_la_OBJECTS) $(libkdecore_la_LIBADD) $(LIBS)
-@KDE_USE_NMCHECK_TRUE@	@$(MAKE) $(AM_MAKEFLAGS) nmcheck_libkdecore.la || ( rm -f libkdecore.la; exit 1 )
+libkdecore.la: $(libkdecore_la_OBJECTS) $(libkdecore_la_DEPENDENCIES) 
+	$(libkdecore_la_LINK) -rpath $(libdir) $(libkdecore_la_OBJECTS) $(libkdecore_la_LIBADD) $(LIBS)
 libkdefakes.la: $(libkdefakes_la_OBJECTS) $(libkdefakes_la_DEPENDENCIES) 
-	$(LINK) -rpath $(libdir) $(libkdefakes_la_LDFLAGS) $(libkdefakes_la_OBJECTS) $(libkdefakes_la_LIBADD) $(LIBS)
+	$(libkdefakes_la_LINK) -rpath $(libdir) $(libkdefakes_la_OBJECTS) $(libkdefakes_la_LIBADD) $(LIBS)
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
+	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
 	  if test -f $$p \
@@ -987,10 +897,10 @@
 	done
 kde-config$(EXEEXT): $(kde_config_OBJECTS) $(kde_config_DEPENDENCIES) 
 	@rm -f kde-config$(EXEEXT)
-	$(CXXLINK) $(kde_config_LDFLAGS) $(kde_config_OBJECTS) $(kde_config_LDADD) $(LIBS)
+	$(kde_config_LINK) $(kde_config_OBJECTS) $(kde_config_LDADD) $(LIBS)
 kgrantpty$(EXEEXT): $(kgrantpty_OBJECTS) $(kgrantpty_DEPENDENCIES) 
 	@rm -f kgrantpty$(EXEEXT)
-	$(LINK) $(kgrantpty_LDFLAGS) $(kgrantpty_OBJECTS) $(kgrantpty_LDADD) $(LIBS)
+	$(kgrantpty_LINK) $(kgrantpty_OBJECTS) $(kgrantpty_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -1104,63 +1014,64 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kxerrorhandler.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kxmessages.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libintl.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkdefakes_pic.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/netsupp.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/netwm.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vsnprintf.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vsnprintf_nonpic.Po@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
 kgrantpty-kgrantpty.o: kgrantpty.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kgrantpty_CFLAGS) $(CFLAGS) -MT kgrantpty-kgrantpty.o -MD -MP -MF "$(DEPDIR)/kgrantpty-kgrantpty.Tpo" -c -o kgrantpty-kgrantpty.o `test -f 'kgrantpty.c' || echo '$(srcdir)/'`kgrantpty.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/kgrantpty-kgrantpty.Tpo" "$(DEPDIR)/kgrantpty-kgrantpty.Po"; else rm -f "$(DEPDIR)/kgrantpty-kgrantpty.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kgrantpty_CFLAGS) $(CFLAGS) -MT kgrantpty-kgrantpty.o -MD -MP -MF $(DEPDIR)/kgrantpty-kgrantpty.Tpo -c -o kgrantpty-kgrantpty.o `test -f 'kgrantpty.c' || echo '$(srcdir)/'`kgrantpty.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/kgrantpty-kgrantpty.Tpo $(DEPDIR)/kgrantpty-kgrantpty.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='kgrantpty.c' object='kgrantpty-kgrantpty.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kgrantpty_CFLAGS) $(CFLAGS) -c -o kgrantpty-kgrantpty.o `test -f 'kgrantpty.c' || echo '$(srcdir)/'`kgrantpty.c
 
 kgrantpty-kgrantpty.obj: kgrantpty.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kgrantpty_CFLAGS) $(CFLAGS) -MT kgrantpty-kgrantpty.obj -MD -MP -MF "$(DEPDIR)/kgrantpty-kgrantpty.Tpo" -c -o kgrantpty-kgrantpty.obj `if test -f 'kgrantpty.c'; then $(CYGPATH_W) 'kgrantpty.c'; else $(CYGPATH_W) '$(srcdir)/kgrantpty.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/kgrantpty-kgrantpty.Tpo" "$(DEPDIR)/kgrantpty-kgrantpty.Po"; else rm -f "$(DEPDIR)/kgrantpty-kgrantpty.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kgrantpty_CFLAGS) $(CFLAGS) -MT kgrantpty-kgrantpty.obj -MD -MP -MF $(DEPDIR)/kgrantpty-kgrantpty.Tpo -c -o kgrantpty-kgrantpty.obj `if test -f 'kgrantpty.c'; then $(CYGPATH_W) 'kgrantpty.c'; else $(CYGPATH_W) '$(srcdir)/kgrantpty.c'; fi`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/kgrantpty-kgrantpty.Tpo $(DEPDIR)/kgrantpty-kgrantpty.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='kgrantpty.c' object='kgrantpty-kgrantpty.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kgrantpty_CFLAGS) $(CFLAGS) -c -o kgrantpty-kgrantpty.obj `if test -f 'kgrantpty.c'; then $(CYGPATH_W) 'kgrantpty.c'; else $(CYGPATH_W) '$(srcdir)/kgrantpty.c'; fi`
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -1170,13 +1081,9 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 install-colorsDATA: $(colors_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(colorsdir)" || $(mkdir_p) "$(DESTDIR)$(colorsdir)"
+	test -z "$(colorsdir)" || $(MKDIR_P) "$(DESTDIR)$(colorsdir)"
 	@list='$(colors_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -1193,7 +1100,7 @@
 	done
 install-kdebugDATA: $(kdebug_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(kdebugdir)" || $(mkdir_p) "$(DESTDIR)$(kdebugdir)"
+	test -z "$(kdebugdir)" || $(MKDIR_P) "$(DESTDIR)$(kdebugdir)"
 	@list='$(kdebug_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -1210,7 +1117,7 @@
 	done
 install-includeHEADERS: $(include_HEADERS)
 	@$(NORMAL_INSTALL)
-	test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"
+	test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)"
 	@list='$(include_HEADERS)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -1257,8 +1164,7 @@
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
+$(RECURSIVE_CLEAN_TARGETS):
 	@failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
@@ -1359,23 +1265,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	$(mkdir_p) $(distdir)/../admin
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -1389,7 +1293,7 @@
 	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
-	    || $(mkdir_p) "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 	    || exit 1; \
 	    distdir=`$(am__cd) $(distdir) && pwd`; \
 	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
@@ -1397,6 +1301,8 @@
 	      $(MAKE) $(AM_MAKEFLAGS) \
 	        top_distdir="$$top_distdir" \
 	        distdir="$$distdir/$$subdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -1410,7 +1316,7 @@
 installdirs: installdirs-recursive
 installdirs-am:
 	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(colorsdir)" "$(DESTDIR)$(kdebugdir)" "$(DESTDIR)$(includedir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-recursive
 install-exec: install-exec-recursive
@@ -1444,14 +1350,14 @@
 #>- clean-am: clean-binPROGRAMS clean-generic clean-libLIBRARIES \
 #>- 	clean-libLTLIBRARIES clean-libtool mostlyclean-am
 #>+ 2
-clean-am: clean-metasources clean-idl clean-closures clean-bcheck clean-final  clean-binPROGRAMS clean-generic clean-libLIBRARIES \
+clean-am: clean-metasources clean-idl clean-bcheck clean-final  clean-binPROGRAMS clean-generic clean-libLIBRARIES \
 	clean-libLTLIBRARIES clean-libtool mostlyclean-am
 
 distclean: distclean-recursive
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-hdr distclean-libtool distclean-tags
+	distclean-hdr distclean-tags
 
 dvi: dvi-recursive
 
@@ -1466,15 +1372,23 @@
 install-data-am: install-colorsDATA install-data-local \
 	install-includeHEADERS install-kdebugDATA
 
+install-dvi: install-dvi-recursive
+
 install-exec-am: install-binPROGRAMS install-libLIBRARIES \
 	install-libLTLIBRARIES
 	@$(NORMAL_INSTALL)
 	$(MAKE) $(AM_MAKEFLAGS) install-exec-hook
 
+install-html: install-html-recursive
+
 install-info: install-info-recursive
 
 install-man:
 
+install-pdf: install-pdf-recursive
+
+install-ps: install-ps-recursive
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
@@ -1496,32 +1410,35 @@
 ps-am:
 
 uninstall-am: uninstall-binPROGRAMS uninstall-colorsDATA \
-	uninstall-includeHEADERS uninstall-info-am \
-	uninstall-kdebugDATA uninstall-libLIBRARIES \
-	uninstall-libLTLIBRARIES uninstall-local
-
-uninstall-info: uninstall-info-recursive
-
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-	clean clean-binPROGRAMS clean-generic clean-libLIBRARIES \
-	clean-libLTLIBRARIES clean-libtool clean-recursive ctags \
-	ctags-recursive distclean distclean-compile distclean-generic \
-	distclean-hdr distclean-libtool distclean-recursive \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-binPROGRAMS install-colorsDATA \
-	install-data install-data-am install-data-local install-exec \
-	install-exec-am install-exec-hook install-includeHEADERS \
-	install-info install-info-am install-kdebugDATA \
-	install-libLIBRARIES install-libLTLIBRARIES install-man \
-	install-strip installcheck installcheck-am installdirs \
-	installdirs-am maintainer-clean maintainer-clean-generic \
-	maintainer-clean-recursive mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
-	pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
+	uninstall-includeHEADERS uninstall-kdebugDATA \
+	uninstall-libLIBRARIES uninstall-libLTLIBRARIES \
+	uninstall-local
+
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+	install-exec-am install-strip
+
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+	all all-am check check-am clean clean-binPROGRAMS \
+	clean-generic clean-libLIBRARIES clean-libLTLIBRARIES \
+	clean-libtool ctags ctags-recursive distclean \
+	distclean-compile distclean-generic distclean-hdr \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-binPROGRAMS \
+	install-colorsDATA install-data install-data-am \
+	install-data-local install-dvi install-dvi-am install-exec \
+	install-exec-am install-exec-hook install-html install-html-am \
+	install-includeHEADERS install-info install-info-am \
+	install-kdebugDATA install-libLIBRARIES install-libLTLIBRARIES \
+	install-man install-pdf install-pdf-am install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs installdirs-am maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags tags-recursive uninstall uninstall-am \
 	uninstall-binPROGRAMS uninstall-colorsDATA \
-	uninstall-includeHEADERS uninstall-info-am \
-	uninstall-kdebugDATA uninstall-libLIBRARIES \
-	uninstall-libLTLIBRARIES uninstall-local
+	uninstall-includeHEADERS uninstall-kdebugDATA \
+	uninstall-libLIBRARIES uninstall-libLTLIBRARIES \
+	uninstall-local
 
 
 fakes_nonpic.c:$(srcdir)/fakes.c
@@ -1532,6 +1449,12 @@
 	-rm -f vsnprintf_nonpic.c
 	$(LN_S) $(srcdir)/vsnprintf.c vsnprintf_nonpic.c
 
+libkdefakes_pic.a: libkdefakes.la
+	-rm -f libkdefakes_pic.a fakes_pic.o vsnprintf_pic.o
+	cp -f .libs/fakes.o fakes_pic.o; cp -f .libs/vsnprintf.o vsnprintf_pic.o
+	ar cru libkdefakes_pic.a fakes_pic.o vsnprintf_pic.o
+	ranlib libkdefakes_pic.a
+
 .PHONY: kckey_h parser
 kckey_h : $(srcdir)/generate_keys.sh $(QNAMESPACE_H)
 	(cd $(srcdir) && ./generate_keys.sh $(QNAMESPACE_H))
@@ -1673,15 +1596,6 @@
 kdebugdcopiface_skel.cpp: kdebugdcopiface.kidl
 	$(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub kdebugdcopiface.kidl
 
-#>+ 8
-libkdecore.la.closure: $(libkdecore_la_OBJECTS) $(libkdecore_la_DEPENDENCIES)
-	@echo "int main() {return 0;}" > libkdecore_la_closure.cpp
-	@$(LTCXXCOMPILE) -c libkdecore_la_closure.cpp
-	$(CXXLINK) libkdecore_la_closure.lo $(libkdecore_la_LDFLAGS) $(libkdecore_la_OBJECTS) $(libkdecore_la_LIBADD) $(LIBS)
-	@rm -f libkdecore_la_closure.* libkdecore.la.closure
-	@echo "timestamp" > libkdecore.la.closure
-
-
 #>+ 5
 
 nmcheck_libkdecore.la: libkdecore.la 
@@ -1940,10 +1854,6 @@
 	kappdcopiface_skel.cpp kappdcopiface_skel.h kappdcopiface.kidl \
 	kdebugdcopiface_skel.cpp kdebugdcopiface_skel.h kdebugdcopiface.kidl 
 
-#>+ 3
-clean-closures:
-	-rm -f  libkdecore.la.closure
-
 #>+ 2
 docs-am:
 
--- kdelibs-3.5.7.orig/kdecore/malloc/Makefile.in
+++ kdelibs-3.5.7/kdecore/malloc/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -37,15 +37,11 @@
 #    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 #    Boston, MA 02110-1301, USA.
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -80,17 +76,18 @@
 #>- libklmalloc_la_OBJECTS = $(am_libklmalloc_la_OBJECTS)
 #>+ 1
 libklmalloc_la_OBJECTS = malloc.lo
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(libklmalloc_la_SOURCES)
 DIST_SOURCES = $(libklmalloc_la_SOURCES)
 ETAGS = etags
@@ -101,8 +98,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -110,13 +105,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -130,8 +125,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -152,17 +145,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -231,7 +221,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -268,12 +257,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -318,87 +309,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -422,75 +369,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -498,16 +387,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -524,7 +412,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -562,9 +450,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 clean-noinstLTLIBRARIES:
@@ -576,7 +464,7 @@
 	  rm -f "$${dir}/so_locations"; \
 	done
 libklmalloc.la: $(libklmalloc_la_OBJECTS) $(libklmalloc_la_DEPENDENCIES) 
-	$(LINK)  $(libklmalloc_la_LDFLAGS) $(libklmalloc_la_OBJECTS) $(libklmalloc_la_LIBADD) $(LIBS)
+	$(LINK)  $(libklmalloc_la_OBJECTS) $(libklmalloc_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -587,22 +475,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/malloc.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
@@ -613,10 +501,6 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -666,22 +550,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -734,7 +617,7 @@
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
@@ -748,12 +631,20 @@
 
 install-data-am:
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -774,19 +665,22 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am
+uninstall-am:
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-libtool clean-noinstLTLIBRARIES ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
 	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-exec \
-	install-exec-am install-info install-info-am install-man \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
 	install-strip installcheck installcheck-am installdirs \
 	maintainer-clean maintainer-clean-generic mostlyclean \
 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-	pdf pdf-am ps ps-am tags uninstall uninstall-am \
-	uninstall-info-am
+	pdf pdf-am ps ps-am tags uninstall uninstall-am
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- kdelibs-3.5.7.orig/kimgio/Makefile.in
+++ kdelibs-3.5.7/kimgio/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -17,15 +17,11 @@
 
 
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -72,17 +68,38 @@
 #>- kimg_dds_la_OBJECTS = $(am_kimg_dds_la_OBJECTS)
 #>+ 1
 kimg_dds_la_OBJECTS = dds.lo
+#>- kimg_dds_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(kimg_dds_la_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+kimg_dds_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(kimg_dds_la_LDFLAGS) $(LDFLAGS) -o $@
 kimg_eps_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
 am_kimg_eps_la_OBJECTS = eps.lo
 #>- kimg_eps_la_OBJECTS = $(am_kimg_eps_la_OBJECTS)
 #>+ 1
 kimg_eps_la_OBJECTS = eps.lo
+#>- kimg_eps_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(kimg_eps_la_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+kimg_eps_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(kimg_eps_la_LDFLAGS) $(LDFLAGS) -o $@
 kimg_exr_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1)
 am_kimg_exr_la_OBJECTS = exr.lo
 #>- kimg_exr_la_OBJECTS = $(am_kimg_exr_la_OBJECTS)
 #>+ 1
 kimg_exr_la_OBJECTS = exr.lo
+#>- kimg_exr_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(kimg_exr_la_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+kimg_exr_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(kimg_exr_la_LDFLAGS) $(LDFLAGS) -o $@
 @include_EXR_MODULES_TRUE@am_kimg_exr_la_rpath = -rpath \
 @include_EXR_MODULES_TRUE@	$(kde_moduledir)
 kimg_hdr_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
@@ -90,17 +107,38 @@
 #>- kimg_hdr_la_OBJECTS = $(am_kimg_hdr_la_OBJECTS)
 #>+ 1
 kimg_hdr_la_OBJECTS = hdr.lo
+#>- kimg_hdr_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(kimg_hdr_la_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+kimg_hdr_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(kimg_hdr_la_LDFLAGS) $(LDFLAGS) -o $@
 kimg_ico_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
 am_kimg_ico_la_OBJECTS = ico.lo
 #>- kimg_ico_la_OBJECTS = $(am_kimg_ico_la_OBJECTS)
 #>+ 1
 kimg_ico_la_OBJECTS = ico.lo
+#>- kimg_ico_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(kimg_ico_la_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+kimg_ico_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(kimg_ico_la_LDFLAGS) $(LDFLAGS) -o $@
 kimg_jp2_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	../kdecore/libkdecore.la
 am_kimg_jp2_la_OBJECTS = jp2.lo
 #>- kimg_jp2_la_OBJECTS = $(am_kimg_jp2_la_OBJECTS)
 #>+ 1
 kimg_jp2_la_OBJECTS = jp2.lo
+#>- kimg_jp2_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(kimg_jp2_la_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+kimg_jp2_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(kimg_jp2_la_LDFLAGS) $(LDFLAGS) -o $@
 @include_JP2_MODULES_TRUE@am_kimg_jp2_la_rpath = -rpath \
 @include_JP2_MODULES_TRUE@	$(kde_moduledir)
 kimg_pcx_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
@@ -108,27 +146,62 @@
 #>- kimg_pcx_la_OBJECTS = $(am_kimg_pcx_la_OBJECTS)
 #>+ 1
 kimg_pcx_la_OBJECTS = pcx.lo
+#>- kimg_pcx_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(kimg_pcx_la_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+kimg_pcx_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(kimg_pcx_la_LDFLAGS) $(LDFLAGS) -o $@
 kimg_psd_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 am_kimg_psd_la_OBJECTS = psd.lo
 #>- kimg_psd_la_OBJECTS = $(am_kimg_psd_la_OBJECTS)
 #>+ 1
 kimg_psd_la_OBJECTS = psd.lo
+#>- kimg_psd_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(kimg_psd_la_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+kimg_psd_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(kimg_psd_la_LDFLAGS) $(LDFLAGS) -o $@
 kimg_rgb_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 am_kimg_rgb_la_OBJECTS = rgb.lo
 #>- kimg_rgb_la_OBJECTS = $(am_kimg_rgb_la_OBJECTS)
 #>+ 1
 kimg_rgb_la_OBJECTS = rgb.lo
+#>- kimg_rgb_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(kimg_rgb_la_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+kimg_rgb_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(kimg_rgb_la_LDFLAGS) $(LDFLAGS) -o $@
 kimg_tga_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 am_kimg_tga_la_OBJECTS = tga.lo
 #>- kimg_tga_la_OBJECTS = $(am_kimg_tga_la_OBJECTS)
 #>+ 1
 kimg_tga_la_OBJECTS = tga.lo
+#>- kimg_tga_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(kimg_tga_la_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+kimg_tga_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(kimg_tga_la_LDFLAGS) $(LDFLAGS) -o $@
 kimg_tiff_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1)
 am_kimg_tiff_la_OBJECTS = tiffr.lo
 #>- kimg_tiff_la_OBJECTS = $(am_kimg_tiff_la_OBJECTS)
 #>+ 1
 kimg_tiff_la_OBJECTS = tiffr.lo
+#>- kimg_tiff_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(kimg_tiff_la_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+kimg_tiff_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(kimg_tiff_la_LDFLAGS) $(LDFLAGS) -o $@
 @include_TIFF_MODULES_TRUE@am_kimg_tiff_la_rpath = -rpath \
 @include_TIFF_MODULES_TRUE@	$(kde_moduledir)
 kimg_xcf_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
@@ -136,12 +209,26 @@
 #>- kimg_xcf_la_OBJECTS = $(am_kimg_xcf_la_OBJECTS)
 #>+ 1
 kimg_xcf_la_OBJECTS = xcf.lo
+#>- kimg_xcf_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(kimg_xcf_la_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+kimg_xcf_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(kimg_xcf_la_LDFLAGS) $(LDFLAGS) -o $@
 kimg_xview_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
 am_kimg_xview_la_OBJECTS = xview.lo
 #>- kimg_xview_la_OBJECTS = $(am_kimg_xview_la_OBJECTS)
 #>+ 1
 kimg_xview_la_OBJECTS = xview.lo
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+#>- kimg_xview_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+#>- 	$(CXXFLAGS) $(kimg_xview_la_LDFLAGS) $(LDFLAGS) -o $@
+#>+ 3
+kimg_xview_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(kimg_xview_la_LDFLAGS) $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -149,19 +236,21 @@
 #>+ 2
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
-#>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+#>+ 3
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
 CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+#>- 	$(LDFLAGS) -o $@
+#>+ 3
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(kimg_dds_la_SOURCES) $(kimg_eps_la_SOURCES) \
 	$(kimg_exr_la_SOURCES) $(kimg_hdr_la_SOURCES) \
 	$(kimg_ico_la_SOURCES) $(kimg_jp2_la_SOURCES) \
@@ -187,8 +276,6 @@
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 ARTSCCONFIG = @ARTSCCONFIG@
@@ -196,13 +283,13 @@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AVAHI_CFLAGS = @AVAHI_CFLAGS@
+AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONF_FILES = @CONF_FILES@
-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -216,8 +303,6 @@
 DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOJAVA_FALSE = @DOJAVA_FALSE@
-DOJAVA_TRUE = @DOJAVA_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
 DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
@@ -238,17 +323,14 @@
 GSSAPI_INCS = @GSSAPI_INCS@
 GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSAPI_RPATH = @GSSAPI_RPATH@
-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
 HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
 HAVE_MITSHM = @HAVE_MITSHM@
 HAVE_SENDFILE = @HAVE_SENDFILE@
 HELP_SUBDIR = @HELP_SUBDIR@
 ICE_RLIB = @ICE_RLIB@
 ICE_SUBDIR = @ICE_SUBDIR@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -317,7 +399,6 @@
 LIBXSLT_RPATH = @LIBXSLT_RPATH@
 LIBZ = @LIBZ@
 LIB_CUPS = @LIB_CUPS@
-LIB_DNSSD = @LIB_DNSSD@
 LIB_EXR = @LIB_EXR@
 LIB_IDN = @LIB_IDN@
 LIB_JASPER = @LIB_JASPER@
@@ -354,12 +435,14 @@
 LUA = @LUA@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MD5SUM = @MD5SUM@
 MEINPROC = @MEINPROC@
 MEINPROC_DEP = @MEINPROC_DEP@
+MKDIR_P = @MKDIR_P@
 MOC = @MOC@
 MSGFMT = @MSGFMT@
 NOOPT_CFLAGS = @NOOPT_CFLAGS@
@@ -404,87 +487,43 @@
 X_LDFLAGS = @X_LDFLAGS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_RPATH = @X_RPATH@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_modeldir = @cups_modeldir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_BZIP2_FALSE = @include_BZIP2_FALSE@
-include_BZIP2_TRUE = @include_BZIP2_TRUE@
-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
-include_bzip2_FALSE = @include_bzip2_FALSE@
-include_bzip2_TRUE = @include_bzip2_TRUE@
-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
 kde_appsdir = @kde_appsdir@
 kde_bindir = @kde_bindir@
 kde_confdir = @kde_confdir@
@@ -508,75 +547,17 @@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
 kdeinitdir = @kdeinitdir@
-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 path_su = @path_su@
 path_sudo = @path_sudo@
 pdfdir = @pdfdir@
-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -584,16 +565,15 @@
 qt_libraries = @qt_libraries@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 xdg_appsdir = @xdg_appsdir@
@@ -613,73 +593,47 @@
 
 KIMGIO_PLUGIN = -avoid-version -export-symbols-regex 'kimgio_.*_(read|write)'
 kimg_tiff_la_SOURCES = tiffr.cpp
-#>- kimg_tiff_la_LDFLAGS = -module $(KIMGIO_PLUGIN) -no-undefined $(all_libraries)
-#>+ 1
-kimg_tiff_la_LDFLAGS = -module $(KIMGIO_PLUGIN) -no-undefined $(KDE_NO_UNDEFINED) $(all_libraries)
+kimg_tiff_la_LDFLAGS = -module $(KIMGIO_PLUGIN) -no-undefined $(all_libraries)
 kimg_tiff_la_LIBADD = $(LIBTIFF) $(LIB_QT)
 
 #kimg_g3_la_SOURCES = g3r.cpp
 #kimg_g3_la_LDFLAGS = -module $(USER_LDFLAGS) $(KIMGIO_PLUGIN) -no-undefined
 #kimg_g3_la_LIBADD = $(LIBTIFF)   
 kimg_xview_la_SOURCES = xview.cpp
-#>- kimg_xview_la_LDFLAGS = -module $(KIMGIO_PLUGIN) -no-undefined $(all_libraries)
-#>+ 1
-kimg_xview_la_LDFLAGS = -module $(KIMGIO_PLUGIN) -no-undefined $(KDE_NO_UNDEFINED) $(all_libraries)
+kimg_xview_la_LDFLAGS = -module $(KIMGIO_PLUGIN) -no-undefined $(all_libraries)
 kimg_xview_la_LIBADD = $(LIB_QT)
 kimg_eps_la_SOURCES = eps.cpp
-#>- kimg_eps_la_LDFLAGS = -module $(KIMGIO_PLUGIN) -no-undefined $(all_libraries)
-#>+ 1
-kimg_eps_la_LDFLAGS = -module $(KIMGIO_PLUGIN) -no-undefined $(KDE_NO_UNDEFINED) $(all_libraries)
+kimg_eps_la_LDFLAGS = -module $(KIMGIO_PLUGIN) -no-undefined $(all_libraries)
 kimg_eps_la_LIBADD = $(LIB_KDECORE)
 kimg_ico_la_SOURCES = ico.cpp
-#>- kimg_ico_la_LDFLAGS = -module $(KIMGIO_PLUGIN) -no-undefined $(all_libraries)
-#>+ 1
-kimg_ico_la_LDFLAGS = -module $(KIMGIO_PLUGIN) -no-undefined $(KDE_NO_UNDEFINED) $(all_libraries)
+kimg_ico_la_LDFLAGS = -module $(KIMGIO_PLUGIN) -no-undefined $(all_libraries)
 kimg_ico_la_LIBADD = $(LIB_QT)
 kimg_jp2_la_SOURCES = jp2.cpp
-#>- kimg_jp2_la_LDFLAGS = -module $(KIMGIO_PLUGIN) -no-undefined $(all_libraries)
-#>+ 1
-kimg_jp2_la_LDFLAGS = -module $(KIMGIO_PLUGIN) -no-undefined $(KDE_NO_UNDEFINED) $(all_libraries)
+kimg_jp2_la_LDFLAGS = -module $(KIMGIO_PLUGIN) -no-undefined $(all_libraries)
 kimg_jp2_la_LIBADD = $(LIB_QT) $(LIB_JASPER) ../kdecore/libkdecore.la
 kimg_pcx_la_SOURCES = pcx.cpp
-#>- kimg_pcx_la_LDFLAGS = -module $(KIMGIO_PLUGIN) -no-undefined $(all_libraries)
-#>+ 1
-kimg_pcx_la_LDFLAGS = -module $(KIMGIO_PLUGIN) -no-undefined $(KDE_NO_UNDEFINED) $(all_libraries)
+kimg_pcx_la_LDFLAGS = -module $(KIMGIO_PLUGIN) -no-undefined $(all_libraries)
 kimg_pcx_la_LIBADD = $(LIB_QT) $(LIB_KDECORE)
 kimg_tga_la_SOURCES = tga.cpp
-#>- kimg_tga_la_LDFLAGS = -module $(KIMGIO_PLUGIN) -no-undefined $(all_libraries)
-#>+ 1
-kimg_tga_la_LDFLAGS = -module $(KIMGIO_PLUGIN) -no-undefined $(KDE_NO_UNDEFINED) $(all_libraries)
+kimg_tga_la_LDFLAGS = -module $(KIMGIO_PLUGIN) -no-undefined $(all_libraries)
 kimg_tga_la_LIBADD = $(LIB_QT) $(LIB_KDECORE)
 kimg_rgb_la_SOURCES = rgb.cpp
-#>- kimg_rgb_la_LDFLAGS = -module $(KIMGIO_PLUGIN) -no-undefined $(all_libraries)
-#>+ 1
-kimg_rgb_la_LDFLAGS = -module $(KIMGIO_PLUGIN) -no-undefined $(KDE_NO_UNDEFINED) $(all_libraries)
+kimg_rgb_la_LDFLAGS = -module $(KIMGIO_PLUGIN) -no-undefined $(all_libraries)
 kimg_rgb_la_LIBADD = $(LIB_QT) $(LIB_KDECORE)
 kimg_xcf_la_SOURCES = xcf.cpp
-#>- kimg_xcf_la_LDFLAGS = -module $(KIMGIO_PLUGIN) -no-undefined $(all_libraries)
-#>+ 1
-kimg_xcf_la_LDFLAGS = -module $(KIMGIO_PLUGIN) -no-undefined $(KDE_NO_UNDEFINED) $(all_libraries)
+kimg_xcf_la_LDFLAGS = -module $(KIMGIO_PLUGIN) -no-undefined $(all_libraries)
 kimg_xcf_la_LIBADD = $(LIB_QT) $(LIB_KDECORE)
 kimg_exr_la_SOURCES = exr.cpp
-#>- kimg_exr_la_LDFLAGS = -module $(KIMGIO_PLUGIN) -no-undefined $(all_libraries)
-#>+ 1
-kimg_exr_la_LDFLAGS = -module $(KIMGIO_PLUGIN) -no-undefined $(KDE_NO_UNDEFINED) $(all_libraries)
+kimg_exr_la_LDFLAGS = -module $(KIMGIO_PLUGIN) -no-undefined $(all_libraries)
 kimg_exr_la_LIBADD = $(LIB_QT) $(LIB_KDECORE) $(LIB_EXR)
 kimg_dds_la_SOURCES = dds.cpp
-#>- kimg_dds_la_LDFLAGS = -module $(KIMGIO_PLUGIN) -no-undefined $(all_libraries)
-#>+ 1
-kimg_dds_la_LDFLAGS = -module $(KIMGIO_PLUGIN) -no-undefined $(KDE_NO_UNDEFINED) $(all_libraries)
+kimg_dds_la_LDFLAGS = -module $(KIMGIO_PLUGIN) -no-undefined $(all_libraries)
 kimg_dds_la_LIBADD = $(LIB_QT) $(LIB_KDECORE)
 kimg_psd_la_SOURCES = psd.cpp
-#>- kimg_psd_la_LDFLAGS = -module $(KIMGIO_PLUGIN) -no-undefined $(all_libraries)
-#>+ 1
-kimg_psd_la_LDFLAGS = -module $(KIMGIO_PLUGIN) -no-undefined $(KDE_NO_UNDEFINED) $(all_libraries)
+kimg_psd_la_LDFLAGS = -module $(KIMGIO_PLUGIN) -no-undefined $(all_libraries)
 kimg_psd_la_LIBADD = $(LIB_QT) $(LIB_KDECORE)
 kimg_hdr_la_SOURCES = hdr.cpp
-#>- kimg_hdr_la_LDFLAGS = -module $(KIMGIO_PLUGIN) -no-undefined $(all_libraries)
-#>+ 1
-kimg_hdr_la_LDFLAGS = -module $(KIMGIO_PLUGIN) -no-undefined $(KDE_NO_UNDEFINED) $(all_libraries)
+kimg_hdr_la_LDFLAGS = -module $(KIMGIO_PLUGIN) -no-undefined $(all_libraries)
 kimg_hdr_la_LIBADD = $(LIB_QT) $(LIB_KDECORE)
 noinst_HEADERS = xview.h eps.h tiffr.h g3r.h ico.h jp2.h pcx.h tga.h rgb.h xcf.h gimp.h exr.h dds.h psd.h hdr.h
 INCLUDES = -I$(top_srcdir)/kio -I$(top_srcdir)/dcop -I$(top_srcdir)/libltdl $(all_includes) -Drestrict= $(EXR_FLAGS)
@@ -696,7 +650,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -734,13 +688,13 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
+	test -z "$(kde_moduledir)" || $(MKDIR_P) "$(DESTDIR)$(kde_moduledir)"
 	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
@@ -751,7 +705,7 @@
 
 uninstall-kde_moduleLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
@@ -765,71 +719,32 @@
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
-#>- kimg_dds.la: $(kimg_dds_la_OBJECTS) $(kimg_dds_la_DEPENDENCIES) 
-#>+ 2
-@KDE_USE_CLOSURE_TRUE@kimg_dds.la: kimg_dds.la.closure $(kimg_dds_la_OBJECTS) $(kimg_dds_la_DEPENDENCIES) 
-@KDE_USE_CLOSURE_FALSE@kimg_dds.la: $(kimg_dds_la_OBJECTS) $(kimg_dds_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(kde_moduledir) $(kimg_dds_la_LDFLAGS) $(kimg_dds_la_OBJECTS) $(kimg_dds_la_LIBADD) $(LIBS)
-#>- kimg_eps.la: $(kimg_eps_la_OBJECTS) $(kimg_eps_la_DEPENDENCIES) 
-#>+ 2
-@KDE_USE_CLOSURE_TRUE@kimg_eps.la: kimg_eps.la.closure $(kimg_eps_la_OBJECTS) $(kimg_eps_la_DEPENDENCIES) 
-@KDE_USE_CLOSURE_FALSE@kimg_eps.la: $(kimg_eps_la_OBJECTS) $(kimg_eps_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(kde_moduledir) $(kimg_eps_la_LDFLAGS) $(kimg_eps_la_OBJECTS) $(kimg_eps_la_LIBADD) $(LIBS)
-#>- kimg_exr.la: $(kimg_exr_la_OBJECTS) $(kimg_exr_la_DEPENDENCIES) 
-#>+ 2
-@KDE_USE_CLOSURE_TRUE@kimg_exr.la: kimg_exr.la.closure $(kimg_exr_la_OBJECTS) $(kimg_exr_la_DEPENDENCIES) 
-@KDE_USE_CLOSURE_FALSE@kimg_exr.la: $(kimg_exr_la_OBJECTS) $(kimg_exr_la_DEPENDENCIES) 
-	$(CXXLINK) $(am_kimg_exr_la_rpath) $(kimg_exr_la_LDFLAGS) $(kimg_exr_la_OBJECTS) $(kimg_exr_la_LIBADD) $(LIBS)
-#>- kimg_hdr.la: $(kimg_hdr_la_OBJECTS) $(kimg_hdr_la_DEPENDENCIES) 
-#>+ 2
-@KDE_USE_CLOSURE_TRUE@kimg_hdr.la: kimg_hdr.la.closure $(kimg_hdr_la_OBJECTS) $(kimg_hdr_la_DEPENDENCIES) 
-@KDE_USE_CLOSURE_FALSE@kimg_hdr.la: $(kimg_hdr_la_OBJECTS) $(kimg_hdr_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(kde_moduledir) $(kimg_hdr_la_LDFLAGS) $(kimg_hdr_la_OBJECTS) $(kimg_hdr_la_LIBADD) $(LIBS)
-#>- kimg_ico.la: $(kimg_ico_la_OBJECTS) $(kimg_ico_la_DEPENDENCIES) 
-#>+ 2
-@KDE_USE_CLOSURE_TRUE@kimg_ico.la: kimg_ico.la.closure $(kimg_ico_la_OBJECTS) $(kimg_ico_la_DEPENDENCIES) 
-@KDE_USE_CLOSURE_FALSE@kimg_ico.la: $(kimg_ico_la_OBJECTS) $(kimg_ico_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(kde_moduledir) $(kimg_ico_la_LDFLAGS) $(kimg_ico_la_OBJECTS) $(kimg_ico_la_LIBADD) $(LIBS)
-#>- kimg_jp2.la: $(kimg_jp2_la_OBJECTS) $(kimg_jp2_la_DEPENDENCIES) 
-#>+ 2
-@KDE_USE_CLOSURE_TRUE@kimg_jp2.la: kimg_jp2.la.closure $(kimg_jp2_la_OBJECTS) $(kimg_jp2_la_DEPENDENCIES) 
-@KDE_USE_CLOSURE_FALSE@kimg_jp2.la: $(kimg_jp2_la_OBJECTS) $(kimg_jp2_la_DEPENDENCIES) 
-	$(CXXLINK) $(am_kimg_jp2_la_rpath) $(kimg_jp2_la_LDFLAGS) $(kimg_jp2_la_OBJECTS) $(kimg_jp2_la_LIBADD) $(LIBS)
-#>- kimg_pcx.la: $(kimg_pcx_la_OBJECTS) $(kimg_pcx_la_DEPENDENCIES) 
-#>+ 2
-@KDE_USE_CLOSURE_TRUE@kimg_pcx.la: kimg_pcx.la.closure $(kimg_pcx_la_OBJECTS) $(kimg_pcx_la_DEPENDENCIES) 
-@KDE_USE_CLOSURE_FALSE@kimg_pcx.la: $(kimg_pcx_la_OBJECTS) $(kimg_pcx_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(kde_moduledir) $(kimg_pcx_la_LDFLAGS) $(kimg_pcx_la_OBJECTS) $(kimg_pcx_la_LIBADD) $(LIBS)
-#>- kimg_psd.la: $(kimg_psd_la_OBJECTS) $(kimg_psd_la_DEPENDENCIES) 
-#>+ 2
-@KDE_USE_CLOSURE_TRUE@kimg_psd.la: kimg_psd.la.closure $(kimg_psd_la_OBJECTS) $(kimg_psd_la_DEPENDENCIES) 
-@KDE_USE_CLOSURE_FALSE@kimg_psd.la: $(kimg_psd_la_OBJECTS) $(kimg_psd_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(kde_moduledir) $(kimg_psd_la_LDFLAGS) $(kimg_psd_la_OBJECTS) $(kimg_psd_la_LIBADD) $(LIBS)
-#>- kimg_rgb.la: $(kimg_rgb_la_OBJECTS) $(kimg_rgb_la_DEPENDENCIES) 
-#>+ 2
-@KDE_USE_CLOSURE_TRUE@kimg_rgb.la: kimg_rgb.la.closure $(kimg_rgb_la_OBJECTS) $(kimg_rgb_la_DEPENDENCIES) 
-@KDE_USE_CLOSURE_FALSE@kimg_rgb.la: $(kimg_rgb_la_OBJECTS) $(kimg_rgb_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(kde_moduledir) $(kimg_rgb_la_LDFLAGS) $(kimg_rgb_la_OBJECTS) $(kimg_rgb_la_LIBADD) $(LIBS)
-#>- kimg_tga.la: $(kimg_tga_la_OBJECTS) $(kimg_tga_la_DEPENDENCIES) 
-#>+ 2
-@KDE_USE_CLOSURE_TRUE@kimg_tga.la: kimg_tga.la.closure $(kimg_tga_la_OBJECTS) $(kimg_tga_la_DEPENDENCIES) 
-@KDE_USE_CLOSURE_FALSE@kimg_tga.la: $(kimg_tga_la_OBJECTS) $(kimg_tga_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(kde_moduledir) $(kimg_tga_la_LDFLAGS) $(kimg_tga_la_OBJECTS) $(kimg_tga_la_LIBADD) $(LIBS)
-#>- kimg_tiff.la: $(kimg_tiff_la_OBJECTS) $(kimg_tiff_la_DEPENDENCIES) 
-#>+ 2
-@KDE_USE_CLOSURE_TRUE@kimg_tiff.la: kimg_tiff.la.closure $(kimg_tiff_la_OBJECTS) $(kimg_tiff_la_DEPENDENCIES) 
-@KDE_USE_CLOSURE_FALSE@kimg_tiff.la: $(kimg_tiff_la_OBJECTS) $(kimg_tiff_la_DEPENDENCIES) 
-	$(CXXLINK) $(am_kimg_tiff_la_rpath) $(kimg_tiff_la_LDFLAGS) $(kimg_tiff_la_OBJECTS) $(kimg_tiff_la_LIBADD) $(LIBS)
-#>- kimg_xcf.la: $(kimg_xcf_la_OBJECTS) $(kimg_xcf_la_DEPENDENCIES) 
-#>+ 2
-@KDE_USE_CLOSURE_TRUE@kimg_xcf.la: kimg_xcf.la.closure $(kimg_xcf_la_OBJECTS) $(kimg_xcf_la_DEPENDENCIES) 
-@KDE_USE_CLOSURE_FALSE@kimg_xcf.la: $(kimg_xcf_la_OBJECTS) $(kimg_xcf_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(kde_moduledir) $(kimg_xcf_la_LDFLAGS) $(kimg_xcf_la_OBJECTS) $(kimg_xcf_la_LIBADD) $(LIBS)
-#>- kimg_xview.la: $(kimg_xview_la_OBJECTS) $(kimg_xview_la_DEPENDENCIES) 
-#>+ 2
-@KDE_USE_CLOSURE_TRUE@kimg_xview.la: kimg_xview.la.closure $(kimg_xview_la_OBJECTS) $(kimg_xview_la_DEPENDENCIES) 
-@KDE_USE_CLOSURE_FALSE@kimg_xview.la: $(kimg_xview_la_OBJECTS) $(kimg_xview_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(kde_moduledir) $(kimg_xview_la_LDFLAGS) $(kimg_xview_la_OBJECTS) $(kimg_xview_la_LIBADD) $(LIBS)
+kimg_dds.la: $(kimg_dds_la_OBJECTS) $(kimg_dds_la_DEPENDENCIES) 
+	$(kimg_dds_la_LINK) -rpath $(kde_moduledir) $(kimg_dds_la_OBJECTS) $(kimg_dds_la_LIBADD) $(LIBS)
+kimg_eps.la: $(kimg_eps_la_OBJECTS) $(kimg_eps_la_DEPENDENCIES) 
+	$(kimg_eps_la_LINK) -rpath $(kde_moduledir) $(kimg_eps_la_OBJECTS) $(kimg_eps_la_LIBADD) $(LIBS)
+kimg_exr.la: $(kimg_exr_la_OBJECTS) $(kimg_exr_la_DEPENDENCIES) 
+	$(kimg_exr_la_LINK) $(am_kimg_exr_la_rpath) $(kimg_exr_la_OBJECTS) $(kimg_exr_la_LIBADD) $(LIBS)
+kimg_hdr.la: $(kimg_hdr_la_OBJECTS) $(kimg_hdr_la_DEPENDENCIES) 
+	$(kimg_hdr_la_LINK) -rpath $(kde_moduledir) $(kimg_hdr_la_OBJECTS) $(kimg_hdr_la_LIBADD) $(LIBS)
+kimg_ico.la: $(kimg_ico_la_OBJECTS) $(kimg_ico_la_DEPENDENCIES) 
+	$(kimg_ico_la_LINK) -rpath $(kde_moduledir) $(kimg_ico_la_OBJECTS) $(kimg_ico_la_LIBADD) $(LIBS)
+kimg_jp2.la: $(kimg_jp2_la_OBJECTS) $(kimg_jp2_la_DEPENDENCIES) 
+	$(kimg_jp2_la_LINK) $(am_kimg_jp2_la_rpath) $(kimg_jp2_la_OBJECTS) $(kimg_jp2_la_LIBADD) $(LIBS)
+kimg_pcx.la: $(kimg_pcx_la_OBJECTS) $(kimg_pcx_la_DEPENDENCIES) 
+	$(kimg_pcx_la_LINK) -rpath $(kde_moduledir) $(kimg_pcx_la_OBJECTS) $(kimg_pcx_la_LIBADD) $(LIBS)
+kimg_psd.la: $(kimg_psd_la_OBJECTS) $(kimg_psd_la_DEPENDENCIES) 
+	$(kimg_psd_la_LINK) -rpath $(kde_moduledir) $(kimg_psd_la_OBJECTS) $(kimg_psd_la_LIBADD) $(LIBS)
+kimg_rgb.la: $(kimg_rgb_la_OBJECTS) $(kimg_rgb_la_DEPENDENCIES) 
+	$(kimg_rgb_la_LINK) -rpath $(kde_moduledir) $(kimg_rgb_la_OBJECTS) $(kimg_rgb_la_LIBADD) $(LIBS)
+kimg_tga.la: $(kimg_tga_la_OBJECTS) $(kimg_tga_la_DEPENDENCIES) 
+	$(kimg_tga_la_LINK) -rpath $(kde_moduledir) $(kimg_tga_la_OBJECTS) $(kimg_tga_la_LIBADD) $(LIBS)
+kimg_tiff.la: $(kimg_tiff_la_OBJECTS) $(kimg_tiff_la_DEPENDENCIES) 
+	$(kimg_tiff_la_LINK) $(am_kimg_tiff_la_rpath) $(kimg_tiff_la_OBJECTS) $(kimg_tiff_la_LIBADD) $(LIBS)
+kimg_xcf.la: $(kimg_xcf_la_OBJECTS) $(kimg_xcf_la_DEPENDENCIES) 
+	$(kimg_xcf_la_LINK) -rpath $(kde_moduledir) $(kimg_xcf_la_OBJECTS) $(kimg_xcf_la_LIBADD) $(LIBS)
+kimg_xview.la: $(kimg_xview_la_OBJECTS) $(kimg_xview_la_DEPENDENCIES) 
+	$(kimg_xview_la_LINK) -rpath $(kde_moduledir) $(kimg_xview_la_OBJECTS) $(kimg_xview_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -852,22 +767,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xview.Plo@am__quote@
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -877,13 +792,9 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 install-serviceDATA: $(service_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(servicedir)" || $(mkdir_p) "$(DESTDIR)$(servicedir)"
+	test -z "$(servicedir)" || $(MKDIR_P) "$(DESTDIR)$(servicedir)"
 	@list='$(service_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -948,23 +859,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	$(mkdir_p) $(distdir)/../admin
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -980,7 +889,7 @@
 all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS)
 installdirs:
 	for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(servicedir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -1013,14 +922,14 @@
 #>- clean-am: clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
 #>- 	mostlyclean-am
 #>+ 2
-clean-am: clean-closures clean-bcheck  clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
+clean-am: clean-bcheck  clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
 	mostlyclean-am
 
 distclean: distclean-am
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
@@ -1038,14 +947,22 @@
 install-data-am:   install-data-local \
 	install-serviceDATA
 
+install-dvi: install-dvi-am
+
 #>- install-exec-am:
 #>+ 1
 install-exec-am:  install-kde_moduleLTLIBRARIES
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -1066,22 +983,26 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-kde_moduleLTLIBRARIES \
-	uninstall-local uninstall-serviceDATA
+uninstall-am: uninstall-kde_moduleLTLIBRARIES uninstall-local \
+	uninstall-serviceDATA
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-kde_moduleLTLIBRARIES clean-libtool ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
 	distclean-tags distdir dvi dvi-am html html-am info info-am \
 	install install-am install-data install-data-am \
-	install-data-local install-exec install-exec-am install-info \
+	install-data-local install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
 	install-info-am install-kde_moduleLTLIBRARIES install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
 	install-serviceDATA install-strip installcheck installcheck-am \
 	installdirs maintainer-clean maintainer-clean-generic \
 	mostlyclean mostlyclean-compile mostlyclean-generic \
 	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
-	uninstall-am uninstall-info-am uninstall-kde_moduleLTLIBRARIES \
-	uninstall-local uninstall-serviceDATA
+	uninstall-am uninstall-kde_moduleLTLIBRARIES uninstall-local \
+	uninstall-serviceDATA
 
 apidox-am-yes:
 	@if test \! -d "$(top_srcdir)/doc/common/" && test -z "$$DOXDATA" ; then \
@@ -1179,130 +1100,9 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
-#>+ 8
-kimg_dds.la.closure: $(kimg_dds_la_OBJECTS) $(kimg_dds_la_DEPENDENCIES)
-	@echo "int main() {return 0;}" > kimg_dds_la_closure.cpp
-	@$(LTCXXCOMPILE) -c kimg_dds_la_closure.cpp
-	$(CXXLINK) kimg_dds_la_closure.lo $(kimg_dds_la_LDFLAGS) $(kimg_dds_la_OBJECTS) $(kimg_dds_la_LIBADD) $(LIBS)
-	@rm -f kimg_dds_la_closure.* kimg_dds.la.closure
-	@echo "timestamp" > kimg_dds.la.closure
-
-
-#>+ 8
-kimg_eps.la.closure: $(kimg_eps_la_OBJECTS) $(kimg_eps_la_DEPENDENCIES)
-	@echo "int main() {return 0;}" > kimg_eps_la_closure.cpp
-	@$(LTCXXCOMPILE) -c kimg_eps_la_closure.cpp
-	$(CXXLINK) kimg_eps_la_closure.lo $(kimg_eps_la_LDFLAGS) $(kimg_eps_la_OBJECTS) $(kimg_eps_la_LIBADD) $(LIBS)
-	@rm -f kimg_eps_la_closure.* kimg_eps.la.closure
-	@echo "timestamp" > kimg_eps.la.closure
-
-
-#>+ 8
-kimg_exr.la.closure: $(kimg_exr_la_OBJECTS) $(kimg_exr_la_DEPENDENCIES)
-	@echo "int main() {return 0;}" > kimg_exr_la_closure.cpp
-	@$(LTCXXCOMPILE) -c kimg_exr_la_closure.cpp
-	$(CXXLINK) kimg_exr_la_closure.lo $(kimg_exr_la_LDFLAGS) $(kimg_exr_la_OBJECTS) $(kimg_exr_la_LIBADD) $(LIBS)
-	@rm -f kimg_exr_la_closure.* kimg_exr.la.closure
-	@echo "timestamp" > kimg_exr.la.closure
-
-
-#>+ 8
-kimg_hdr.la.closure: $(kimg_hdr_la_OBJECTS) $(kimg_hdr_la_DEPENDENCIES)
-	@echo "int main() {return 0;}" > kimg_hdr_la_closure.cpp
-	@$(LTCXXCOMPILE) -c kimg_hdr_la_closure.cpp
-	$(CXXLINK) kimg_hdr_la_closure.lo $(kimg_hdr_la_LDFLAGS) $(kimg_hdr_la_OBJECTS) $(kimg_hdr_la_LIBADD) $(LIBS)
-	@rm -f kimg_hdr_la_closure.* kimg_hdr.la.closure
-	@echo "timestamp" > kimg_hdr.la.closure
-
-
-#>+ 8
-kimg_ico.la.closure: $(kimg_ico_la_OBJECTS) $(kimg_ico_la_DEPENDENCIES)
-	@echo "int main() {return 0;}" > kimg_ico_la_closure.cpp
-	@$(LTCXXCOMPILE) -c kimg_ico_la_closure.cpp
-	$(CXXLINK) kimg_ico_la_closure.lo $(kimg_ico_la_LDFLAGS) $(kimg_ico_la_OBJECTS) $(kimg_ico_la_LIBADD) $(LIBS)
-	@rm -f kimg_ico_la_closure.* kimg_ico.la.closure
-	@echo "timestamp" > kimg_ico.la.closure
-
-
-#>+ 8
-kimg_jp2.la.closure: $(kimg_jp2_la_OBJECTS) $(kimg_jp2_la_DEPENDENCIES)
-	@echo "int main() {return 0;}" > kimg_jp2_la_closure.cpp
-	@$(LTCXXCOMPILE) -c kimg_jp2_la_closure.cpp
-	$(CXXLINK) kimg_jp2_la_closure.lo $(kimg_jp2_la_LDFLAGS) $(kimg_jp2_la_OBJECTS) $(kimg_jp2_la_LIBADD) $(LIBS)
-	@rm -f kimg_jp2_la_closure.* kimg_jp2.la.closure
-	@echo "timestamp" > kimg_jp2.la.closure
-
-
-#>+ 8
-kimg_pcx.la.closure: $(kimg_pcx_la_OBJECTS) $(kimg_pcx_la_DEPENDENCIES)
-	@echo "int main() {return 0;}" > kimg_pcx_la_closure.cpp
-	@$(LTCXXCOMPILE) -c kimg_pcx_la_closure.cpp
-	$(CXXLINK) kimg_pcx_la_closure.lo $(kimg_pcx_la_LDFLAGS) $(kimg_pcx_la_OBJECTS) $(kimg_pcx_la_LIBADD) $(LIBS)
-	@rm -f kimg_pcx_la_closure.* kimg_pcx.la.closure
-	@echo "timestamp" > kimg_pcx.la.closure
-
-
-#>+ 8
-kimg_psd.la.closure: $(kimg_psd_la_OBJECTS) $(kimg_psd_la_DEPENDENCIES)
-	@echo "int main() {return 0;}" > kimg_psd_la_closure.cpp
-	@$(LTCXXCOMPILE) -c kimg_psd_la_closure.cpp
-	$(CXXLINK) kimg_psd_la_closure.lo $(kimg_psd_la_LDFLAGS) $(kimg_psd_la_OBJECTS) $(kimg_psd_la_LIBADD) $(LIBS)
-	@rm -f kimg_psd_la_closure.* kimg_psd.la.closure
-	@echo "timestamp" > kimg_psd.la.closure
-
-
-#>+ 8
-kimg_rgb.la.closure: $(kimg_rgb_la_OBJECTS) $(kimg_rgb_la_DEPENDENCIES)
-	@echo "int main() {return 0;}" > kimg_rgb_la_closure.cpp
-	@$(LTCXXCOMPILE) -c kimg_rgb_la_closure.cpp
-	$(CXXLINK) kimg_rgb_la_closure.lo $(kimg_rgb_la_LDFLAGS) $(kimg_rgb_la_OBJECTS) $(kimg_rgb_la_LIBADD) $(LIBS)
-	@rm -f kimg_rgb_la_closure.* kimg_rgb.la.closure
-	@echo "timestamp" > kimg_rgb.la.closure
-
-
-#>+ 8
-kimg_tga.la.closure: $(kimg_tga_la_OBJECTS) $(kimg_tga_la_DEPENDENCIES)
-	@echo "int main() {return 0;}" > kimg_tga_la_closure.cpp
-	@$(LTCXXCOMPILE) -c kimg_tga_la_closure.cpp
-	$(CXXLINK) kimg_tga_la_closure.lo $(kimg_tga_la_LDFLAGS) $(kimg_tga_la_OBJECTS) $(kimg_tga_la_LIBADD) $(LIBS)
-	@rm -f kimg_tga_la_closure.* kimg_tga.la.closure
-	@echo "timestamp" > kimg_tga.la.closure
-
-
-#>+ 8
-kimg_tiff.la.closure: $(kimg_tiff_la_OBJECTS) $(kimg_tiff_la_DEPENDENCIES)
-	@echo "int main() {return 0;}" > kimg_tiff_la_closure.cpp
-	@$(LTCXXCOMPILE) -c kimg_tiff_la_closure.cpp
-	$(CXXLINK) kimg_tiff_la_closure.lo $(kimg_tiff_la_LDFLAGS) $(kimg_tiff_la_OBJECTS) $(kimg_tiff_la_LIBADD) $(LIBS)
-	@rm -f kimg_tiff_la_closure.* kimg_tiff.la.closure
-	@echo "timestamp" > kimg_tiff.la.closure
-
-
-#>+ 8
-kimg_xcf.la.closure: $(kimg_xcf_la_OBJECTS) $(kimg_xcf_la_DEPENDENCIES)
-	@echo "int main() {return 0;}" > kimg_xcf_la_closure.cpp
-	@$(LTCXXCOMPILE) -c kimg_xcf_la_closure.cpp
-	$(CXXLINK) kimg_xcf_la_closure.lo $(kimg_xcf_la_LDFLAGS) $(kimg_xcf_la_OBJECTS) $(kimg_xcf_la_LIBADD) $(LIBS)
-	@rm -f kimg_xcf_la_closure.* kimg_xcf.la.closure
-	@echo "timestamp" > kimg_xcf.la.closure
-
-
-#>+ 8
-kimg_xview.la.closure: $(kimg_xview_la_OBJECTS) $(kimg_xview_la_DEPENDENCIES)
-	@echo "int main() {return 0;}" > kimg_xview_la_closure.cpp
-	@$(LTCXXCOMPILE) -c kimg_xview_la_closure.cpp
-	$(CXXLINK) kimg_xview_la_closure.lo $(kimg_xview_la_LDFLAGS) $(kimg_xview_la_OBJECTS) $(kimg_xview_la_LIBADD) $(LIBS)
-	@rm -f kimg_xview_la_closure.* kimg_xview.la.closure
-	@echo "timestamp" > kimg_xview.la.closure
-
-
 #>+ 2
 KDE_DIST=pcx.kimgio ppm.kimgio jp2.kimgio psd.kimgio Makefile.in jpeg.kimgio xpm.kimgio xv.kimgio configure.in.in gif.kimgio hdr.kimgio png.kimgio eps.kimgio bmp.kimgio xcf.kimgio tiff.kimgio tga.kimgio rgb.kimgio exr.kimgio g3.kimgio ico.kimgio pgm.kimgio dds.kimgio mng.kimgio xbm.kimgio pbm.kimgio Makefile.am 
 
-#>+ 3
-clean-closures:
-	-rm -f  kimg_dds.la.closure kimg_eps.la.closure kimg_exr.la.closure kimg_hdr.la.closure kimg_ico.la.closure kimg_jp2.la.closure kimg_pcx.la.closure kimg_psd.la.closure kimg_rgb.la.closure kimg_tga.la.closure kimg_tiff.la.closure kimg_xcf.la.closure kimg_xview.la.closure
-
 #>+ 2
 docs-am:
 
--- kdelibs-3.5.7.orig/files
+++ kdelibs-3.5.7/files
@@ -0,0 +1,2036 @@
+./common_texts.cpp
+./_translatorinfo.cpp
+./kded/kded.cpp
+./kded/kbuildimageiofactory.cpp
+./kded/kdedmodule.cpp
+./kded/kbuildservicetypefactory.cpp
+./kded/kbuildsycoca.cpp
+./kded/kde-menu.cpp
+./kded/kbuildservicefactory.cpp
+./kded/kbuildprotocolinfofactory.cpp
+./kded/kbuildservicegroupfactory.cpp
+./kded/vfolder_menu.cpp
+./kded/khostname.cpp
+./kded/kctimefactory.cpp
+./kded/test/test.cpp
+./kparts/browserextension.cpp
+./kparts/dockmainwindow.cpp
+./kparts/event.cpp
+./kparts/plugin.cpp
+./kparts/historyprovider.cpp
+./kparts/partmanager.cpp
+./kparts/factory.cpp
+./kparts/part.cpp
+./kparts/browserrun.cpp
+./kparts/statusbarextension.cpp
+./kparts/browserinterface.cpp
+./kparts/mainwindow.cpp
+./kspell2/defaultdictionary.cpp
+./kspell2/filter.cpp
+./kspell2/backgroundengine.cpp
+./kspell2/backgroundchecker.cpp
+./kspell2/client.cpp
+./kspell2/broker.cpp
+./kspell2/backgroundthread.cpp
+./kspell2/settings.cpp
+./kspell2/ui/configdialog.cpp
+./kspell2/ui/dialog.cpp
+./kspell2/ui/highlighter.cpp
+./kspell2/ui/configwidget.cpp
+./kspell2/plugins/hspell/kspell_hspellclient.cpp
+./kspell2/plugins/hspell/kspell_hspelldict.cpp
+./kspell2/plugins/aspell/kspell_aspellclient.cpp
+./kspell2/plugins/aspell/kspell_aspelldict.cpp
+./kspell2/plugins/ispell/kspell_ispelldict.cpp
+./kspell2/plugins/ispell/good.cpp
+./kspell2/plugins/ispell/hash.cpp
+./kspell2/plugins/ispell/lookup.cpp
+./kspell2/plugins/ispell/makedent.cpp
+./kspell2/plugins/ispell/tgood.cpp
+./kspell2/plugins/ispell/ispell_checker.cpp
+./kspell2/plugins/ispell/correct.cpp
+./kspell2/plugins/ispell/kspell_ispellclient.cpp
+./kutils/kcmoduleinfo.cpp
+./kutils/kfind.cpp
+./kutils/kplugininfo.cpp
+./kutils/kpluginselector.cpp
+./kutils/kcmodulecontainer.cpp
+./kutils/kcmoduleproxyIfaceImpl.cpp
+./kutils/kcmoduleloader.cpp
+./kutils/kcmultidialog.cpp
+./kutils/kcmoduleproxy.cpp
+./kutils/kmultitabbar.cpp
+./kutils/kfinddialog.cpp
+./kutils/kreplacedialog.cpp
+./kutils/kreplace.cpp
+./kutils/ksettings/componentsdialog.cpp
+./kutils/ksettings/dialog.cpp
+./kutils/ksettings/pluginpage.cpp
+./kutils/ksettings/dispatcher.cpp
+./kdewidgets/makekdewidgets.cpp
+./kdewidgets/classpreviews.cpp
+./kresources/selectdialog.cpp
+./kresources/factory.cpp
+./kresources/resource.cpp
+./kresources/configdialog.cpp
+./kresources/managerimpl.cpp
+./kresources/kcmkresources.cpp
+./kresources/testresources.cpp
+./kresources/configwidget.cpp
+./kresources/configpage.cpp
+./pics/ksvgtopng.cpp
+./kdefx/kimageeffect.cpp
+./kdefx/kdrawutil.cpp
+./kdefx/kstyle.cpp
+./kdefx/kcpuinfo.cpp
+./kdefx/kpixmap.cpp
+./kdefx/kpixmapsplitter.cpp
+./kdefx/kpixmapeffect.cpp
+./interfaces/ktexteditor/markinterfaceextension.cpp
+./interfaces/ktexteditor/viewcursordcopinterface.cpp
+./interfaces/ktexteditor/selectiondcopinterface.cpp
+./interfaces/ktexteditor/texthintinterface.cpp
+./interfaces/ktexteditor/clipboardinterface.cpp
+./interfaces/ktexteditor/encodinginterface.cpp
+./interfaces/ktexteditor/clipboarddcopinterface.cpp
+./interfaces/ktexteditor/printinterface.cpp
+./interfaces/ktexteditor/searchinterface.cpp
+./interfaces/ktexteditor/printdcopinterface.cpp
+./interfaces/ktexteditor/editorchooser.cpp
+./interfaces/ktexteditor/viewcursorinterface.cpp
+./interfaces/ktexteditor/editinterface.cpp
+./interfaces/ktexteditor/editinterfaceext.cpp
+./interfaces/ktexteditor/variableinterface.cpp
+./interfaces/ktexteditor/templateinterface.cpp
+./interfaces/ktexteditor/configinterface.cpp
+./interfaces/ktexteditor/popupmenuinterface.cpp
+./interfaces/ktexteditor/searchdcopinterface.cpp
+./interfaces/ktexteditor/blockselectioninterface.cpp
+./interfaces/ktexteditor/cursorinterface.cpp
+./interfaces/ktexteditor/documentdcopinfo.cpp
+./interfaces/ktexteditor/highlightinginterface.cpp
+./interfaces/ktexteditor/undodcopinterface.cpp
+./interfaces/ktexteditor/configinterfaceextension.cpp
+./interfaces/ktexteditor/selectioninterfaceext.cpp
+./interfaces/ktexteditor/codecompletioninterface.cpp
+./interfaces/ktexteditor/blockselectiondcopinterface.cpp
+./interfaces/ktexteditor/editdcopinterface.cpp
+./interfaces/ktexteditor/undointerface.cpp
+./interfaces/ktexteditor/documentinfo.cpp
+./interfaces/ktexteditor/ktexteditor.cpp
+./interfaces/ktexteditor/markinterface.cpp
+./interfaces/ktexteditor/encodingdcopinterface.cpp
+./interfaces/ktexteditor/viewstatusmsginterface.cpp
+./interfaces/ktexteditor/viewstatusmsgdcopinterface.cpp
+./interfaces/ktexteditor/wordwrapinterface.cpp
+./interfaces/ktexteditor/dynwordwrapinterface.cpp
+./interfaces/ktexteditor/selectioninterface.cpp
+./interfaces/ktexteditor/sessionconfiginterface.cpp
+./interfaces/kmediaplayer/player.cpp
+./interfaces/kmediaplayer/view.cpp
+./interfaces/kscript/scriptloader.cpp
+./interfaces/kscript/scriptmanager.cpp
+./interfaces/kscript/sample/shellscript.cpp
+./kinit/klauncher_main.cpp
+./kinit/setproctitle.cpp
+./kinit/autostart.cpp
+./kinit/kstartupconfig.cpp
+./kinit/kinit.cpp
+./kinit/klauncher.cpp
+./kinit/kioslave.cpp
+./kinit/kdostartupconfig.cpp
+./win/win32_utils2.cpp
+./win/dummy.cpp
+./win/qeventloopex.cpp
+./win/bootstrap.cpp
+./kabc/ldapconfigwidget.cpp
+./kabc/kab2kabc.cpp
+./kabc/sortmode.cpp
+./kabc/phonenumber.cpp
+./kabc/distributionlisteditor.cpp
+./kabc/plugin.cpp
+./kabc/geo.cpp
+./kabc/distributionlist.cpp
+./kabc/addresseehelper.cpp
+./kabc/address.cpp
+./kabc/sound.cpp
+./kabc/vcard21parser.cpp
+./kabc/vcardformatplugin.cpp
+./kabc/resource.cpp
+./kabc/vcardformat.cpp
+./kabc/distributionlistdialog.cpp
+./kabc/stdaddressbook.cpp
+./kabc/errorhandler.cpp
+./kabc/vcardtool.cpp
+./kabc/timezone.cpp
+./kabc/vcardconverter.cpp
+./kabc/key.cpp
+./kabc/formatfactory.cpp
+./kabc/ldapclient.cpp
+./kabc/ldif.cpp
+./kabc/addresseelist.cpp
+./kabc/secrecy.cpp
+./kabc/vcardformatimpl.cpp
+./kabc/ldapurl.cpp
+./kabc/addressbook.cpp
+./kabc/ldifconverter.cpp
+./kabc/locknull.cpp
+./kabc/resourceselectdialog.cpp
+./kabc/lock.cpp
+./kabc/addresseedialog.cpp
+./kabc/agent.cpp
+./kabc/picture.cpp
+./kabc/addresslineedit.cpp
+./kabc/addressee.cpp
+./kabc/field.cpp
+./kabc/scripts/field.src.cpp
+./kabc/scripts/addressee.src.cpp
+./kabc/vcardparser/testread.cpp
+./kabc/vcardparser/testread2.cpp
+./kabc/vcardparser/testutils.cpp
+./kabc/vcardparser/testwrite.cpp
+./kabc/vcardparser/vcardparser.cpp
+./kabc/vcardparser/vcard.cpp
+./kabc/vcardparser/vcardline.cpp
+./kabc/vcard/testread.cpp
+./kabc/vcard/OrgValue.cpp
+./kabc/vcard/SoundValue.cpp
+./kabc/vcard/TextBinValue.cpp
+./kabc/vcard/AdrParam.cpp
+./kabc/vcard/GeoValue.cpp
+./kabc/vcard/TextParam.cpp
+./kabc/vcard/TextListValue.cpp
+./kabc/vcard/vCard-all.cpp
+./kabc/vcard/TextValue.cpp
+./kabc/vcard/RToken.cpp
+./kabc/vcard/AgentParam.cpp
+./kabc/vcard/LangValue.cpp
+./kabc/vcard/TextBinParam.cpp
+./kabc/vcard/ImageValue.cpp
+./kabc/vcard/VCardEntity.cpp
+./kabc/vcard/TelValue.cpp
+./kabc/vcard/DateParam.cpp
+./kabc/vcard/SourceParam.cpp
+./kabc/vcard/TelParam.cpp
+./kabc/vcard/ImgValue.cpp
+./kabc/vcard/VCard.cpp
+./kabc/vcard/AgentValue.cpp
+./kabc/vcard/ContentLine.cpp
+./kabc/vcard/testwrite.cpp
+./kabc/vcard/PhoneNumberValue.cpp
+./kabc/vcard/URIValue.cpp
+./kabc/vcard/FloatValue.cpp
+./kabc/vcard/DateValue.cpp
+./kabc/vcard/Enum.cpp
+./kabc/vcard/NValue.cpp
+./kabc/vcard/Entity.cpp
+./kabc/vcard/EmailParam.cpp
+./kabc/vcard/AdrValue.cpp
+./kabc/vcard/Value.cpp
+./kabc/vcard/UTCValue.cpp
+./kabc/vcard/ImageParam.cpp
+./kabc/vcard/ClassValue.cpp
+./kabc/vcard/Param.cpp
+./kmdi/kmdichildview.cpp
+./kmdi/kmdichildfrmcaption.cpp
+./kmdi/kmdimainfrm.cpp
+./kmdi/kmdidockcontainer.cpp
+./kmdi/kmdichildarea.cpp
+./kmdi/kmdiguiclient.cpp
+./kmdi/kmditoolviewaccessor.cpp
+./kmdi/kmdidocumentviewtabwidget.cpp
+./kmdi/kmdichildfrm.cpp
+./kmdi/kmdifocuslist.cpp
+./kmdi/kmditaskbar.cpp
+./kmdi/test/main.cpp
+./kmdi/test/mainwidget.cpp
+./kmdi/test/hello.cpp
+./kmdi/kmdi/guiclient.cpp
+./kmdi/kmdi/tabwidget.cpp
+./kmdi/kmdi/dockcontainer.cpp
+./kmdi/kmdi/toolviewaccessor.cpp
+./kmdi/kmdi/mainwindow.cpp
+./dnssd/servicebrowser.cpp
+./dnssd/query.cpp
+./dnssd/publicservice.cpp
+./dnssd/servicebase.cpp
+./dnssd/responder.cpp
+./dnssd/domainbrowser.cpp
+./dnssd/remoteservice.cpp
+./knewstuff/engine.cpp
+./knewstuff/knewstuff.cpp
+./knewstuff/uploaddialog.cpp
+./knewstuff/khotnewstuff.cpp
+./knewstuff/knewstuffsecure.cpp
+./knewstuff/knewstuffgeneric.cpp
+./knewstuff/security.cpp
+./knewstuff/providerdialog.cpp
+./knewstuff/entry.cpp
+./knewstuff/provider.cpp
+./knewstuff/ghns.cpp
+./knewstuff/downloaddialog.cpp
+./knewstuff/knewstuffbutton.cpp
+./knewstuff/testnewstuff.cpp
+./kjs/collector.cpp
+./kjs/debugger.cpp
+./kjs/internal.cpp
+./kjs/number_object.cpp
+./kjs/regexp_object.cpp
+./kjs/operations.cpp
+./kjs/scope_chain.cpp
+./kjs/regexp.cpp
+./kjs/value.cpp
+./kjs/nodes2string.cpp
+./kjs/function.cpp
+./kjs/ustring.cpp
+./kjs/array_object.cpp
+./kjs/grammar.cpp
+./kjs/lexer.cpp
+./kjs/lookup.cpp
+./kjs/function_object.cpp
+./kjs/list.cpp
+./kjs/bool_object.cpp
+./kjs/testkjs.cpp
+./kjs/object_object.cpp
+./kjs/string_object.cpp
+./kjs/reference.cpp
+./kjs/nodes.cpp
+./kjs/identifier.cpp
+./kjs/error_object.cpp
+./kjs/date_object.cpp
+./kjs/math_object.cpp
+./kjs/object.cpp
+./kjs/property_map.cpp
+./kjs/dtoa.cpp
+./kjs/interpreter.cpp
+./kjs/reference_list.cpp
+./kdesu/client.cpp
+./kdesu/ssh.cpp
+./kdesu/kcookie.cpp
+./kdesu/stub.cpp
+./kdesu/kdesu_pty.cpp
+./kdesu/su.cpp
+./kdesu/process.cpp
+./khtml/test_regression.cpp
+./khtml/test_regression_fontoverload.cpp
+./khtml/khtml_printsettings.cpp
+./khtml/khtmlimage.cpp
+./khtml/domtreeview.cpp
+./khtml/khtml_pagecache.cpp
+./khtml/khtml_caret.cpp
+./khtml/khtml_factory.cpp
+./khtml/testkhtml.cpp
+./khtml/khtml_events.cpp
+./khtml/khtml_run.cpp
+./khtml/khtmlview.cpp
+./khtml/khtml_part.cpp
+./khtml/khtml_ext.cpp
+./khtml/css/css_base.cpp
+./khtml/css/csshelper.cpp
+./khtml/css/cssstyleselector.cpp
+./khtml/css/cssparser.cpp
+./khtml/css/css_ruleimpl.cpp
+./khtml/css/css_stylesheetimpl.cpp
+./khtml/css/parser.cpp
+./khtml/css/css_valueimpl.cpp
+./khtml/css/tokenizer.cpp
+./khtml/css/css_renderstyledeclarationimpl.cpp
+./khtml/css/css_extensionsimpl.cpp
+./khtml/misc/htmlhashes.cpp
+./khtml/misc/helper.cpp
+./khtml/misc/stringit.cpp
+./khtml/misc/decoder.cpp
+./khtml/misc/arena.cpp
+./khtml/misc/blocked_icon.cpp
+./khtml/misc/guess_ja.cpp
+./khtml/misc/loader.cpp
+./khtml/misc/loader_jpeg.cpp
+./khtml/misc/knsplugininstaller.cpp
+./khtml/dom/dom_xml.cpp
+./khtml/dom/html_object.cpp
+./khtml/dom/dom_node.cpp
+./khtml/dom/dom2_range.cpp
+./khtml/dom/html_table.cpp
+./khtml/dom/html_list.cpp
+./khtml/dom/dom2_traversal.cpp
+./khtml/dom/dom_misc.cpp
+./khtml/dom/dom_element.cpp
+./khtml/dom/html_form.cpp
+./khtml/dom/dom2_views.cpp
+./khtml/dom/html_base.cpp
+./khtml/dom/html_inline.cpp
+./khtml/dom/css_value.cpp
+./khtml/dom/css_extensions.cpp
+./khtml/dom/html_element.cpp
+./khtml/dom/dom_string.cpp
+./khtml/dom/html_block.cpp
+./khtml/dom/dom2_events.cpp
+./khtml/dom/dom_text.cpp
+./khtml/dom/html_head.cpp
+./khtml/dom/css_stylesheet.cpp
+./khtml/dom/css_rule.cpp
+./khtml/dom/dom_doc.cpp
+./khtml/dom/html_misc.cpp
+./khtml/dom/html_image.cpp
+./khtml/dom/html_document.cpp
+./khtml/kmultipart/kmultipart.cpp
+./khtml/xml/dom2_viewsimpl.cpp
+./khtml/xml/dom_elementimpl.cpp
+./khtml/xml/dom_restyler.cpp
+./khtml/xml/dom_nodeimpl.cpp
+./khtml/xml/dom_docimpl.cpp
+./khtml/xml/dom_xmlimpl.cpp
+./khtml/xml/dom_textimpl.cpp
+./khtml/xml/dom_stringimpl.cpp
+./khtml/xml/dom2_traversalimpl.cpp
+./khtml/xml/dom2_eventsimpl.cpp
+./khtml/xml/xml_tokenizer.cpp
+./khtml/xml/dom2_rangeimpl.cpp
+./khtml/rendering/render_form.cpp
+./khtml/rendering/render_inline.cpp
+./khtml/rendering/render_body.cpp
+./khtml/rendering/render_table.cpp
+./khtml/rendering/render_container.cpp
+./khtml/rendering/font.cpp
+./khtml/rendering/render_br.cpp
+./khtml/rendering/render_flow.cpp
+./khtml/rendering/table_layout.cpp
+./khtml/rendering/render_arena.cpp
+./khtml/rendering/render_object.cpp
+./khtml/rendering/counter_tree.cpp
+./khtml/rendering/enumerate.cpp
+./khtml/rendering/break_lines.cpp
+./khtml/rendering/render_image.cpp
+./khtml/rendering/render_box.cpp
+./khtml/rendering/render_canvas.cpp
+./khtml/rendering/bidi.cpp
+./khtml/rendering/render_line.cpp
+./khtml/rendering/loading_icon.cpp
+./khtml/rendering/render_generated.cpp
+./khtml/rendering/render_text.cpp
+./khtml/rendering/render_replaced.cpp
+./khtml/rendering/render_block.cpp
+./khtml/rendering/render_frames.cpp
+./khtml/rendering/render_list.cpp
+./khtml/rendering/render_layer.cpp
+./khtml/rendering/render_style.cpp
+./khtml/rendering/render_applet.cpp
+./khtml/java/kjavaappletcontext.cpp
+./khtml/java/kjavaprocess.cpp
+./khtml/java/kjavaappletwidget.cpp
+./khtml/java/kqeventutil.cpp
+./khtml/java/kjavaappletviewer.cpp
+./khtml/java/kjavaappletserver.cpp
+./khtml/java/kjavaapplet.cpp
+./khtml/java/kjavadownloader.cpp
+./khtml/java/kxeventutil.cpp
+./khtml/ecma/kjs_navigator.cpp
+./khtml/ecma/kjs_css.cpp
+./khtml/ecma/kjs_range.cpp
+./khtml/ecma/kjs_binding.cpp
+./khtml/ecma/kjs_window.cpp
+./khtml/ecma/testecma.cpp
+./khtml/ecma/domparser.cpp
+./khtml/ecma/kjs_dom.cpp
+./khtml/ecma/xmlhttprequest.cpp
+./khtml/ecma/kjs_events.cpp
+./khtml/ecma/kjs_proxy.cpp
+./khtml/ecma/kjs_views.cpp
+./khtml/ecma/kjs_mozilla.cpp
+./khtml/ecma/kjs_debugwin.cpp
+./khtml/ecma/kjs_html.cpp
+./khtml/ecma/kjs_traversal.cpp
+./khtml/ecma/xmlserializer.cpp
+./khtml/html/html_objectimpl.cpp
+./khtml/html/html_blockimpl.cpp
+./khtml/html/html_baseimpl.cpp
+./khtml/html/html_miscimpl.cpp
+./khtml/html/html_formimpl.cpp
+./khtml/html/dtd.cpp
+./khtml/html/htmltokenizer.cpp
+./khtml/html/html_inlineimpl.cpp
+./khtml/html/htmlparser.cpp
+./khtml/html/html_headimpl.cpp
+./khtml/html/html_listimpl.cpp
+./khtml/html/doctypes.cpp
+./khtml/html/html_documentimpl.cpp
+./khtml/html/html_imageimpl.cpp
+./khtml/html/html_tableimpl.cpp
+./khtml/html/html_elementimpl.cpp
+./arts/kde/kioinputstream_impl.cpp
+./arts/kde/kaudiorecordstream.cpp
+./arts/kde/kaudiomanagerplay.cpp
+./arts/kde/kaudioplaystream.cpp
+./arts/kde/kdatarequest_impl.cpp
+./arts/kde/kartsserver.cpp
+./arts/kde/kartsfloatwatch.cpp
+./arts/kde/kvideowidget.cpp
+./kstyles/kthemestyle/kthemebase.cpp
+./kstyles/kthemestyle/kthemestyle.cpp
+./kstyles/kthemestyle/kstyledirs.cpp
+./kstyles/utils/installtheme/main.cpp
+./kstyles/klegacy/klegacystyle.cpp
+./kstyles/klegacy/plugin.cpp
+./kstyles/highcolor/highcolor.cpp
+./kstyles/plastik/misc.cpp
+./kstyles/plastik/plastik.cpp
+./kstyles/keramik/gradients.cpp
+./kstyles/keramik/genembed.cpp
+./kstyles/keramik/pixmaploader.cpp
+./kstyles/keramik/keramik.cpp
+./kstyles/keramik/colorutil.cpp
+./kstyles/light/light.cpp
+./kstyles/light/lightstyle-v3.cpp
+./kstyles/light/lightstyle-v2.cpp
+./kstyles/highcontrast/highcontrast.cpp
+./kstyles/web/plugin.cpp
+./kstyles/web/webstyle.cpp
+./kdeui/kpanelextension.cpp
+./kdeui/kwhatsthismanager.cpp
+./kdeui/kfontrequester.cpp
+./kdeui/kdatepicker.cpp
+./kdeui/kcolorbutton.cpp
+./kdeui/kwindowlistmenu.cpp
+./kdeui/ktabwidget.cpp
+./kdeui/ktoolbarlabelaction.cpp
+./kdeui/kled.cpp
+./kdeui/kpanelmenu.cpp
+./kdeui/kseparator.cpp
+./kdeui/klanguagebutton.cpp
+./kdeui/kcolorcombo.cpp
+./kdeui/kdockwidget_private.cpp
+./kdeui/klistview.cpp
+./kdeui/knuminput.cpp
+./kdeui/krestrictedline.cpp
+./kdeui/ktabctl.cpp
+./kdeui/karrowbutton.cpp
+./kdeui/kxmlguifactory_p.cpp
+./kdeui/kcolordialog.cpp
+./kdeui/kguiitem.cpp
+./kdeui/kcompletionbox.cpp
+./kdeui/ktextbrowser.cpp
+./kdeui/ktoolbarradiogroup.cpp
+./kdeui/ktoolbarhandler.cpp
+./kdeui/kdatetimewidget.cpp
+./kdeui/kxmlguiclient.cpp
+./kdeui/kpixmapio.cpp
+./kdeui/kcursor.cpp
+./kdeui/kcmodule.cpp
+./kdeui/kdockwidget.cpp
+./kdeui/kactioncollection.cpp
+./kdeui/klistbox.cpp
+./kdeui/keditlistbox.cpp
+./kdeui/ktabbar.cpp
+./kdeui/knumvalidator.cpp
+./kdeui/khelpmenu.cpp
+./kdeui/kanimwidget.cpp
+./kdeui/kpixmapregionselectordialog.cpp
+./kdeui/kbugreport.cpp
+./kdeui/kdialog.cpp
+./kdeui/kstringvalidator.cpp
+./kdeui/kmainwindow.cpp
+./kdeui/kkeybutton.cpp
+./kdeui/ktip.cpp
+./kdeui/ktimewidget.cpp
+./kdeui/kaboutapplication.cpp
+./kdeui/kcombobox.cpp
+./kdeui/kpanelappmenu.cpp
+./kdeui/kaboutdialog.cpp
+./kdeui/kwordwrap.cpp
+./kdeui/kmenubar.cpp
+./kdeui/kfontcombo.cpp
+./kdeui/kdatewidget.cpp
+./kdeui/kpassdlg.cpp
+./kdeui/kcolordrag.cpp
+./kdeui/kmessagebox.cpp
+./kdeui/kxmlguibuilder.cpp
+./kdeui/kscrollview.cpp
+./kdeui/kwindowinfo.cpp
+./kdeui/kselect.cpp
+./kdeui/kcmenumngr.cpp
+./kdeui/kactivelabel.cpp
+./kdeui/kiconviewsearchline.cpp
+./kdeui/kfontdialog.cpp
+./kdeui/kaction.cpp
+./kdeui/kjanuswidget.cpp
+./kdeui/kkeydialog.cpp
+./kdeui/ktextedit.cpp
+./kdeui/kactionselector.cpp
+./kdeui/kpopupmenu.cpp
+./kdeui/kpushbutton.cpp
+./kdeui/ksharedpixmap.cpp
+./kdeui/klineeditdlg.cpp
+./kdeui/kstatusbar.cpp
+./kdeui/kstdaction.cpp
+./kdeui/klistviewsearchline.cpp
+./kdeui/kpanelapplet.cpp
+./kdeui/ksplashscreen.cpp
+./kdeui/ktimezonewidget.cpp
+./kdeui/kwizard.cpp
+./kdeui/kcommand.cpp
+./kdeui/kactionclasses.cpp
+./kdeui/kdatetbl.cpp
+./kdeui/ksystemtray.cpp
+./kdeui/kmainwindowiface.cpp
+./kdeui/ktoolbarbutton.cpp
+./kdeui/keditcl1.cpp
+./kdeui/kspelldlg.cpp
+./kdeui/kinputdialog.cpp
+./kdeui/kpassivepopup.cpp
+./kdeui/kauthicon.cpp
+./kdeui/kdialogbase.cpp
+./kdeui/kspell.cpp
+./kdeui/kdualcolorbutton.cpp
+./kdeui/kshortcutdialog.cpp
+./kdeui/keditcl2.cpp
+./kdeui/kruler.cpp
+./kdeui/ksyntaxhighlighter.cpp
+./kdeui/kurllabel.cpp
+./kdeui/kaboutkde.cpp
+./kdeui/kcharselect.cpp
+./kdeui/kxmlguifactory.cpp
+./kdeui/ktoolbar.cpp
+./kdeui/krootpixmap.cpp
+./kdeui/kconfigdialog.cpp
+./kdeui/qxembed.cpp
+./kdeui/ksqueezedtextlabel.cpp
+./kdeui/klineedit.cpp
+./kdeui/kpixmapregionselectorwidget.cpp
+./kdeui/kdcopactionproxy.cpp
+./kdeui/kedittoolbar.cpp
+./kdeui/kiconview.cpp
+./kdeui/kprogress.cpp
+./kdeui/kstdguiitem.cpp
+./kdeui/kbuttonbox.cpp
+./kdeui/ksconfig.cpp
+./kdeui/kdetrayproxy/kdetrayproxy.cpp
+./kdeui/kdetrayproxy/module.cpp
+./dcop/dcopobject.cpp
+./dcop/dcopref.cpp
+./dcop/dcopclient.cpp
+./dcop/dcopstub.cpp
+./dcop/testdcop.cpp
+./dcop/dcop_deadlock_test.cpp
+./dcop/dcopsignals.cpp
+./dcop/dcopserver_shutdown_win.cpp
+./dcop/dcopserver_win.cpp
+./dcop/dcopserver.cpp
+./dcop/client/dcop.cpp
+./dcop/client/marshall.cpp
+./dcop/client/dcopquit.cpp
+./dcop/client/dcopfind.cpp
+./dcop/client/dcopstart.cpp
+./dcop/KDE-ICE/ICE-def.cpp
+./dcop/dcopidl/main.cpp
+./dcop/dcopidl2cpp/main.cpp
+./dcop/dcopidl2cpp/stubimpl.cpp
+./dcop/dcopidl2cpp/stub.cpp
+./dcop/dcopidl2cpp/skel.cpp
+./kunittest/tester.cpp
+./kunittest/modrunner.cpp
+./kunittest/samplemodule.cpp
+./kunittest/runner.cpp
+./kconf_update/kconf_update.cpp
+./kdecore/kaboutdata.cpp
+./kdecore/kallocator.cpp
+./kdecore/kcompletionbase.cpp
+./kdecore/ksycocafactory.cpp
+./kdecore/kshortcutlist.cpp
+./kdecore/kconfig.cpp
+./kdecore/kclipboard.cpp
+./kdecore/kconfigskeleton.cpp
+./kdecore/klibloader.cpp
+./kdecore/kurl.cpp
+./kdecore/krfcdate.cpp
+./kdecore/kpalette.cpp
+./kdecore/kshell.cpp
+./kdecore/netsupp.cpp
+./kdecore/kconfigbase.cpp
+./kdecore/kmultipledrag.cpp
+./kdecore/krandomsequence.cpp
+./kdecore/kpixmapprovider.cpp
+./kdecore/kextsock.cpp
+./kdecore/kinstance.cpp
+./kdecore/kasyncio.cpp
+./kdecore/kcheckaccelerators.cpp
+./kdecore/kglobalaccel_x11.cpp
+./kdecore/kcatalogue.cpp
+./kdecore/kprocess.cpp
+./kdecore/kdcoppropertyproxy.cpp
+./kdecore/klocale.cpp
+./kdecore/kmdcodec.cpp
+./kdecore/kkeynative_x11.cpp
+./kdecore/kconfigbackend.cpp
+./kdecore/kapplication_win.cpp
+./kdecore/ksimpleconfig.cpp
+./kdecore/kstartupinfo.cpp
+./kdecore/kglobal.cpp
+./kdecore/kregexp.cpp
+./kdecore/kwin.cpp
+./kdecore/kmimesourcefactory.cpp
+./kdecore/kmanagerselection.cpp
+./kdecore/ksocks.cpp
+./kdecore/kipc.cpp
+./kdecore/kprocctrl.cpp
+./kdecore/kstaticdeleter.cpp
+./kdecore/netwm.cpp
+./kdecore/kstdaccel.cpp
+./kdecore/kicontheme.cpp
+./kdecore/ksycocadict.cpp
+./kdecore/kcmdlineargs.cpp
+./kdecore/ksock.cpp
+./kdecore/klockfile.cpp
+./kdecore/ktempdir.cpp
+./kdecore/kdeversion.cpp
+./kdecore/ksockaddr.cpp
+./kdecore/kdebug.cpp
+./kdecore/ktempfile.cpp
+./kdecore/kckey.cpp
+./kdecore/kconfigdialogmanager.cpp
+./kdecore/netsupp_win32.cpp
+./kdecore/kidna.cpp
+./kdecore/kshortcutmenu.cpp
+./kdecore/kcrash.cpp
+./kdecore/kaudioplayer.cpp
+./kdecore/kxerrorhandler.cpp
+./kdecore/kxmessages.cpp
+./kdecore/kaccelbase.cpp
+./kdecore/kurldrag.cpp
+./kdecore/kbufferedio.cpp
+./kdecore/kprocio.cpp
+./kdecore/kglobalsettings.cpp
+./kdecore/kdesktopfile.cpp
+./kdecore/kglobalaccel.cpp
+./kdecore/ksavefile.cpp
+./kdecore/kaccelmanager.cpp
+./kdecore/kprotocolinfofactory.cpp
+./kdecore/kcalendarsystemhebrew.cpp
+./kdecore/kprotocolinfo_kdecore.cpp
+./kdecore/ksycoca.cpp
+./kdecore/kkeyserver_x11.cpp
+./kdecore/kcompletion.cpp
+./kdecore/knotifyclient.cpp
+./kdecore/kmacroexpander.cpp
+./kdecore/kqiodevicegzip_p.cpp
+./kdecore/kcalendarsystemfactory.cpp
+./kdecore/ktimezones.cpp
+./kdecore/kstringhandler.cpp
+./kdecore/kaccel.cpp
+./kdecore/kiconloader.cpp
+./kdecore/kcharsets.cpp
+./kdecore/libintl.cpp
+./kdecore/kdebugdcopiface.cpp
+./kdecore/kshortcut.cpp
+./kdecore/kmountpoint.cpp
+./kdecore/kstandarddirs.cpp
+./kdecore/kpty.cpp
+./kdecore/kglobalaccel_win.cpp
+./kdecore/kuser.cpp
+./kdecore/kaccelaction.cpp
+./kdecore/kcalendarsystemjalali.cpp
+./kdecore/kcalendarsystemhijri.cpp
+./kdecore/kcalendarsystem.cpp
+./kdecore/kcalendarsystemgregorian.cpp
+./kdecore/kiconeffect.cpp
+./kdecore/kapplication.cpp
+./kdecore/kappdcopiface.cpp
+./kdecore/kuniqueapplication.cpp
+./kdecore/krootprop.cpp
+./kdecore/kvmallocator.cpp
+./kdecore/kwinmodule.cpp
+./kdecore/kconfig_compiler/kconfig_compiler.cpp
+./kdecore/svgicons/ksvgiconengine.cpp
+./kdecore/svgicons/ksvgiconpainter.cpp
+./kdecore/network/kbufferedsocket.cpp
+./kdecore/network/kserversocket.cpp
+./kdecore/network/khttpproxysocketdevice.cpp
+./kdecore/network/kdatagramsocket.cpp
+./kdecore/network/kresolver.cpp
+./kdecore/network/kresolverstandardworkers.cpp
+./kdecore/network/ksocketbase.cpp
+./kdecore/network/kstreamsocket.cpp
+./kdecore/network/kreverseresolver.cpp
+./kdecore/network/ksockssocketdevice.cpp
+./kdecore/network/kclientsocketbase.cpp
+./kdecore/network/ksocketaddress.cpp
+./kdecore/network/ksocketbuffer.cpp
+./kdecore/network/kresolvermanager.cpp
+./kdecore/network/ksrvresolverworker.cpp
+./kdecore/network/ksocketdevice.cpp
+./kdecore/network/kresolverworkerbase.cpp
+./kimgio/ico.cpp
+./kimgio/eps.cpp
+./kimgio/exr.cpp
+./kimgio/jp2.cpp
+./kimgio/rgb.cpp
+./kimgio/xcf.cpp
+./kimgio/tiffr.cpp
+./kimgio/hdr.cpp
+./kimgio/xview.cpp
+./kimgio/dds.cpp
+./kimgio/pcx.cpp
+./kimgio/tga.cpp
+./kimgio/g3r.cpp
+./kimgio/psd.cpp
+./obj-x86_64-linux-gnu/arts/kde/libartskde_la.all_cpp.cpp
+./obj-x86_64-linux-gnu/arts/knotify/knotify_skel.cpp
+./obj-x86_64-linux-gnu/arts/knotify/knotify_la.all_cpp.cpp
+./obj-x86_64-linux-gnu/dcop/dcopserver_dummy.cpp
+./obj-x86_64-linux-gnu/dcop/libkdeinit_dcopserver_la.all_cpp.cpp
+./obj-x86_64-linux-gnu/dcop/libDCOP_la.all_cpp.cpp
+./obj-x86_64-linux-gnu/dcop/dcopserver.la.cpp
+./obj-x86_64-linux-gnu/dcop/dcopidl2cpp/dcopidl2cpp.all_cpp.cpp
+./obj-x86_64-linux-gnu/dnssd/settings.cpp
+./obj-x86_64-linux-gnu/dnssd/libkdnssd_la.all_cpp.cpp
+./obj-x86_64-linux-gnu/interfaces/kimproxy/library/kimiface_stub.cpp
+./obj-x86_64-linux-gnu/interfaces/kimproxy/library/kimproxyiface_skel.cpp
+./obj-x86_64-linux-gnu/interfaces/kimproxy/library/libkimproxy_la.all_cpp.cpp
+./obj-x86_64-linux-gnu/interfaces/kmediaplayer/playerdcopobject_skel.cpp
+./obj-x86_64-linux-gnu/interfaces/kmediaplayer/libkmediaplayer_la.all_cpp.cpp
+./obj-x86_64-linux-gnu/interfaces/kscript/scriptclientinterface.moc.cpp
+./obj-x86_64-linux-gnu/interfaces/kscript/libkscript_la.all_cpp.cpp
+./obj-x86_64-linux-gnu/interfaces/ktexteditor/editdcopinterface_skel.cpp
+./obj-x86_64-linux-gnu/interfaces/ktexteditor/clipboarddcopinterface_skel.cpp
+./obj-x86_64-linux-gnu/interfaces/ktexteditor/selectiondcopinterface_skel.cpp
+./obj-x86_64-linux-gnu/interfaces/ktexteditor/searchdcopinterface_skel.cpp
+./obj-x86_64-linux-gnu/interfaces/ktexteditor/blockselectiondcopinterface_skel.cpp
+./obj-x86_64-linux-gnu/interfaces/ktexteditor/documentdcopinfo_skel.cpp
+./obj-x86_64-linux-gnu/interfaces/ktexteditor/encodingdcopinterface_skel.cpp
+./obj-x86_64-linux-gnu/interfaces/ktexteditor/printdcopinterface_skel.cpp
+./obj-x86_64-linux-gnu/interfaces/ktexteditor/undodcopinterface_skel.cpp
+./obj-x86_64-linux-gnu/interfaces/ktexteditor/viewcursordcopinterface_skel.cpp
+./obj-x86_64-linux-gnu/interfaces/ktexteditor/viewstatusmsgdcopinterface_skel.cpp
+./obj-x86_64-linux-gnu/interfaces/ktexteditor/selectionextdcopinterface_skel.cpp
+./obj-x86_64-linux-gnu/interfaces/ktexteditor/editorchooser_ui.cpp
+./obj-x86_64-linux-gnu/interfaces/ktexteditor/libktexteditor_la.all_cpp.cpp
+./obj-x86_64-linux-gnu/kabc/addressee.cpp
+./obj-x86_64-linux-gnu/kabc/field.cpp
+./obj-x86_64-linux-gnu/kabc/addresseehelper_skel.cpp
+./obj-x86_64-linux-gnu/kabc/libkabc_la.all_cpp.cpp
+./obj-x86_64-linux-gnu/kabc/plugins/dir/libkabc_dir_la.all_cpp.cpp
+./obj-x86_64-linux-gnu/kabc/plugins/file/libkabc_file_la.all_cpp.cpp
+./obj-x86_64-linux-gnu/kabc/plugins/ldapkio/libkabc_ldapkio_la.all_cpp.cpp
+./obj-x86_64-linux-gnu/kabc/vcardparser/libvcards_la.all_cpp.cpp
+./obj-x86_64-linux-gnu/kate/interfaces/libkatepartinterfaces_la.all_cpp.cpp
+./obj-x86_64-linux-gnu/kate/part/dummy.cpp
+./obj-x86_64-linux-gnu/kate/part/katedocument_skel.cpp
+./obj-x86_64-linux-gnu/kate/part/libkate_la.all_cpp.cpp
+./obj-x86_64-linux-gnu/kcmshell/kcmshell_dummy.cpp
+./obj-x86_64-linux-gnu/kcmshell/main_skel.cpp
+./obj-x86_64-linux-gnu/kcmshell/libkdeinit_kcmshell_la.all_cpp.cpp
+./obj-x86_64-linux-gnu/kcmshell/kcmshell.la.cpp
+./obj-x86_64-linux-gnu/kconf_update/kconf_update_dummy.cpp
+./obj-x86_64-linux-gnu/kconf_update/kconf_update.la.cpp
+./obj-x86_64-linux-gnu/kdecore/kde-config.cpp
+./obj-x86_64-linux-gnu/kdecore/ksycoca_skel.cpp
+./obj-x86_64-linux-gnu/kdecore/kappdcopiface_skel.cpp
+./obj-x86_64-linux-gnu/kdecore/kdebugdcopiface_skel.cpp
+./obj-x86_64-linux-gnu/kdecore/libkdecore_la.all_cpp.cpp
+./obj-x86_64-linux-gnu/kdecore/network/libkdecorenetwork_la.all_cpp.cpp
+./obj-x86_64-linux-gnu/kdecore/svgicons/libkdesvgicons_la.all_cpp.cpp
+./obj-x86_64-linux-gnu/kded/kded_dummy.cpp
+./obj-x86_64-linux-gnu/kded/libkdeinit_kded_la.all_cpp.cpp
+./obj-x86_64-linux-gnu/kded/kbuildsycoca_dummy.cpp
+./obj-x86_64-linux-gnu/kded/libkdeinit_kbuildsycoca_la.all_cpp.cpp
+./obj-x86_64-linux-gnu/kded/kded.la.cpp
+./obj-x86_64-linux-gnu/kded/kbuildsycoca.la.cpp
+./obj-x86_64-linux-gnu/kdefx/libkdefx_la.all_cpp.cpp
+./obj-x86_64-linux-gnu/kdeprint/kdeprintd_skel.cpp
+./obj-x86_64-linux-gnu/kdeprint/kmfactory_skel.cpp
+./obj-x86_64-linux-gnu/kdeprint/cups/kdeprint_cups_la.all_cpp.cpp
+./obj-x86_64-linux-gnu/kdeprint/cups/cupsdconf2/cupsdconf_dummy.cpp
+./obj-x86_64-linux-gnu/kdeprint/cups/cupsdconf2/libkdeinit_cupsdconf_la.all_cpp.cpp
+./obj-x86_64-linux-gnu/kdeprint/cups/cupsdconf2/cupsdconf.la.cpp
+./obj-x86_64-linux-gnu/kdeprint/ext/kdeprint_ext_la.all_cpp.cpp
+./obj-x86_64-linux-gnu/kdeprint/lpdunix/kdeprint_lpdunix_la.all_cpp.cpp
+./obj-x86_64-linux-gnu/kdeprint/lpr/kdeprint_lpr_la.all_cpp.cpp
+./obj-x86_64-linux-gnu/kdeprint/management/libkdeprint_management_la.all_cpp.cpp
+./obj-x86_64-linux-gnu/kdeprint/management/kaddprinterwizard_dummy.cpp
+./obj-x86_64-linux-gnu/kdeprint/management/kaddprinterwizard.la.cpp
+./obj-x86_64-linux-gnu/kdeprint/rlpr/kdeprint_rlpr_la.all_cpp.cpp
+./obj-x86_64-linux-gnu/kdesu/libkdesu_la.all_cpp.cpp
+./obj-x86_64-linux-gnu/kdeui/kmainwindowiface_skel.cpp
+./obj-x86_64-linux-gnu/kdeui/kshortcutdialog_simple.cpp
+./obj-x86_64-linux-gnu/kdeui/kshortcutdialog_advanced.cpp
+./obj-x86_64-linux-gnu/kdeui/kspellui.cpp
+./obj-x86_64-linux-gnu/kdeui/dummy.cpp
+./obj-x86_64-linux-gnu/kdeui/libkdeui_la.all_cpp.cpp
+./obj-x86_64-linux-gnu/kdeui/kdetrayproxy/module_skel.cpp
+./obj-x86_64-linux-gnu/kdeui/kdetrayproxy/kded_kdetrayproxy_la.all_cpp.cpp
+./obj-x86_64-linux-gnu/kdewidgets/kdewidgets.cpp
+./obj-x86_64-linux-gnu/kdewidgets/kdewidgets_la.all_cpp.cpp
+./obj-x86_64-linux-gnu/kdoctools/kbzip2filter.cpp
+./obj-x86_64-linux-gnu/kdoctools/kio_help_la.all_cpp.cpp
+./obj-x86_64-linux-gnu/kdoctools/kio_ghelp_la.all_cpp.cpp
+./obj-x86_64-linux-gnu/kdoctools/xslt_pure.cpp
+./obj-x86_64-linux-gnu/khtml/dummy.cpp
+./obj-x86_64-linux-gnu/khtml/libkhtml_la.all_cpp.cpp
+./obj-x86_64-linux-gnu/khtml/imgdummy.cpp
+./obj-x86_64-linux-gnu/khtml/css/libkhtmlcss_la.all_cpp.cpp
+./obj-x86_64-linux-gnu/khtml/dom/libkhtmldom_la.all_cpp.cpp
+./obj-x86_64-linux-gnu/khtml/ecma/libkjs_html_la.all_cpp.cpp
+./obj-x86_64-linux-gnu/khtml/html/libkhtmlhtml_la.all_cpp.cpp
+./obj-x86_64-linux-gnu/khtml/java/libkjava_la.all_cpp.cpp
+./obj-x86_64-linux-gnu/khtml/java/kjavaappletviewer_la.all_cpp.cpp
+./obj-x86_64-linux-gnu/khtml/java/dummy/dummy.cpp
+./obj-x86_64-linux-gnu/khtml/misc/libkhtmlmisc_la.all_cpp.cpp
+./obj-x86_64-linux-gnu/khtml/rendering/libkhtmlrender_la.all_cpp.cpp
+./obj-x86_64-linux-gnu/khtml/xml/libkhtmlxml_la.all_cpp.cpp
+./obj-x86_64-linux-gnu/kinit/klauncher_dummy.cpp
+./obj-x86_64-linux-gnu/kinit/libkdeinit_klauncher_la.all_cpp.cpp
+./obj-x86_64-linux-gnu/kinit/kdeinit.all_cpp.cpp
+./obj-x86_64-linux-gnu/kinit/klauncher.la.cpp
+./obj-x86_64-linux-gnu/kio/dummy.cpp
+./obj-x86_64-linux-gnu/kio/kfile/knotifywidgetbase.cpp
+./obj-x86_64-linux-gnu/kio/kfile/kpropertiesdesktopbase.cpp
+./obj-x86_64-linux-gnu/kio/kfile/kpropertiesdesktopadvbase.cpp
+./obj-x86_64-linux-gnu/kio/kfile/kpropertiesmimetypebase.cpp
+./obj-x86_64-linux-gnu/kio/kfile/libkfile_la.all_cpp.cpp
+./obj-x86_64-linux-gnu/kio/kio/observer_stub.cpp
+./obj-x86_64-linux-gnu/kio/kio/uiserver_stub.cpp
+./obj-x86_64-linux-gnu/kio/kio/kdirnotify_skel.cpp
+./obj-x86_64-linux-gnu/kio/kio/observer_skel.cpp
+./obj-x86_64-linux-gnu/kio/kio/libkiocore_la.all_cpp.cpp
+./obj-x86_64-linux-gnu/kio/kio/libksycoca_la.all_cpp.cpp
+./obj-x86_64-linux-gnu/kio/kpasswdserver/kpasswdserver_skel.cpp
+./obj-x86_64-linux-gnu/kio/kpasswdserver/kded_kpasswdserver_la.all_cpp.cpp
+./obj-x86_64-linux-gnu/kio/misc/kio_uiserver_dummy.cpp
+./obj-x86_64-linux-gnu/kio/misc/observer_stub.cpp
+./obj-x86_64-linux-gnu/kio/misc/uiserver_skel.cpp
+./obj-x86_64-linux-gnu/kio/misc/libkdeinit_kio_uiserver_la.all_cpp.cpp
+./obj-x86_64-linux-gnu/kio/misc/kio_uiserver.la.cpp
+./obj-x86_64-linux-gnu/kio/misc/kntlm/libkntlm_la.all_cpp.cpp
+./obj-x86_64-linux-gnu/kio/misc/kpac/proxyscout_skel.cpp
+./obj-x86_64-linux-gnu/kio/misc/kpac/kded_proxyscout_la.all_cpp.cpp
+./obj-x86_64-linux-gnu/kio/misc/ksendbugmail/ksendbugmail.all_cpp.cpp
+./obj-x86_64-linux-gnu/kio/misc/kssld/kssld_skel.cpp
+./obj-x86_64-linux-gnu/kio/misc/kssld/kded_kssld_la.all_cpp.cpp
+./obj-x86_64-linux-gnu/kio/misc/kwalletd/kwalletd_skel.cpp
+./obj-x86_64-linux-gnu/kio/misc/kwalletd/kwalletwizard.cpp
+./obj-x86_64-linux-gnu/kio/misc/kwalletd/kbetterthankdialogbase.cpp
+./obj-x86_64-linux-gnu/kio/misc/kwalletd/kded_kwalletd_la.all_cpp.cpp
+./obj-x86_64-linux-gnu/kioslave/http/kcookiejar/kcookieserver_skel.cpp
+./obj-x86_64-linux-gnu/kioslave/http/kcookiejar/kded_kcookiejar_la.all_cpp.cpp
+./obj-x86_64-linux-gnu/kioslave/http/kcookiejar/kcookiejar_dummy.cpp
+./obj-x86_64-linux-gnu/kioslave/http/kcookiejar/kcookiejar.la.cpp
+./obj-x86_64-linux-gnu/kjs/libkjs_la.all_cpp.cpp
+./obj-x86_64-linux-gnu/kmdi/libkmdi_la.all_cpp.cpp
+./obj-x86_64-linux-gnu/kmdi/kmdi/libkmdi2_la.all_cpp.cpp
+./obj-x86_64-linux-gnu/knewstuff/libknewstuff_la.all_cpp.cpp
+./obj-x86_64-linux-gnu/kparts/libkparts_la.all_cpp.cpp
+./obj-x86_64-linux-gnu/kresources/manageriface_stub.cpp
+./obj-x86_64-linux-gnu/kresources/manageriface_skel.cpp
+./obj-x86_64-linux-gnu/kresources/libkresources_la.all_cpp.cpp
+./obj-x86_64-linux-gnu/kspell2/libkspell2base_la.all_cpp.cpp
+./obj-x86_64-linux-gnu/kspell2/plugins/aspell/kspell_aspell_la.all_cpp.cpp
+./obj-x86_64-linux-gnu/kspell2/plugins/hspell/kspell_hspell_la.all_cpp.cpp
+./obj-x86_64-linux-gnu/kspell2/plugins/ispell/kspell_ispell_la.all_cpp.cpp
+./obj-x86_64-linux-gnu/kspell2/ui/kspell2ui.cpp
+./obj-x86_64-linux-gnu/kspell2/ui/configui.cpp
+./obj-x86_64-linux-gnu/kspell2/ui/libkspell2_noinst_la.all_cpp.cpp
+./obj-x86_64-linux-gnu/kstyles/keramik/keramik_la.all_cpp.cpp
+./obj-x86_64-linux-gnu/kstyles/kthemestyle/kthemestyle_la.all_cpp.cpp
+./obj-x86_64-linux-gnu/kstyles/light/light_la.all_cpp.cpp
+./obj-x86_64-linux-gnu/kstyles/plastik/plastik_la.all_cpp.cpp
+./obj-x86_64-linux-gnu/kunittest/libkunittest_la.all_cpp.cpp
+./obj-x86_64-linux-gnu/kutils/kcmoduleproxyIface_skel.cpp
+./obj-x86_64-linux-gnu/kutils/libkutils_la.all_cpp.cpp
+./obj-x86_64-linux-gnu/kutils/ksettings/libksettings_la.all_cpp.cpp
+./obj-x86_64-linux-gnu/libkscreensaver/libkscreensaver_la.all_cpp.cpp
+./libkmid/mt32togm.cc
+./libkmid/fmout.cc
+./libkmid/voiceman.cc
+./libkmid/player.cc
+./libkmid/midistat.cc
+./libkmid/gusout.cc
+./libkmid/alsaout.cc
+./libkmid/midfile.cc
+./libkmid/dattypes.cc
+./libkmid/notearray.cc
+./libkmid/midiout.cc
+./libkmid/track.cc
+./libkmid/deviceman.cc
+./libkmid/midimapper.cc
+./libkmid/synthout.cc
+./libkmid/libkmid.cc
+./kwallet/client/kwallet.cc
+./kwallet/backend/blowfish.cc
+./kwallet/backend/blockcipher.cc
+./kwallet/backend/kwalletbackend.cc
+./kwallet/backend/cbc.cc
+./kwallet/backend/sha1.cc
+./kwallet/backend/kwalletentry.cc
+./interfaces/terminal/test/main.cc
+./kab/qconfigDB.cc
+./kab/addressbook.cc
+./kab/kabapi.cc
+./kcert/kcertpart.cc
+./khtml/khtml_iface.cc
+./khtml/khtml_settings.cc
+./arts/message/artsmessage.cc
+./arts/kde/kconverttest.cc
+./arts/kde/kiotest.cc
+./arts/kde/kplayobjectfactory.cc
+./arts/kde/kplayobject.cc
+./arts/kde/kiotestslow.cc
+./arts/kde/kaudioconverter.cc
+./arts/kde/kplayobjectcreator.cc
+./arts/kde/kartsdispatcher.cc
+./dcop/dcopidl/yacc.cc
+./dcop/dcopidl/scanner.cc
+./obj-x86_64-linux-gnu/arts/kde/artskde.cc
+./obj-x86_64-linux-gnu/arts/kde/libartskde_la.all_cc.cc
+./obj-x86_64-linux-gnu/dcop/dcopidl/dcopidl.all_cc.cc
+./obj-x86_64-linux-gnu/kab/libkab_la.all_cc.cc
+./obj-x86_64-linux-gnu/khtml/khtml_iface_skel.cc
+./obj-x86_64-linux-gnu/khtml/kjserrordlg.cc
+./obj-x86_64-linux-gnu/khtml/htmlpageinfo.cc
+./obj-x86_64-linux-gnu/khtml/libkhtml_la.all_cc.cc
+./obj-x86_64-linux-gnu/kio/bookmarks/kbookmarkmanager_skel.cc
+./obj-x86_64-linux-gnu/kio/bookmarks/kbookmarknotifier_skel.cc
+./obj-x86_64-linux-gnu/kio/bookmarks/libkbookmarks_la.all_cc.cc
+./obj-x86_64-linux-gnu/kio/kssl/keygenwizard.cc
+./obj-x86_64-linux-gnu/kio/kssl/keygenwizard2.cc
+./obj-x86_64-linux-gnu/kio/kssl/libkssl_la.all_cc.cc
+./obj-x86_64-linux-gnu/kioslave/http/kio_http_cache_cleaner_dummy.cc
+./obj-x86_64-linux-gnu/kioslave/http/kio_http_cache_cleaner.la.cc
+./obj-x86_64-linux-gnu/kwallet/backend/libkwalletbackend_la.all_cc.cc
+./obj-x86_64-linux-gnu/kwallet/client/kwallet_skel.cc
+./obj-x86_64-linux-gnu/kwallet/client/libkwalletclient_la.all_cc.cc
+./obj-x86_64-linux-gnu/libkmid/libkmid_la.all_cc.cc
+./kded/kbuildsycoca.h
+./kded/kbuildservicetypefactory.h
+./kded/kbuildservicegroupfactory.h
+./kded/kbuildprotocolinfofactory.h
+./kded/kresourcelist.h
+./kded/kdedmodule.h
+./kded/kbuildservicefactory.h
+./kded/kctimefactory.h
+./kded/vfolder_menu.h
+./kded/kded.h
+./kded/kbuildimageiofactory.h
+./kded/test/test.h
+./libkmid/midispec.h
+./libkmid/gusout.h
+./libkmid/synthout.h
+./libkmid/alsaout.h
+./libkmid/gusvoices.h
+./libkmid/midiout.h
+./libkmid/fmout.h
+./libkmid/dattypes.h
+./libkmid/mt32togm.h
+./libkmid/sndcard.h
+./libkmid/midistat.h
+./libkmid/track.h
+./libkmid/player.h
+./libkmid/notearray.h
+./libkmid/libkmid.h
+./libkmid/deviceman.h
+./libkmid/midimapper.h
+./libkmid/voiceman.h
+./libkmid/awe_sup.h
+./libkmid/midfile.h
+./kparts/dockmainwindow.h
+./kparts/historyprovider.h
+./kparts/part.h
+./kparts/plugin.h
+./kparts/browserinterface.h
+./kparts/browserrun.h
+./kparts/event.h
+./kparts/factory.h
+./kparts/partmanager.h
+./kparts/browserextension.h
+./kparts/genericfactory.h
+./kparts/mainwindow.h
+./kparts/componentfactory.h
+./kparts/statusbarextension.h
+./kparts/design.h
+./kwallet/client/kwallettypes.h
+./kwallet/client/kwallet.h
+./kwallet/backend/blowfish.h
+./kwallet/backend/blowfishtables.h
+./kwallet/backend/kwalletbackend.h
+./kwallet/backend/blockcipher.h
+./kwallet/backend/sha1.h
+./kwallet/backend/cbc.h
+./kwallet/backend/kwalletentry.h
+./kspell2/backgroundengine.h
+./kspell2/client.h
+./kspell2/backgroundchecker.h
+./kspell2/settings.h
+./kspell2/dictionary.h
+./kspell2/broker.h
+./kspell2/backgroundthread.h
+./kspell2/filter.h
+./kspell2/defaultdictionary.h
+./kspell2/threadevents.h
+./kspell2/ui/dialog.h
+./kspell2/ui/configdialog.h
+./kspell2/ui/configwidget.h
+./kspell2/ui/highlighter.h
+./kspell2/plugins/hspell/kspell_hspellclient.h
+./kspell2/plugins/hspell/kspell_hspelldict.h
+./kspell2/plugins/aspell/kspell_aspellclient.h
+./kspell2/plugins/aspell/kspell_aspelldict.h
+./kspell2/plugins/ispell/sp_spell.h
+./kspell2/plugins/ispell/msgs.h
+./kspell2/plugins/ispell/ispell_def.h
+./kspell2/plugins/ispell/kspell_ispelldict.h
+./kspell2/plugins/ispell/ispell_checker.h
+./kspell2/plugins/ispell/kspell_ispellclient.h
+./kspell2/plugins/ispell/ispell.h
+./kutils/kreplace.h
+./kutils/kcmodulecontainer.h
+./kutils/kfinddialog.h
+./kutils/kpluginselector_p.h
+./kutils/kcmoduleproxyIfaceImpl.h
+./kutils/kpluginselector.h
+./kutils/kplugininfo.h
+./kutils/kfind.h
+./kutils/kcmultidialog.h
+./kutils/kmultitabbar.h
+./kutils/kcmoduleloader.h
+./kutils/kreplacedialog.h
+./kutils/kcmoduleproxyIface.h
+./kutils/kmultitabbar_p.h
+./kutils/kcmoduleproxy.h
+./kutils/kcmoduleinfo.h
+./kutils/ksettings/dialog.h
+./kutils/ksettings/pluginpage.h
+./kutils/ksettings/componentsdialog.h
+./kutils/ksettings/dispatcher.h
+./kdewidgets/classpreviews.h
+./kresources/configdialog.h
+./kresources/configpage.h
+./kresources/kcmkresources.h
+./kresources/configwidget.h
+./kresources/selectdialog.h
+./kresources/manager.h
+./kresources/factory.h
+./kresources/manageriface.h
+./kresources/resource.h
+./kresources/managerimpl.h
+./kdefx/kpixmapsplitter.h
+./kdefx/kimageeffect.h
+./kdefx/kstyle.h
+./kdefx/kcpuinfo.h
+./kdefx/kdrawutil.h
+./kdefx/kpixmapeffect.h
+./kdefx/kpixmap.h
+./interfaces/kio/http.h
+./interfaces/ktexteditor/editinterface.h
+./interfaces/ktexteditor/clipboardinterface.h
+./interfaces/ktexteditor/viewcursordcopinterface.h
+./interfaces/ktexteditor/view.h
+./interfaces/ktexteditor/blockselectioninterface.h
+./interfaces/ktexteditor/document.h
+./interfaces/ktexteditor/searchinterface.h
+./interfaces/ktexteditor/undodcopinterface.h
+./interfaces/ktexteditor/selectioninterface.h
+./interfaces/ktexteditor/viewstatusmsginterface.h
+./interfaces/ktexteditor/markinterfaceextension.h
+./interfaces/ktexteditor/documentdcopinfo.h
+./interfaces/ktexteditor/selectioninterfaceext.h
+./interfaces/ktexteditor/editdcopinterface.h
+./interfaces/ktexteditor/encodingdcopinterface.h
+./interfaces/ktexteditor/viewstatusmsgdcopinterface.h
+./interfaces/ktexteditor/configinterface.h
+./interfaces/ktexteditor/blockselectiondcopinterface.h
+./interfaces/ktexteditor/printdcopinterface.h
+./interfaces/ktexteditor/editor.h
+./interfaces/ktexteditor/templateinterface.h
+./interfaces/ktexteditor/plugin.h
+./interfaces/ktexteditor/markinterface.h
+./interfaces/ktexteditor/selectionextdcopinterface.h
+./interfaces/ktexteditor/searchdcopinterface.h
+./interfaces/ktexteditor/undointerface.h
+./interfaces/ktexteditor/printinterface.h
+./interfaces/ktexteditor/highlightinginterface.h
+./interfaces/ktexteditor/editinterfaceext.h
+./interfaces/ktexteditor/documentinfo.h
+./interfaces/ktexteditor/encodinginterface.h
+./interfaces/ktexteditor/variableinterface.h
+./interfaces/ktexteditor/texthintinterface.h
+./interfaces/ktexteditor/wordwrapinterface.h
+./interfaces/ktexteditor/codecompletioninterface.h
+./interfaces/ktexteditor/cursorinterface.h
+./interfaces/ktexteditor/viewcursorinterface.h
+./interfaces/ktexteditor/clipboarddcopinterface.h
+./interfaces/ktexteditor/configinterfaceextension.h
+./interfaces/ktexteditor/sessionconfiginterface.h
+./interfaces/ktexteditor/popupmenuinterface.h
+./interfaces/ktexteditor/editorchooser.h
+./interfaces/ktexteditor/dynwordwrapinterface.h
+./interfaces/ktexteditor/selectiondcopinterface.h
+./interfaces/terminal/kde_terminal_interface.h
+./interfaces/terminal/test/main.h
+./interfaces/kspeech/kspeech.h
+./interfaces/kspeech/kspeechsink.h
+./interfaces/kmediaplayer/view.h
+./interfaces/kmediaplayer/player.h
+./interfaces/kmediaplayer/playerdcopobject.h
+./interfaces/kregexpeditor/kregexpeditorinterface.h
+./interfaces/kscript/scriptmanager.h
+./interfaces/kscript/scriptloader.h
+./interfaces/kscript/scriptinterface.h
+./interfaces/kscript/scriptclientinterface.h
+./interfaces/kscript/sample/shellscript.h
+./interfaces/khexedit/clipboardinterface.h
+./interfaces/khexedit/charcolumninterface.h
+./interfaces/khexedit/zoominterface.h
+./interfaces/khexedit/byteseditinterface.h
+./interfaces/khexedit/valuecolumninterface.h
+./interfaces/kimproxy/interface/kimiface.h
+./kinit/klauncher.h
+./kinit/klauncher_cmds.h
+./kinit/setproctitle.h
+./kinit/autostart.h
+./libltdl/ltdl.h
+./libltdl/ltdl_win.h
+./win/in.h
+./win/socket.h
+./win/qeventloopex.h
+./win/signal.h
+./win/kdemacros.h
+./win/unistd.h
+./win/utime.h
+./win/limits.h
+./win/kdelibs_export_win.h
+./win/readdir.h
+./win/win32_utils.h
+./win/config.h
+./win/syslog.h
+./win/stdlib.h
+./win/pwd.h
+./win/strings.h
+./win/kdelibs_global_win.h
+./win/grp.h
+./win/dirent.h
+./win/stdint.h
+./win/ctype.h
+./win/netdb.h
+./win/fcntl.h
+./win/kde_file_win.h
+./win/string.h
+./win/sys/socket.h
+./win/sys/times.h
+./win/sys/signal.h
+./win/sys/wait.h
+./win/sys/types.h
+./win/sys/utsname.h
+./win/sys/lock.h
+./win/sys/mman.h
+./win/sys/file.h
+./win/sys/param.h
+./win/sys/un.h
+./win/sys/time.h
+./win/sys/stat.h
+./win/sys/fcntl.h
+./win/sys/resource.h
+./win/sys/uio.h
+./win/asm/socket.h
+./win/asm/byteorder.h
+./win/netinet/in.h
+./win/machine/types.h
+./kabc/vcardtool.h
+./kabc/distributionlist.h
+./kabc/phonenumber.h
+./kabc/distributionlistdialog.h
+./kabc/resourceselectdialog.h
+./kabc/format.h
+./kabc/ldif.h
+./kabc/ldapclient.h
+./kabc/locknull.h
+./kabc/geo.h
+./kabc/vcardformat.h
+./kabc/plugin.h
+./kabc/lock.h
+./kabc/timezone.h
+./kabc/addresseelist.h
+./kabc/vcard21parser.h
+./kabc/field.h
+./kabc/agent.h
+./kabc/ldapurl.h
+./kabc/vcardconverter.h
+./kabc/secrecy.h
+./kabc/ldifconverter.h
+./kabc/key.h
+./kabc/stdaddressbook.h
+./kabc/addressbook.h
+./kabc/address.h
+./kabc/ldapconfigwidget.h
+./kabc/addresseedialog.h
+./kabc/vcardformatplugin.h
+./kabc/resource.h
+./kabc/addresslineedit.h
+./kabc/formatfactory.h
+./kabc/formatplugin.h
+./kabc/sound.h
+./kabc/addresseehelper.h
+./kabc/vcardformatimpl.h
+./kabc/picture.h
+./kabc/errorhandler.h
+./kabc/sortmode.h
+./kabc/distributionlisteditor.h
+./kabc/addressee.h
+./kabc/scripts/addressee.src.h
+./kabc/vcardparser/testutils.h
+./kabc/vcardparser/vcard.h
+./kabc/vcardparser/vcardparser.h
+./kabc/vcardparser/vcardline.h
+./kabc/vcard/include/VCardClassValue.h
+./kabc/vcard/include/VCardSndValue.h
+./kabc/vcard/include/VCardGeoValue.h
+./kabc/vcard/include/VCardNValue.h
+./kabc/vcard/include/VCardRToken.h
+./kabc/vcard/include/VCardURIValue.h
+./kabc/vcard/include/VCardOrgValue.h
+./kabc/vcard/include/VCardAgentParam.h
+./kabc/vcard/include/VCard.h
+./kabc/vcard/include/VCardEmailParam.h
+./kabc/vcard/include/VCardEntity.h
+./kabc/vcard/include/VCardEnum.h
+./kabc/vcard/include/VCardTelParam.h
+./kabc/vcard/include/VCardTextBinValue.h
+./kabc/vcard/include/VCardImgValue.h
+./kabc/vcard/include/VCardTextListValue.h
+./kabc/vcard/include/VCardVCardEntity.h
+./kabc/vcard/include/VCardPhoneNumberValue.h
+./kabc/vcard/include/VCardSoundValue.h
+./kabc/vcard/include/VCardVCard.h
+./kabc/vcard/include/VCardTextBinParam.h
+./kabc/vcard/include/VCardAdrParam.h
+./kabc/vcard/include/VCardValue.h
+./kabc/vcard/include/VCardGroup.h
+./kabc/vcard/include/VCardSourceParam.h
+./kabc/vcard/include/VCardImageValue.h
+./kabc/vcard/include/VCardDateParam.h
+./kabc/vcard/include/VCardTextParam.h
+./kabc/vcard/include/VCardContentLine.h
+./kabc/vcard/include/VCardTextValue.h
+./kabc/vcard/include/VCardAdrValue.h
+./kabc/vcard/include/VCardUTCValue.h
+./kabc/vcard/include/VCardAgentValue.h
+./kabc/vcard/include/VCardDefines.h
+./kabc/vcard/include/VCardDateValue.h
+./kabc/vcard/include/VCardLangValue.h
+./kabc/vcard/include/VCardParam.h
+./kabc/vcard/include/VCardImageParam.h
+./kabc/vcard/include/VCardTelValue.h
+./kabc/vcard/include/VCardFloatValue.h
+./kabc/vcard/include/generated/Param-generated.h
+./kabc/vcard/include/generated/Value-generated.h
+./kabc/vcard/include/generated/VCard-generated.h
+./kabc/vcard/include/generated/NValue-generated.h
+./kabc/vcard/include/generated/TextListValue-generated.h
+./kabc/vcard/include/generated/TextBinValue-generated.h
+./kabc/vcard/include/generated/VCardEntity-generated.h
+./kabc/vcard/include/generated/DateValue-generated.h
+./kabc/vcard/include/generated/PhoneNumberValue-generated.h
+./kabc/vcard/include/generated/Group-generated.h
+./kabc/vcard/include/generated/ParamName-generated.h
+./kabc/vcard/include/generated/SourceParam-generated.h
+./kabc/vcard/include/generated/DateParam-generated.h
+./kabc/vcard/include/generated/OrgValue-generated.h
+./kabc/vcard/include/generated/Name-generated.h
+./kabc/vcard/include/generated/ContentLine-generated.h
+./kabc/vcard/include/generated/TextBinParam-generated.h
+./kabc/vcard/include/generated/LangValue-generated.h
+./kabc/vcard/include/generated/ImageParam-generated.h
+./kabc/vcard/include/generated/ImgParam-generated.h
+./kabc/vcard/include/generated/SoundValue-generated.h
+./kabc/vcard/include/generated/EmailParam-generated.h
+./kabc/vcard/include/generated/AgentParam-generated.h
+./kabc/vcard/include/generated/TextValue-generated.h
+./kabc/vcard/include/generated/TelParam-generated.h
+./kabc/vcard/include/generated/AdrParam-generated.h
+./kabc/vcard/include/generated/ParamValue-generated.h
+./kabc/vcard/include/generated/ClassValue-generated.h
+./kabc/vcard/include/generated/AgentValue-generated.h
+./kabc/vcard/include/generated/ImgValue-generated.h
+./kabc/vcard/include/generated/URIValue-generated.h
+./kabc/vcard/include/generated/TextNSParam-generated.h
+./kabc/vcard/include/generated/ImageValue-generated.h
+./kabc/vcard/include/generated/GeoValue-generated.h
+./kabc/vcard/include/generated/TelValue-generated.h
+./kabc/vcard/include/generated/TextParam-generated.h
+./kabc/vcard/include/generated/AdrValue-generated.h
+./kabc/vcard/include/generated/UTCValue-generated.h
+./kabc/vcard/include/generated/FloatValue-generated.h
+./kmdi/kmdinulliterator.h
+./kmdi/kmdidockcontainer.h
+./kmdi/kmdichildview.h
+./kmdi/kmdichildfrm.h
+./kmdi/kmditaskbar.h
+./kmdi/kmdifocuslist.h
+./kmdi/kmdiguiclient.h
+./kmdi/kmdiiterator.h
+./kmdi/kmdilistiterator.h
+./kmdi/kmdidocumentviewtabwidget.h
+./kmdi/kmdidefines.h
+./kmdi/kmdichildfrmcaption.h
+./kmdi/kmditoolviewaccessor_p.h
+./kmdi/kmdichildarea.h
+./kmdi/kmditoolviewaccessor.h
+./kmdi/kmdimainfrm.h
+./kmdi/test/hello.h
+./kmdi/test/mainwidget.h
+./kmdi/kmdi/toolviewaccessor_p.h
+./kmdi/kmdi/tabwidget.h
+./kmdi/kmdi/dockcontainer.h
+./kmdi/kmdi/toolviewaccessor.h
+./kmdi/kmdi/mainwindow.h
+./kmdi/kmdi/global.h
+./kmdi/kmdi/guiclient.h
+./dnssd/responder.h
+./dnssd/sdevent.h
+./dnssd/servicebase.h
+./dnssd/servicebrowser.h
+./dnssd/remoteservice.h
+./dnssd/query.h
+./dnssd/domainbrowser.h
+./dnssd/publicservice.h
+./knewstuff/engine.h
+./knewstuff/downloaddialog.h
+./knewstuff/testnewstuff.h
+./knewstuff/providerdialog.h
+./knewstuff/knewstuffbutton.h
+./knewstuff/knewstuffsecure.h
+./knewstuff/provider.h
+./knewstuff/knewstuff.h
+./knewstuff/security.h
+./knewstuff/uploaddialog.h
+./knewstuff/ghns.h
+./knewstuff/knewstuffgeneric.h
+./knewstuff/entry.h
+./kjs/error_object.h
+./kjs/regexp.h
+./kjs/bool_object.h
+./kjs/number_object.h
+./kjs/grammar.h
+./kjs/function.h
+./kjs/object_object.h
+./kjs/scope_chain.h
+./kjs/operations.h
+./kjs/regexp_object.h
+./kjs/context.h
+./kjs/string_object.h
+./kjs/reference.h
+./kjs/interpreter.h
+./kjs/collector.h
+./kjs/types.h
+./kjs/object.h
+./kjs/completion.h
+./kjs/list.h
+./kjs/lexer.h
+./kjs/array_object.h
+./kjs/value.h
+./kjs/lookup.h
+./kjs/simple_number.h
+./kjs/debugger.h
+./kjs/math_object.h
+./kjs/internal.h
+./kjs/function_object.h
+./kjs/reference_list.h
+./kjs/ustring.h
+./kjs/identifier.h
+./kjs/nodes.h
+./kjs/dtoa.h
+./kjs/date_object.h
+./kjs/array_instance.h
+./kjs/property_map.h
+./kdesu/client.h
+./kdesu/process.h
+./kdesu/su.h
+./kdesu/kdesu_pty.h
+./kdesu/kcookie.h
+./kdesu/stub.h
+./kdesu/ssh.h
+./kdesu/defaults.h
+./kab/qconfigDB.h
+./kab/kabapi.h
+./kab/addressbook.h
+./kcert/kcertpart.h
+./khtml/khtmlpart_p.h
+./khtml/khtml_events.h
+./khtml/khtml_caret_p.h
+./khtml/khtml_settings.h
+./khtml/khtml_ext.h
+./khtml/khtml_part.h
+./khtml/khtml_printsettings.h
+./khtml/test_regression.h
+./khtml/khtml_run.h
+./khtml/kjserrordlg.ui.h
+./khtml/khtmlview.h
+./khtml/khtml_iface.h
+./khtml/khtmlimage.h
+./khtml/khtml_factory.h
+./khtml/khtml_pagecache.h
+./khtml/design.h
+./khtml/domtreeview.h
+./khtml/khtmldefaults.h
+./khtml/testkhtml.h
+./khtml/css/css_base.h
+./khtml/css/csshelper.h
+./khtml/css/cssproperties.h
+./khtml/css/css_extensionsimpl.h
+./khtml/css/css_renderstyledeclarationimpl.h
+./khtml/css/parser.h
+./khtml/css/cssstyleselector.h
+./khtml/css/cssparser.h
+./khtml/css/cssvalues.h
+./khtml/css/css_ruleimpl.h
+./khtml/css/css_stylesheetimpl.h
+./khtml/css/css_valueimpl.h
+./khtml/misc/stringit.h
+./khtml/misc/loader_client.h
+./khtml/misc/shared.h
+./khtml/misc/helper.h
+./khtml/misc/htmlattrs.h
+./khtml/misc/arena.h
+./khtml/misc/htmlhashes.h
+./khtml/misc/loader.h
+./khtml/misc/decoder.h
+./khtml/misc/loader_jpeg.h
+./khtml/misc/htmltags.h
+./khtml/misc/guess_ja.h
+./khtml/misc/khtmllayout.h
+./khtml/misc/multimap.h
+./khtml/misc/seed.h
+./khtml/misc/knsplugininstaller.h
+./khtml/dom/html_list.h
+./khtml/dom/html_head.h
+./khtml/dom/html_element.h
+./khtml/dom/css_stylesheet.h
+./khtml/dom/css_rule.h
+./khtml/dom/html_inline.h
+./khtml/dom/dom_exception.h
+./khtml/dom/dom_text.h
+./khtml/dom/dom_doc.h
+./khtml/dom/html_image.h
+./khtml/dom/html_base.h
+./khtml/dom/dom_xml.h
+./khtml/dom/dom_core.h
+./khtml/dom/html_misc.h
+./khtml/dom/html_document.h
+./khtml/dom/dom2_range.h
+./khtml/dom/dom_html.h
+./khtml/dom/dom_node.h
+./khtml/dom/html_form.h
+./khtml/dom/dom_misc.h
+./khtml/dom/html_object.h
+./khtml/dom/css_extensions.h
+./khtml/dom/dom_string.h
+./khtml/dom/css_value.h
+./khtml/dom/dom2_views.h
+./khtml/dom/dom_element.h
+./khtml/dom/dom2_events.h
+./khtml/dom/html_block.h
+./khtml/dom/dom2_traversal.h
+./khtml/dom/html_table.h
+./khtml/kmultipart/kmultipart.h
+./khtml/xml/dom_elementimpl.h
+./khtml/xml/dom_docimpl.h
+./khtml/xml/xml_tokenizer.h
+./khtml/xml/dom_restyler.h
+./khtml/xml/dom2_viewsimpl.h
+./khtml/xml/dom_textimpl.h
+./khtml/xml/dom2_eventsimpl.h
+./khtml/xml/dom_xmlimpl.h
+./khtml/xml/dom_stringimpl.h
+./khtml/xml/dom_nodeimpl.h
+./khtml/xml/dom2_rangeimpl.h
+./khtml/xml/dom2_traversalimpl.h
+./khtml/rendering/render_flow.h
+./khtml/rendering/render_container.h
+./khtml/rendering/bidi.h
+./khtml/rendering/render_text.h
+./khtml/rendering/render_object.h
+./khtml/rendering/render_box.h
+./khtml/rendering/render_arena.h
+./khtml/rendering/render_applet.h
+./khtml/rendering/render_body.h
+./khtml/rendering/render_style.h
+./khtml/rendering/render_generated.h
+./khtml/rendering/render_frames.h
+./khtml/rendering/render_line.h
+./khtml/rendering/render_br.h
+./khtml/rendering/render_list.h
+./khtml/rendering/render_image.h
+./khtml/rendering/enumerate.h
+./khtml/rendering/render_replaced.h
+./khtml/rendering/render_block.h
+./khtml/rendering/counter_tree.h
+./khtml/rendering/table_layout.h
+./khtml/rendering/render_table.h
+./khtml/rendering/render_layer.h
+./khtml/rendering/render_form.h
+./khtml/rendering/render_inline.h
+./khtml/rendering/break_lines.h
+./khtml/rendering/font.h
+./khtml/rendering/render_canvas.h
+./khtml/java/kjavaapplet.h
+./khtml/java/kqeventutil.h
+./khtml/java/kjavadownloader.h
+./khtml/java/kjavaappletwidget.h
+./khtml/java/kjavaappletserver.h
+./khtml/java/kjavaprocess.h
+./khtml/java/kjavaappletcontext.h
+./khtml/java/kjavaappletviewer.h
+./khtml/java/kxeventutil.h
+./khtml/ecma/kjs_traversal.h
+./khtml/ecma/kjs_range.h
+./khtml/ecma/kjs_window.h
+./khtml/ecma/kjs_dom.h
+./khtml/ecma/kjs_debugwin.h
+./khtml/ecma/xmlserializer.h
+./khtml/ecma/kjs_mozilla.h
+./khtml/ecma/kjs_html.h
+./khtml/ecma/kjs_views.h
+./khtml/ecma/xmlhttprequest.h
+./khtml/ecma/kjs_binding.h
+./khtml/ecma/domparser.h
+./khtml/ecma/kjs_events.h
+./khtml/ecma/kjs_proxy.h
+./khtml/ecma/kjs_navigator.h
+./khtml/ecma/kjs_css.h
+./khtml/html/htmltokenizer.h
+./khtml/html/html_objectimpl.h
+./khtml/html/html_baseimpl.h
+./khtml/html/html_headimpl.h
+./khtml/html/html_elementimpl.h
+./khtml/html/dtd.h
+./khtml/html/html_tableimpl.h
+./khtml/html/html_imageimpl.h
+./khtml/html/html_inlineimpl.h
+./khtml/html/html_listimpl.h
+./khtml/html/html_formimpl.h
+./khtml/html/htmlparser.h
+./khtml/html/html_blockimpl.h
+./khtml/html/html_documentimpl.h
+./khtml/html/html_miscimpl.h
+./arts/kde/kartsfloatwatch.h
+./arts/kde/kaudiorecordstream_p.h
+./arts/kde/kplayobject.h
+./arts/kde/kaudioplaystream_p.h
+./arts/kde/kdatarequest_impl.h
+./arts/kde/kvideowidget.h
+./arts/kde/kplayobjectcreator.h
+./arts/kde/kplayobjectfactory.h
+./arts/kde/kaudiomanagerplay.h
+./arts/kde/kartsserver.h
+./arts/kde/kconverttest.h
+./arts/kde/kaudiorecordstream.h
+./arts/kde/kioinputstream_impl.h
+./arts/kde/kartsdispatcher.h
+./arts/kde/kaudioplaystream.h
+./arts/kde/kaudioconverter.h
+./arts/kde/kplayobjectfactory_p.h
+./kstyles/kthemestyle/kthemestyle.h
+./kstyles/kthemestyle/kthemebase.h
+./kstyles/kthemestyle/kstyledirs.h
+./kstyles/klegacy/klegacystyle.h
+./kstyles/highcolor/highcolor.h
+./kstyles/highcolor/bitmaps.h
+./kstyles/plastik/plastik.h
+./kstyles/plastik/misc.h
+./kstyles/keramik/colorutil.h
+./kstyles/keramik/keramik.h
+./kstyles/keramik/keramikimage.h
+./kstyles/keramik/bitmaps.h
+./kstyles/keramik/pixmaploader.h
+./kstyles/keramik/gradients.h
+./kstyles/light/lightstyle-v3.h
+./kstyles/light/lightstyle-v2.h
+./kstyles/highcontrast/highcontrast.h
+./kstyles/web/webstyle.h
+./kdeui/ksystemtray.h
+./kdeui/kprogress.h
+./kdeui/kdialogbase.h
+./kdeui/kinputdialog.h
+./kdeui/klistviewsearchline.h
+./kdeui/kcursor.h
+./kdeui/kactioncollection.h
+./kdeui/kaction.h
+./kdeui/klistviewlineedit.h
+./kdeui/kanimwidget.h
+./kdeui/kcolorbtn.h
+./kdeui/kiconview.h
+./kdeui/ktimewidget.h
+./kdeui/kguiitem.h
+./kdeui/ksqueezedtextlabel.h
+./kdeui/kfontcombo.h
+./kdeui/kpanelextension.h
+./kdeui/ktabbar.h
+./kdeui/ktoolbarradiogroup.h
+./kdeui/kkeybutton.h
+./kdeui/kseparator.h
+./kdeui/kcursor_private.h
+./kdeui/kdatepik.h
+./kdeui/kdialog.h
+./kdeui/kdepackages.h
+./kdeui/kedittoolbar.h
+./kdeui/ktextbrowser.h
+./kdeui/kdcopactionproxy.h
+./kdeui/kactivelabel.h
+./kdeui/kxmlguibuilder.h
+./kdeui/kcombobox.h
+./kdeui/kled.h
+./kdeui/kmainwindowiface.h
+./kdeui/kdatewidget.h
+./kdeui/ktabwidget.h
+./kdeui/kcolorbutton.h
+./kdeui/kshortcutdialog.h
+./kdeui/ktoolbarbutton.h
+./kdeui/kselect.h
+./kdeui/kscrollview.h
+./kdeui/kwordwrap.h
+./kdeui/kcolordialog.h
+./kdeui/kdockwidget_p.h
+./kdeui/kactionclasses.h
+./kdeui/kspelldlg.h
+./kdeui/kstatusbar.h
+./kdeui/kwhatsthismanager_p.h
+./kdeui/kspell.h
+./kdeui/ktoolbarhandler.h
+./kdeui/karrowbutton.h
+./kdeui/ksplashscreen.h
+./kdeui/kcmenumngr.h
+./kdeui/kaboutdialog.h
+./kdeui/kwizard.h
+./kdeui/kpixmapio.h
+./kdeui/qxembed.h
+./kdeui/kpixmapregionselectordialog.h
+./kdeui/kpassdlg.h
+./kdeui/keditlistbox.h
+./kdeui/knuminput.h
+./kdeui/kstdguiitem.h
+./kdeui/kcolorcombo.h
+./kdeui/ksyntaxhighlighter.h
+./kdeui/klineeditdlg.h
+./kdeui/kbuttonbox.h
+./kdeui/kactionselector.h
+./kdeui/kxmlguiclient.h
+./kdeui/kfontrequester.h
+./kdeui/kiconviewsearchline.h
+./kdeui/klistview.h
+./kdeui/kstdaction.h
+./kdeui/kcmodule.h
+./kdeui/kcolordrag.h
+./kdeui/kaccelgen.h
+./kdeui/kxmlguifactory_p.h
+./kdeui/kactionshortcutlist.h
+./kdeui/ksconfig.h
+./kdeui/klistbox.h
+./kdeui/kstringvalidator.h
+./kdeui/kdatepicker.h
+./kdeui/knumvalidator.h
+./kdeui/kmessagebox.h
+./kdeui/kxmlguifactory.h
+./kdeui/ktoolbar.h
+./kdeui/kbugreport.h
+./kdeui/kpanelmenu.h
+./kdeui/kkeydialog.h
+./kdeui/kdatetbl.h
+./kdeui/klineedit.h
+./kdeui/kpopupmenu.h
+./kdeui/kruler.h
+./kdeui/ktimezonewidget.h
+./kdeui/kcommand.h
+./kdeui/kpanelapplet.h
+./kdeui/kpushbutton.h
+./kdeui/kmenubar.h
+./kdeui/kaboutapplication.h
+./kdeui/kurllabel.h
+./kdeui/kpixmapregionselectorwidget.h
+./kdeui/kpanelappmenu.h
+./kdeui/kwindowinfo.h
+./kdeui/kmainwindow.h
+./kdeui/kstdaction_p.h
+./kdeui/kpassivepopup.h
+./kdeui/ktoolbarlabelaction.h
+./kdeui/krootpixmap.h
+./kdeui/kwindowlistmenu.h
+./kdeui/kfontdialog.h
+./kdeui/kauthicon.h
+./kdeui/kdockwidget.h
+./kdeui/keditcl.h
+./kdeui/kjanuswidget.h
+./kdeui/kdualcolorbutton.h
+./kdeui/ksharedpixmap.h
+./kdeui/kxmlgui.h
+./kdeui/kaboutdialog_private.h
+./kdeui/kdualcolorbtn.h
+./kdeui/kdockwidget_private.h
+./kdeui/krestrictedline.h
+./kdeui/kdialogbase_priv.h
+./kdeui/ktabctl.h
+./kdeui/khelpmenu.h
+./kdeui/ktip.h
+./kdeui/kcharselect.h
+./kdeui/kdatetimewidget.h
+./kdeui/kcompletionbox.h
+./kdeui/kaboutkde.h
+./kdeui/kcolordlg.h
+./kdeui/ktextedit.h
+./kdeui/kdockwindow.h
+./kdeui/klanguagebutton.h
+./kdeui/kconfigdialog.h
+./kdeui/kdetrayproxy/kdetrayproxy.h
+./kdeui/kdetrayproxy/module.h
+./dcop/kdatastream.h
+./dcop/version.h
+./dcop/dcopglobal.h
+./dcop/dcopc.h
+./dcop/dcopstub.h
+./dcop/dcoptypes.h
+./dcop/testdcop.h
+./dcop/dcopref.h
+./dcop/dcopsignals.h
+./dcop/dcopobject.h
+./dcop/dcop_deadlock_test.h
+./dcop/dcopclient.h
+./dcop/dcopserver.h
+./dcop/KDE-ICE/ICEmsg.h
+./dcop/KDE-ICE/ICEutil.h
+./dcop/KDE-ICE/globals.h
+./dcop/KDE-ICE/ICEconn.h
+./dcop/KDE-ICE/Xfuncproto.h
+./dcop/KDE-ICE/ICElib.h
+./dcop/KDE-ICE/Xtransint.h
+./dcop/KDE-ICE/ICE.h
+./dcop/KDE-ICE/ICElibint.h
+./dcop/KDE-ICE/ICEproto.h
+./dcop/KDE-ICE/Xtrans.h
+./dcop/dcopidl/yacc.cc.h
+./dcop/dcopidl/dcopidl_test.h
+./dcop/dcopidl2cpp/main.h
+./dcop/dcopidl2cpp/dcopidl_test.h
+./dcop/dcopidl2cpp/type.h
+./kunittest/samplemodule.h
+./kunittest/runner.h
+./kunittest/tester.h
+./kunittest/module.h
+./kdecore/klargefile.h
+./kdecore/ksocks.h
+./kdecore/kpty.h
+./kdecore/kxerrorhandler.h
+./kdecore/kprocctrl.h
+./kdecore/kaccelmanager_private.h
+./kdecore/kuser.h
+./kdecore/kcrash.h
+./kdecore/kglobal.h
+./kdecore/kpalette.h
+./kdecore/kcalendarsystemgregorian.h
+./kdecore/kgenericfactory.h
+./kdecore/kglobalaccel_mac.h
+./kdecore/kaccel.h
+./kdecore/ksycocaentry.h
+./kdecore/kcharsets.h
+./kdecore/kdebug.h
+./kdecore/kipc.h
+./kdecore/kxmessages.h
+./kdecore/ksockaddr.h
+./kdecore/netwm_def.h
+./kdecore/netwm.h
+./kdecore/kmdcodec.h
+./kdecore/kglobalaccel_win.h
+./kdecore/kclipboard.h
+./kdecore/kstaticdeleter.h
+./kdecore/kextsock.h
+./kdecore/kiconloader_p.h
+./kdecore/kglobalaccel.h
+./kdecore/kconfigdata.h
+./kdecore/kkeyserver_x11.h
+./kdecore/kdelibs_export.h
+./kdecore/kconfigbase.h
+./kdecore/kglobalaccel_x11.h
+./kdecore/kshell.h
+./kdecore/kiconloader.h
+./kdecore/kaudioplayer.h
+./kdecore/ksharedptr.h
+./kdecore/kextendedsocket.h
+./kdecore/krandomsequence.h
+./kdecore/kregpriv.h
+./kdecore/kstddirs.h
+./kdecore/kstringhandler.h
+./kdecore/kcalendarsystem.h
+./kdecore/kcompletion.h
+./kdecore/kunload.h
+./kdecore/klockfile.h
+./kdecore/kbufferedio.h
+./kdecore/klocale.h
+./kdecore/kmdcodec_compat.h
+./kdecore/kdesktopfile.h
+./kdecore/ksimpleconfig.h
+./kdecore/kaccelbase.h
+./kdecore/kckey.h
+./kdecore/ksock.h
+./kdecore/ksycocafactory.h
+./kdecore/kconfigbackend.h
+./kdecore/ktimezones.h
+./kdecore/kcalendarsystemjalali.h
+./kdecore/netwm_p.h
+./kdecore/kcalendarsystemfactory.h
+./kdecore/kaccelprivate.h
+./kdecore/kwinmodule.h
+./kdecore/kapplication.h
+./kdecore/kicontheme.h
+./kdecore/knotifyclient.h
+./kdecore/kallocator.h
+./kdecore/kcmdlineargs.h
+./kdecore/kvmallocator.h
+./kdecore/kapp.h
+./kdecore/kregexp.h
+./kdecore/kshortcut.h
+./kdecore/kcompletion_private.h
+./kdecore/ktempdir.h
+./kdecore/kmultipledrag.h
+./kdecore/kstartupinfo.h
+./kdecore/kde_file.h
+./kdecore/kurldrag.h
+./kdecore/kmacroexpander.h
+./kdecore/krfcdate.h
+./kdecore/kmimesourcefactory.h
+./kdecore/kcalendarsystemhijri.h
+./kdecore/ktypelist.h
+./kdecore/kglobalsettings.h
+./kdecore/kstdaccel.h
+./kdecore/kaccelaction.h
+./kdecore/kdebugdcopiface.h
+./kdecore/ksycoca.h
+./kdecore/kconfigdialogmanager.h
+./kdecore/kglobalaccel_emb.h
+./kdecore/kaboutdata.h
+./kdecore/ktempfile.h
+./kdecore/klibloader.h
+./kdecore/kmanagerselection.h
+./kdecore/kstandarddirs.h
+./kdecore/ksycocatype.h
+./kdecore/kpixmapprovider.h
+./kdecore/kinstance.h
+./kdecore/kdebugclasses.h
+./kdecore/kconfig.h
+./kdecore/ksortablevaluelist.h
+./kdecore/kuniqueapplication.h
+./kdecore/kdeversion.h
+./kdecore/kurl.h
+./kdecore/kiconeffect.h
+./kdecore/kcalendarsystemhebrew.h
+./kdecore/kconfigskeleton.h
+./kdecore/kshortcutlist.h
+./kdecore/ksycocadict.h
+./kdecore/kappdcopiface.h
+./kdecore/kasyncio.h
+./kdecore/kqiodevicegzip_p.h
+./kdecore/fixx11h.h
+./kdecore/kcatalogue.h
+./kdecore/kwin.h
+./kdecore/netsupp.h
+./kdecore/kaccelmanager.h
+./kdecore/krootprop.h
+./kdecore/kidna.h
+./kdecore/kde_dmalloc.h
+./kdecore/kmountpoint.h
+./kdecore/kshortcutmenu.h
+./kdecore/kcheckaccelerators.h
+./kdecore/kdcoppropertyproxy.h
+./kdecore/kprocio.h
+./kdecore/kprocess.h
+./kdecore/kprotocolinfofactory.h
+./kdecore/kkeynative.h
+./kdecore/kkeyserver.h
+./kdecore/kuniqueapp.h
+./kdecore/ksavefile.h
+./kdecore/svgicons/ksvgiconengine.h
+./kdecore/svgicons/ksvgiconpainter.h
+./kdecore/network/syssocket.h
+./kdecore/network/ksocketdevice.h
+./kdecore/network/ksocketbuffer_p.h
+./kdecore/network/kresolverworkerbase.h
+./kdecore/network/kiobuffer.h
+./kdecore/network/kreverseresolver.h
+./kdecore/network/ksockssocketdevice.h
+./kdecore/network/ksrvresolverworker_p.h
+./kdecore/network/khttpproxysocketdevice.h
+./kdecore/network/kmulticastsocket.h
+./kdecore/network/kdatagramsocket.h
+./kdecore/network/kresolver.h
+./kdecore/network/kclientsocketbase.h
+./kdecore/network/kmulticastsocketdevice.h
+./kdecore/network/kbufferedsocket.h
+./kdecore/network/kresolverstandardworkers_p.h
+./kdecore/network/ksocketaddress.h
+./kdecore/network/knetworkinterface.h
+./kdecore/network/kserversocket.h
+./kdecore/network/ksocketbase.h
+./kdecore/network/kresolver_p.h
+./kdecore/network/kstreamsocket.h
+./kdecore/malloc/x86.h
+./kdecore/malloc/glibc.h
+./kimgio/gimp.h
+./kimgio/hdr.h
+./kimgio/tga.h
+./kimgio/g3r.h
+./kimgio/xview.h
+./kimgio/tiffr.h
+./kimgio/jp2.h
+./kimgio/psd.h
+./kimgio/eps.h
+./kimgio/pcx.h
+./kimgio/rgb.h
+./kimgio/xcf.h
+./kimgio/dds.h
+./kimgio/exr.h
+./kimgio/ico.h
+./obj-x86_64-linux-gnu/config.h
+./obj-x86_64-linux-gnu/arts/kde/artskde.h
+./obj-x86_64-linux-gnu/dcop/dcop-path.h
+./obj-x86_64-linux-gnu/dnssd/settings.h
+./obj-x86_64-linux-gnu/interfaces/kimproxy/library/kimiface_stub.h
+./obj-x86_64-linux-gnu/interfaces/ktexteditor/editorchooser_ui.h
+./obj-x86_64-linux-gnu/kabc/addressee.h
+./obj-x86_64-linux-gnu/kate/part/katejscript.lut.h
+./obj-x86_64-linux-gnu/kdecore/kdemacros.h
+./obj-x86_64-linux-gnu/kdeui/kshortcutdialog_simple.h
+./obj-x86_64-linux-gnu/kdeui/kshortcutdialog_advanced.h
+./obj-x86_64-linux-gnu/kdeui/kspellui.h
+./obj-x86_64-linux-gnu/khtml/kjserrordlg.h
+./obj-x86_64-linux-gnu/khtml/htmlpageinfo.h
+./obj-x86_64-linux-gnu/khtml/ecma/kjs_dom.lut.h
+./obj-x86_64-linux-gnu/khtml/ecma/kjs_html.lut.h
+./obj-x86_64-linux-gnu/khtml/ecma/kjs_window.lut.h
+./obj-x86_64-linux-gnu/khtml/ecma/kjs_navigator.lut.h
+./obj-x86_64-linux-gnu/khtml/ecma/kjs_css.lut.h
+./obj-x86_64-linux-gnu/khtml/ecma/kjs_range.lut.h
+./obj-x86_64-linux-gnu/khtml/ecma/kjs_traversal.lut.h
+./obj-x86_64-linux-gnu/khtml/ecma/kjs_events.lut.h
+./obj-x86_64-linux-gnu/khtml/ecma/kjs_views.lut.h
+./obj-x86_64-linux-gnu/khtml/ecma/kjs_mozilla.lut.h
+./obj-x86_64-linux-gnu/khtml/ecma/xmlhttprequest.lut.h
+./obj-x86_64-linux-gnu/khtml/ecma/xmlserializer.lut.h
+./obj-x86_64-linux-gnu/khtml/ecma/domparser.lut.h
+./obj-x86_64-linux-gnu/kio/kfile/knotifywidgetbase.h
+./obj-x86_64-linux-gnu/kio/kfile/kpropertiesdesktopbase.h
+./obj-x86_64-linux-gnu/kio/kfile/kpropertiesdesktopadvbase.h
+./obj-x86_64-linux-gnu/kio/kfile/kpropertiesmimetypebase.h
+./obj-x86_64-linux-gnu/kio/kio/observer_stub.h
+./obj-x86_64-linux-gnu/kio/kio/uiserver_stub.h
+./obj-x86_64-linux-gnu/kio/kssl/ksslconfig.h
+./obj-x86_64-linux-gnu/kio/kssl/keygenwizard.h
+./obj-x86_64-linux-gnu/kio/kssl/keygenwizard2.h
+./obj-x86_64-linux-gnu/kio/misc/observer_stub.h
+./obj-x86_64-linux-gnu/kio/misc/kwalletd/kwalletwizard.h
+./obj-x86_64-linux-gnu/kio/misc/kwalletd/kbetterthankdialogbase.h
+./obj-x86_64-linux-gnu/kjs/global.h
+./obj-x86_64-linux-gnu/kjs/date_object.lut.h
+./obj-x86_64-linux-gnu/kjs/lexer.lut.h
+./obj-x86_64-linux-gnu/kjs/string_object.lut.h
+./obj-x86_64-linux-gnu/kjs/number_object.lut.h
+./obj-x86_64-linux-gnu/kjs/array_object.lut.h
+./obj-x86_64-linux-gnu/kjs/math_object.lut.h
+./obj-x86_64-linux-gnu/kresources/manageriface_stub.h
+./obj-x86_64-linux-gnu/kspell2/ui/kspell2ui.h
+./obj-x86_64-linux-gnu/kspell2/ui/configui.h
+./obj-x86_64-linux-gnu/kstyles/keramik/keramikrc.h
+./kdecore/kde-config.cpp.in
--- kdelibs-3.5.7.orig/messages.po
+++ kdelibs-3.5.7/messages.po
@@ -0,0 +1,8642 @@
+# SOME DESCRIPTIVE TITLE.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2007-05-22 19:37+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: ENCODING\n"
+
+#. i18n: file ./kspell2/ui/configui.ui line 26
+#: obj-x86_64-linux-gnu/kspell2/ui/configui.cpp:88 rc.cpp:3
+#, no-c-format
+msgid ""
+"This is the default language that the spell checker will use. The drop down "
+"box will list all of the dictionaries of your existing languages."
+msgstr ""
+
+#. i18n: file ./kspell2/ui/configui.ui line 45
+#: obj-x86_64-linux-gnu/kspell2/ui/configui.cpp:90 rc.cpp:9
+#, no-c-format
+msgid "Enable &background spellchecking"
+msgstr ""
+
+#. i18n: file ./kspell2/ui/configui.ui line 48
+#: obj-x86_64-linux-gnu/kspell2/ui/configui.cpp:91 rc.cpp:12
+#, no-c-format
+msgid ""
+"If checked, the \"spell as you type\" mode is active and all misspelled "
+"words are immediately highlighted."
+msgstr ""
+
+#. i18n: file ./kspell2/ui/configui.ui line 56
+#: obj-x86_64-linux-gnu/kspell2/ui/configui.cpp:92 rc.cpp:15
+#, no-c-format
+msgid "Skip all &uppercase words"
+msgstr ""
+
+#. i18n: file ./kspell2/ui/configui.ui line 59
+#: obj-x86_64-linux-gnu/kspell2/ui/configui.cpp:93 rc.cpp:18
+#, no-c-format
+msgid ""
+"If checked, words that consist of only uppercase letters are not spell "
+"checked. This is useful if you have a lot of acronyms, such as KDE for "
+"example."
+msgstr ""
+
+#. i18n: file ./kspell2/ui/configui.ui line 67
+#: obj-x86_64-linux-gnu/kspell2/ui/configui.cpp:94 rc.cpp:21
+#, no-c-format
+msgid "S&kip run-together words"
+msgstr ""
+
+#. i18n: file ./kspell2/ui/configui.ui line 70
+#: obj-x86_64-linux-gnu/kspell2/ui/configui.cpp:95 rc.cpp:24
+#, no-c-format
+msgid ""
+"If checked, concatenated words made of existing words are not spell checked. "
+"This is useful in some languages."
+msgstr ""
+
+#. i18n: file ./kspell2/ui/configui.ui line 80
+#: obj-x86_64-linux-gnu/kspell2/ui/configui.cpp:96 rc.cpp:27
+#, no-c-format
+msgid "Default language:"
+msgstr ""
+
+#. i18n: file ./kspell2/ui/configui.ui line 91
+#: obj-x86_64-linux-gnu/kspell2/ui/configui.cpp:97 rc.cpp:30
+#, no-c-format
+msgid "Ignore These Words"
+msgstr ""
+
+#. i18n: file ./kspell2/ui/configui.ui line 97
+#: obj-x86_64-linux-gnu/kspell2/ui/configui.cpp:98 rc.cpp:33
+#, no-c-format
+msgid ""
+"To add a word you want to ignore, type it in the top edit field and click "
+"Add. To remove a word, highlight it in the list and click Remove."
+msgstr ""
+
+#. i18n: file ./kspell2/ui/kspell2ui.ui line 38
+#: obj-x86_64-linux-gnu/kdeui/kspellui.cpp:134
+#: obj-x86_64-linux-gnu/kspell2/ui/kspell2ui.cpp:136 rc.cpp:36 rc.cpp:251
+#, no-c-format
+msgid "Unknown word:"
+msgstr ""
+
+#. i18n: file ./kspell2/ui/kspell2ui.ui line 44
+#: obj-x86_64-linux-gnu/kdeui/kspellui.cpp:135
+#: obj-x86_64-linux-gnu/kdeui/kspellui.cpp:141
+#: obj-x86_64-linux-gnu/kspell2/ui/kspell2ui.cpp:137
+#: obj-x86_64-linux-gnu/kspell2/ui/kspell2ui.cpp:143 rc.cpp:39 rc.cpp:51
+#: rc.cpp:254 rc.cpp:266
+#, no-c-format
+msgid ""
+"<qt><p>This word was considered to be an \"unknown word\" because it does "
+"not match any entry in the dictionary currently in use. It may also be a "
+"word in a foreign language.</p>\n"
+"<p>If the word is not misspelled, you may add it to the dictionary by "
+"clicking <b>Add to Dictionary</b>. If you don't want to add the unknown word "
+"to the dictionary, but you want to leave it unchanged, click <b>Ignore</b> "
+"or <b>Ignore All</b>.</p>\n"
+"<p>However, if the word is misspelled, you can try to find the correct "
+"replacement in the list below. If you cannot find a replacement there, you "
+"may type it in the text box below, and click <b>Replace</b> or <b>Replace "
+"All</b>.</p>\n"
+"</qt>"
+msgstr ""
+
+#. i18n: file ./kspell2/ui/kspell2ui.ui line 52
+#: obj-x86_64-linux-gnu/kdeui/kspellui.cpp:139
+#: obj-x86_64-linux-gnu/kspell2/ui/kspell2ui.cpp:141 rc.cpp:45 rc.cpp:260
+#, no-c-format
+msgid "<b>misspelled</b>"
+msgstr ""
+
+#. i18n: file ./kspell2/ui/kspell2ui.ui line 55
+#: obj-x86_64-linux-gnu/kdeui/kspellui.cpp:140
+#: obj-x86_64-linux-gnu/kspell2/ui/kspell2ui.cpp:142 rc.cpp:48 rc.cpp:263
+#, no-c-format
+msgid "Unknown word"
+msgstr ""
+
+#. i18n: file ./kspell2/ui/kspell2ui.ui line 69
+#: obj-x86_64-linux-gnu/kdeui/kspellui.cpp:145
+#: obj-x86_64-linux-gnu/kspell2/ui/kspell2ui.cpp:147 rc.cpp:57 rc.cpp:272
+#, no-c-format
+msgid "&Language:"
+msgstr ""
+
+#. i18n: file ./kspell2/ui/kspell2ui.ui line 77
+#: obj-x86_64-linux-gnu/kdeui/kspellui.cpp:146
+#: obj-x86_64-linux-gnu/kdeui/kspellui.cpp:196
+#: obj-x86_64-linux-gnu/kspell2/ui/kspell2ui.cpp:148
+#: obj-x86_64-linux-gnu/kspell2/ui/kspell2ui.cpp:179 rc.cpp:60 rc.cpp:118
+#: rc.cpp:275 rc.cpp:370
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<p>Select the language of the document you are proofing here.</p>\n"
+"</qt>"
+msgstr ""
+
+#. i18n: file ./kspell2/ui/kspell2ui.ui line 88
+#: obj-x86_64-linux-gnu/kdeui/kspellui.cpp:149
+#: obj-x86_64-linux-gnu/kspell2/ui/kspell2ui.cpp:151 rc.cpp:65 rc.cpp:280
+#, no-c-format
+msgid "... the <b>misspelled</b> word shown in context ..."
+msgstr ""
+
+#. i18n: file ./kspell2/ui/kspell2ui.ui line 94
+#: obj-x86_64-linux-gnu/kdeui/kspellui.cpp:150
+#: obj-x86_64-linux-gnu/kspell2/ui/kspell2ui.cpp:152 rc.cpp:68 rc.cpp:283
+#, no-c-format
+msgid "Text excerpt showing the unknown word in its context."
+msgstr ""
+
+#. i18n: file ./kspell2/ui/kspell2ui.ui line 99
+#: obj-x86_64-linux-gnu/kdeui/kspellui.cpp:151
+#: obj-x86_64-linux-gnu/kspell2/ui/kspell2ui.cpp:153 rc.cpp:71 rc.cpp:286
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<p>Here you can see a text excerpt showing the unknown word in its context. "
+"If this information is not sufficient to choose the best replacement for the "
+"unknown word, you can click on the document you are proofing, read a larger "
+"part of the text and then return here to continue proofing.</p>\n"
+"</qt>"
+msgstr ""
+
+#. i18n: file ./kspell2/ui/kspell2ui.ui line 107
+#: obj-x86_64-linux-gnu/kdeui/kspellui.cpp:154
+#: obj-x86_64-linux-gnu/kspell2/ui/kspell2ui.cpp:156 rc.cpp:76 rc.cpp:291
+#, no-c-format
+msgid "<< Add to Dictionary"
+msgstr ""
+
+#. i18n: file ./kspell2/ui/kspell2ui.ui line 113
+#: obj-x86_64-linux-gnu/kdeui/kspellui.cpp:155
+#: obj-x86_64-linux-gnu/kspell2/ui/kspell2ui.cpp:157 rc.cpp:79 rc.cpp:294
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<p>The unknown word was detected and considered unknown because it is not "
+"included in the dictionary.<br>\n"
+"Click here if you consider that the unknown word is not misspelled and you "
+"want to avoid wrongly detecting it again in the future. If you want to let "
+"it remain as is, but not add it to the dictionary, then click <b>Ignore</b> "
+"or <b>Ignore All</b> instead.</p>\n"
+"</qt>"
+msgstr ""
+
+#. i18n: file ./kspell2/ui/kspell2ui.ui line 136
+#: obj-x86_64-linux-gnu/kdeui/kspellui.cpp:67
+#: obj-x86_64-linux-gnu/kdeui/kspellui.cpp:163
+#: obj-x86_64-linux-gnu/kspell2/ui/kspell2ui.cpp:63
+#: obj-x86_64-linux-gnu/kspell2/ui/kspell2ui.cpp:161 rc.cpp:85 rc.cpp:308
+#, no-c-format
+msgid "Suggested Words"
+msgstr ""
+
+#. i18n: file ./kspell2/ui/kspell2ui.ui line 152
+#: obj-x86_64-linux-gnu/kdeui/kspellui.cpp:164
+#: obj-x86_64-linux-gnu/kspell2/ui/kspell2ui.cpp:162 rc.cpp:88 rc.cpp:311
+#, no-c-format
+msgid "Suggestion List"
+msgstr ""
+
+#. i18n: file ./kspell2/ui/kspell2ui.ui line 158
+#: obj-x86_64-linux-gnu/kdeui/kspellui.cpp:165
+#: obj-x86_64-linux-gnu/kspell2/ui/kspell2ui.cpp:163 rc.cpp:91 rc.cpp:314
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<p>If the unknown word is misspelled, you should check if the correction for "
+"it is available and if it is, click on it. If none of the words in this list "
+"is a good replacement you may type the correct word in the edit box "
+"above.</p>\n"
+"<p>To correct this word click <b>Replace</b> if you want to correct only "
+"this occurrence or <b>Replace All</b> if you want to correct all "
+"occurrences.</p>\n"
+"</qt>"
+msgstr ""
+
+#. i18n: file ./kspell2/ui/kspell2ui.ui line 166
+#: obj-x86_64-linux-gnu/kdeui/kspellui.cpp:173
+#: obj-x86_64-linux-gnu/kspell2/ui/kspell2ui.cpp:167 rc.cpp:97 rc.cpp:328
+#, no-c-format
+msgid "Replace &with:"
+msgstr ""
+
+#. i18n: file ./kspell2/ui/kspell2ui.ui line 175
+#: obj-x86_64-linux-gnu/kdeui/kspellui.cpp:174
+#: obj-x86_64-linux-gnu/kdeui/kspellui.cpp:188
+#: obj-x86_64-linux-gnu/kspell2/ui/kspell2ui.cpp:168
+#: obj-x86_64-linux-gnu/kspell2/ui/kspell2ui.cpp:172 rc.cpp:100 rc.cpp:106
+#: rc.cpp:331 rc.cpp:355
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<p>If the unknown word is misspelled, you should type the correction for "
+"your misspelled word here or select it from the list below.</p>\n"
+"<p>You can then click <b>Replace</b> if you want to correct only this "
+"occurrence of the word or <b>Replace All</b> if you want to correct all "
+"occurrences.</p>\n"
+"</qt>"
+msgstr ""
+
+#. i18n: file ./kspell2/ui/kspell2ui.ui line 192
+#: kdeui/ksconfig.cpp:294 obj-x86_64-linux-gnu/kdeui/kspellui.cpp:194
+#: obj-x86_64-linux-gnu/kspell2/ui/kspell2ui.cpp:177 rc.cpp:112 rc.cpp:364
+#, no-c-format
+msgid "English"
+msgstr ""
+
+#. i18n: file ./kspell2/ui/kspell2ui.ui line 199
+#: obj-x86_64-linux-gnu/kdeui/kspellui.cpp:195
+#: obj-x86_64-linux-gnu/kspell2/ui/kspell2ui.cpp:178 rc.cpp:115 rc.cpp:367
+#, no-c-format
+msgid "Language Selection"
+msgstr ""
+
+#. i18n: file ./kspell2/ui/kspell2ui.ui line 220
+#: obj-x86_64-linux-gnu/kdeui/kspellui.cpp:192
+#: obj-x86_64-linux-gnu/kspell2/ui/kspell2ui.cpp:182 rc.cpp:123 rc.cpp:361
+#, no-c-format
+msgid "S&uggest"
+msgstr ""
+
+#. i18n: file ./kspell2/ui/kspell2ui.ui line 228
+#: kdeui/keditcl2.cpp:833 kutils/kfinddialog.cpp:231
+#: obj-x86_64-linux-gnu/kdeui/kspellui.cpp:169
+#: obj-x86_64-linux-gnu/kspell2/ui/kspell2ui.cpp:183 rc.cpp:126 rc.cpp:320
+#, no-c-format
+msgid "&Replace"
+msgstr ""
+
+#. i18n: file ./kspell2/ui/kspell2ui.ui line 233
+#: obj-x86_64-linux-gnu/kdeui/kspellui.cpp:170
+#: obj-x86_64-linux-gnu/kspell2/ui/kspell2ui.cpp:184 rc.cpp:129 rc.cpp:323
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<p>Click here to replace this occurrence of the unknown text with the text "
+"in the edit box above (to the left).</p>\n"
+"</qt>"
+msgstr ""
+
+#. i18n: file ./kspell2/ui/kspell2ui.ui line 241
+#: obj-x86_64-linux-gnu/kdeui/kspellui.cpp:159
+#: obj-x86_64-linux-gnu/kspell2/ui/kspell2ui.cpp:187 rc.cpp:134 rc.cpp:300
+#, no-c-format
+msgid "R&eplace All"
+msgstr ""
+
+#. i18n: file ./kspell2/ui/kspell2ui.ui line 246
+#: obj-x86_64-linux-gnu/kdeui/kspellui.cpp:160
+#: obj-x86_64-linux-gnu/kspell2/ui/kspell2ui.cpp:188 rc.cpp:137 rc.cpp:303
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<p>Click here to replace all occurrences of the unknown text with the text "
+"in the edit box above (to the left).</p>\n"
+"</qt>"
+msgstr ""
+
+#. i18n: file ./kspell2/ui/kspell2ui.ui line 254
+#: obj-x86_64-linux-gnu/kdeui/kspellui.cpp:178
+#: obj-x86_64-linux-gnu/kspell2/ui/kspell2ui.cpp:191 rc.cpp:142 rc.cpp:337
+#, no-c-format
+msgid "&Ignore"
+msgstr ""
+
+#. i18n: file ./kspell2/ui/kspell2ui.ui line 260
+#: obj-x86_64-linux-gnu/kdeui/kspellui.cpp:179
+#: obj-x86_64-linux-gnu/kspell2/ui/kspell2ui.cpp:192 rc.cpp:145 rc.cpp:340
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<p>Click here to let this occurrence of the unknown word remain as is.</p>\n"
+"<p>This action is useful when the word is a name, an acronym, a foreign word "
+"or any other unknown word that you want to use but not add to the "
+"dictionary.</p>\n"
+"</qt>"
+msgstr ""
+
+#. i18n: file ./kspell2/ui/kspell2ui.ui line 268
+#: obj-x86_64-linux-gnu/kdeui/kspellui.cpp:183
+#: obj-x86_64-linux-gnu/kspell2/ui/kspell2ui.cpp:196 rc.cpp:151 rc.cpp:346
+#, no-c-format
+msgid "I&gnore All"
+msgstr ""
+
+#. i18n: file ./kspell2/ui/kspell2ui.ui line 274
+#: obj-x86_64-linux-gnu/kdeui/kspellui.cpp:184
+#: obj-x86_64-linux-gnu/kspell2/ui/kspell2ui.cpp:197
+#: obj-x86_64-linux-gnu/kspell2/ui/kspell2ui.cpp:202 rc.cpp:154 rc.cpp:163
+#: rc.cpp:349
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<p>Click here to let all occurrences of the unknown word remain as they "
+"are.</p>\n"
+"<p>This action is useful when the word is a name, an acronym, a foreign word "
+"or any other unknown word that you want to use but not add to the "
+"dictionary.</p>\n"
+"</qt>"
+msgstr ""
+
+#. i18n: file ./kspell2/ui/kspell2ui.ui line 282
+#: obj-x86_64-linux-gnu/kspell2/ui/kspell2ui.cpp:201 rc.cpp:160
+#, no-c-format
+msgid "Autocorrect"
+msgstr ""
+
+#. i18n: file ./interfaces/ktexteditor/editorchooser_ui.ui line 16
+#: obj-x86_64-linux-gnu/interfaces/ktexteditor/editorchooser_ui.cpp:65
+#: rc.cpp:169
+#, no-c-format
+msgid "Editor Chooser"
+msgstr ""
+
+#. i18n: file ./interfaces/ktexteditor/editorchooser_ui.ui line 41
+#: obj-x86_64-linux-gnu/interfaces/ktexteditor/editorchooser_ui.cpp:66
+#: rc.cpp:172
+#, no-c-format
+msgid ""
+"Please choose the default text editing component that you wish to use in "
+"this application. If you choose <B>System Default</B>, the application will "
+"honor your changes in the Control Center. All other choices will override "
+"that setting."
+msgstr ""
+
+#. i18n: file ./kcert/kcertpart.rc line 4
+#: rc.cpp:175
+#, no-c-format
+msgid "&Certificate"
+msgstr ""
+
+#. i18n: file ./khtml/kjserrordlg.ui line 17
+#: obj-x86_64-linux-gnu/khtml/kjserrordlg.cc:91 rc.cpp:178
+#, no-c-format
+msgid "JavaScript Errors"
+msgstr ""
+
+#. i18n: file ./khtml/kjserrordlg.ui line 20
+#: obj-x86_64-linux-gnu/khtml/kjserrordlg.cc:92 rc.cpp:181
+#, no-c-format
+msgid ""
+"This dialog provides you with notification and details of scripting errors "
+"that occur on web pages.  In many cases it is due to an error in the web "
+"site as designed by its author.  In other cases it is the result of a "
+"programming error in Konqueror.  If you suspect the former, please contact "
+"the webmaster of the site in question.  Conversely if you suspect an error "
+"in Konqueror, please file a bug report at http://bugs.kde.org/.  A test case "
+"which illustrates the problem will be appreciated."
+msgstr ""
+
+#. i18n: file ./khtml/kjserrordlg.ui line 39
+#: kdeui/kstdaction_p.h:58 kdeui/kstdguiitem.cpp:161
+#: obj-x86_64-linux-gnu/khtml/kjserrordlg.cc:94 rc.cpp:187
+#, no-c-format
+msgid "C&lear"
+msgstr ""
+
+#. i18n: file ./khtml/htmlpageinfo.ui line 26
+#: obj-x86_64-linux-gnu/khtml/htmlpageinfo.cc:148 rc.cpp:194
+#, no-c-format
+msgid "Document Information"
+msgstr ""
+
+#. i18n: file ./khtml/htmlpageinfo.ui line 37
+#: obj-x86_64-linux-gnu/khtml/htmlpageinfo.cc:149 rc.cpp:197
+#, no-c-format
+msgid "General"
+msgstr ""
+
+#. i18n: file ./khtml/htmlpageinfo.ui line 64
+#: obj-x86_64-linux-gnu/khtml/htmlpageinfo.cc:150 rc.cpp:200
+#, no-c-format
+msgid "URL:"
+msgstr ""
+
+#. i18n: file ./khtml/htmlpageinfo.ui line 122
+#: obj-x86_64-linux-gnu/khtml/htmlpageinfo.cc:151 rc.cpp:203
+#, no-c-format
+msgid "Title:"
+msgstr ""
+
+#. i18n: file ./khtml/htmlpageinfo.ui line 141
+#: obj-x86_64-linux-gnu/khtml/htmlpageinfo.cc:152 rc.cpp:206
+#, no-c-format
+msgid "Last modified:"
+msgstr ""
+
+#. i18n: file ./khtml/htmlpageinfo.ui line 160
+#: obj-x86_64-linux-gnu/khtml/htmlpageinfo.cc:153 rc.cpp:209
+#, no-c-format
+msgid "Document encoding:"
+msgstr ""
+
+#. i18n: file ./khtml/htmlpageinfo.ui line 188
+#: obj-x86_64-linux-gnu/khtml/htmlpageinfo.cc:154 rc.cpp:212
+#, no-c-format
+msgid "HTTP Headers"
+msgstr ""
+
+#. i18n: file ./khtml/htmlpageinfo.ui line 197
+#: obj-x86_64-linux-gnu/khtml/htmlpageinfo.cc:100
+#: obj-x86_64-linux-gnu/khtml/htmlpageinfo.cc:155 rc.cpp:215
+#, no-c-format
+msgid "Property"
+msgstr ""
+
+#. i18n: file ./khtml/htmlpageinfo.ui line 208
+#: khtml/java/kjavaappletviewer.cpp:132
+#: obj-x86_64-linux-gnu/khtml/htmlpageinfo.cc:101
+#: obj-x86_64-linux-gnu/khtml/htmlpageinfo.cc:156 rc.cpp:218
+#, no-c-format
+msgid "Value"
+msgstr ""
+
+#. i18n: file ./khtml/khtml_popupmenu.rc line 11
+#: rc.cpp:236
+#, no-c-format
+msgid "Frame"
+msgstr ""
+
+#. i18n: file ./kdeui/kshortcutdialog_simple.ui line 27
+#: obj-x86_64-linux-gnu/kdeui/kshortcutdialog_simple.cpp:73 rc.cpp:239
+#, no-c-format
+msgid "Shortcut:"
+msgstr ""
+
+#. i18n: file ./kdeui/kshortcutdialog_simple.ui line 65
+#: obj-x86_64-linux-gnu/kdeui/kshortcutdialog_simple.cpp:74 rc.cpp:242
+#, no-c-format
+msgid "Alt+Tab"
+msgstr ""
+
+#. i18n: file ./kdeui/kshortcutdialog_simple.ui line 79
+#: obj-x86_64-linux-gnu/kdeui/kshortcutdialog_advanced.cpp:125
+#: obj-x86_64-linux-gnu/kdeui/kshortcutdialog_advanced.cpp:127
+#: obj-x86_64-linux-gnu/kdeui/kshortcutdialog_simple.cpp:75 rc.cpp:245
+#: rc.cpp:423 rc.cpp:429
+#, no-c-format
+msgid "x"
+msgstr ""
+
+#. i18n: file ./kdeui/kshortcutdialog_simple.ui line 85
+#: obj-x86_64-linux-gnu/kdeui/kshortcutdialog_advanced.cpp:126
+#: obj-x86_64-linux-gnu/kdeui/kshortcutdialog_advanced.cpp:128
+#: obj-x86_64-linux-gnu/kdeui/kshortcutdialog_simple.cpp:76 rc.cpp:248
+#: rc.cpp:426 rc.cpp:432
+#, no-c-format
+msgid "Clear shortcut"
+msgstr ""
+
+#. i18n: file ./kdeui/ui_standards.rc line 80
+#: rc.cpp:384
+#, no-c-format
+msgid ""
+"_: Menu title\n"
+"&Move"
+msgstr ""
+
+#. i18n: file ./kdeui/ui_standards.rc line 112
+#: rc.cpp:390 rc.cpp:393
+#, no-c-format
+msgid "&Go"
+msgstr ""
+
+#. i18n: file ./kdeui/kshortcutdialog_advanced.ui line 58
+#: obj-x86_64-linux-gnu/kdeui/kshortcutdialog_advanced.cpp:120 rc.cpp:412
+#, no-c-format
+msgid "Alternate shortcut:"
+msgstr ""
+
+#. i18n: file ./kdeui/kshortcutdialog_advanced.ui line 69
+#: obj-x86_64-linux-gnu/kdeui/kshortcutdialog_advanced.cpp:121 rc.cpp:415
+#, no-c-format
+msgid "Primary shortcut:"
+msgstr ""
+
+#. i18n: file ./kdeui/kshortcutdialog_advanced.ui line 155
+#: obj-x86_64-linux-gnu/kdeui/kshortcutdialog_advanced.cpp:124 rc.cpp:420
+#, no-c-format
+msgid ""
+"The currently set shortcut or the shortcut you are entering will show up "
+"here."
+msgstr ""
+
+#. i18n: file ./kdeui/kshortcutdialog_advanced.ui line 213
+#: obj-x86_64-linux-gnu/kdeui/kshortcutdialog_advanced.cpp:129 rc.cpp:435
+#, no-c-format
+msgid "Multi-key mode"
+msgstr ""
+
+#. i18n: file ./kdeui/kshortcutdialog_advanced.ui line 216
+#: obj-x86_64-linux-gnu/kdeui/kshortcutdialog_advanced.cpp:130 rc.cpp:438
+#, no-c-format
+msgid "Enable the entry of multi-key shortcuts"
+msgstr ""
+
+#. i18n: file ./kdeui/kshortcutdialog_advanced.ui line 219
+#: obj-x86_64-linux-gnu/kdeui/kshortcutdialog_advanced.cpp:131 rc.cpp:441
+#, no-c-format
+msgid ""
+"Select this checkbox to enable the entry of multi-key shortcuts.  A "
+"multi-key shortcut consists of a sequence of up to 4 keys.  For example, you "
+"could assign \"Ctrl+F,B\" to Font-Bold and \"Ctrl+F,U\" to Font-Underline."
+msgstr ""
+
+#. i18n: file ./dnssd/kcm_kdnssd.kcfg line 9
+#: rc.cpp:444
+#, no-c-format
+msgid "Additional domains for browsing"
+msgstr ""
+
+#. i18n: file ./dnssd/kcm_kdnssd.kcfg line 10
+#: rc.cpp:447
+#, no-c-format
+msgid "List of 'wide-area' (non link-local) domains that should be browsed."
+msgstr ""
+
+#. i18n: file ./dnssd/kcm_kdnssd.kcfg line 13
+#: rc.cpp:450
+#, no-c-format
+msgid "Browse local network"
+msgstr ""
+
+#. i18n: file ./dnssd/kcm_kdnssd.kcfg line 14
+#: rc.cpp:453
+#, no-c-format
+msgid ""
+"If true .local domain will be browsed. It is always link-local, using "
+"multicast DNS."
+msgstr ""
+
+#. i18n: file ./dnssd/kcm_kdnssd.kcfg line 18
+#: rc.cpp:456
+#, no-c-format
+msgid "Recursive search for domains"
+msgstr ""
+
+#. i18n: file ./dnssd/kcm_kdnssd.kcfg line 19
+#: rc.cpp:459
+#, no-c-format
+msgid "Removed in KDE 3.5.0"
+msgstr ""
+
+#. i18n: file ./dnssd/kcm_kdnssd.kcfg line 25
+#: rc.cpp:462
+#, no-c-format
+msgid ""
+"Select publishing in LAN (multicast) or WAN (unicast, needs configured DNS "
+"server)"
+msgstr ""
+
+#. i18n: file ./dnssd/kcm_kdnssd.kcfg line 26
+#: rc.cpp:465
+#, no-c-format
+msgid ""
+"Specifies if publishing should be by default link-local using multicast DNS "
+"(LAN) or 'wide-area' using normal DNS server (WAN)."
+msgstr ""
+
+#. i18n: file ./dnssd/kcm_kdnssd.kcfg line 34
+#: rc.cpp:468
+#, no-c-format
+msgid "Name of default publishing domain for WAN"
+msgstr ""
+
+#. i18n: file ./dnssd/kcm_kdnssd.kcfg line 36
+#: rc.cpp:471
+#, no-c-format
+msgid ""
+"Domain name for publishing using 'wide-area' (normal DNS) ZeroConf. This "
+"must match domain specified in /etc/mdnsd.conf. This value is used only if "
+"PublishType is set to WAN.\n"
+msgstr ""
+
+#: _translatorinfo.cpp:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr ""
+
+#: _translatorinfo.cpp:3
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr ""
+
+#: kded/kded.cpp:721
+msgid "Check Sycoca database only once"
+msgstr ""
+
+#: kded/kded.cpp:861
+msgid "KDE Daemon"
+msgstr ""
+
+#: kded/kded.cpp:863
+msgid "KDE Daemon - triggers Sycoca database updates when needed"
+msgstr ""
+
+#: kded/kbuildsycoca.cpp:483
+msgid ""
+"Error creating database '%1'.\n"
+"Check that the permissions are correct on the directory and the disk is not "
+"full.\n"
+msgstr ""
+
+#: kded/kbuildsycoca.cpp:483 kded/kbuildsycoca.cpp:512
+#: kded/kbuildsycoca.cpp:721
+msgid "KBuildSycoca"
+msgstr ""
+
+#: kded/kbuildsycoca.cpp:512
+msgid ""
+"Error writing database '%1'.\n"
+"Check that the permissions are correct on the directory and the disk is not "
+"full.\n"
+msgstr ""
+
+#: kded/kbuildsycoca.cpp:695
+msgid "Do not signal applications to update"
+msgstr ""
+
+#: kded/kbuildsycoca.cpp:696
+msgid "Disable incremental update, re-read everything"
+msgstr ""
+
+#: kded/kbuildsycoca.cpp:697
+msgid "Check file timestamps"
+msgstr ""
+
+#: kded/kbuildsycoca.cpp:698
+msgid "Disable checking files (dangerous)"
+msgstr ""
+
+#: kded/kbuildsycoca.cpp:699
+msgid "Create global database"
+msgstr ""
+
+#: kded/kbuildsycoca.cpp:700
+msgid "Perform menu generation test run only"
+msgstr ""
+
+#: kded/kbuildsycoca.cpp:701
+msgid "Track menu id for debug purposes"
+msgstr ""
+
+#: kded/kbuildsycoca.cpp:703
+msgid "Silent - work without windows and stderr"
+msgstr ""
+
+#: kded/kbuildsycoca.cpp:704
+msgid "Show progress information (even if 'silent' mode is on)"
+msgstr ""
+
+#: kded/kbuildsycoca.cpp:722
+msgid "Rebuilds the system configuration cache."
+msgstr ""
+
+#: kded/kbuildsycoca.cpp:724 kded/kbuildsycoca.cpp:725 kded/kde-menu.cpp:119
+#: kded/khostname.cpp:362 kdeui/kaboutdialog.cpp:90
+msgid "Author"
+msgstr ""
+
+#: kded/kbuildsycoca.cpp:750
+msgid "Reloading KDE configuration, please wait..."
+msgstr ""
+
+#: kded/kbuildsycoca.cpp:751
+msgid "KDE Configuration Manager"
+msgstr ""
+
+#: kded/kbuildsycoca.cpp:753
+msgid "Do you want to reload KDE configuration?"
+msgstr ""
+
+#: kded/kbuildsycoca.cpp:753
+msgid "Do Not Reload"
+msgstr ""
+
+#: kded/kbuildsycoca.cpp:953
+msgid "Configuration information reloaded successfully."
+msgstr ""
+
+#: kded/kde-menu.cpp:36
+msgid "Output data in UTF-8 instead of local encoding"
+msgstr ""
+
+#: kded/kde-menu.cpp:37
+msgid ""
+"Print menu-id of the menu that contains\n"
+"the application"
+msgstr ""
+
+#: kded/kde-menu.cpp:38
+msgid ""
+"Print menu name (caption) of the menu that\n"
+"contains the application"
+msgstr ""
+
+#: kded/kde-menu.cpp:39
+msgid "Highlight the entry in the menu"
+msgstr ""
+
+#: kded/kde-menu.cpp:40
+msgid "Do not check if sycoca database is up to date"
+msgstr ""
+
+#: kded/kde-menu.cpp:41
+msgid "The id of the menu entry to locate"
+msgstr ""
+
+#: kded/kde-menu.cpp:99
+msgid "Menu item '%1' could not be highlighted."
+msgstr ""
+
+#: kded/kde-menu.cpp:111
+msgid ""
+"KDE Menu query tool.\n"
+"This tool can be used to find in which menu a specific application is "
+"shown.\n"
+"The --highlight option can be used to visually indicate to the user where\n"
+"in the KDE menu a specific application is located."
+msgstr ""
+
+#: kded/kde-menu.cpp:116
+msgid "kde-menu"
+msgstr ""
+
+#: kded/kde-menu.cpp:133
+msgid "You must specify an application-id such as 'kde-konsole.desktop'"
+msgstr ""
+
+#: kded/kde-menu.cpp:142
+msgid ""
+"You must specify at least one of --print-menu-id, --print-menu-name or "
+"--highlight"
+msgstr ""
+
+#: kded/kde-menu.cpp:164
+msgid "No menu item '%1'."
+msgstr ""
+
+#: kded/kde-menu.cpp:168
+msgid "Menu item '%1' not found in menu."
+msgstr ""
+
+#: kded/khostname.cpp:41
+msgid "Old hostname"
+msgstr ""
+
+#: kded/khostname.cpp:42
+msgid "New hostname"
+msgstr ""
+
+#: kded/khostname.cpp:79
+msgid "Error: HOME environment variable not set.\n"
+msgstr ""
+
+#: kded/khostname.cpp:88
+msgid "Error: DISPLAY environment variable not set.\n"
+msgstr ""
+
+#: kded/khostname.cpp:359
+msgid "KDontChangeTheHostName"
+msgstr ""
+
+#: kded/khostname.cpp:360
+msgid "Informs KDE about a change in hostname"
+msgstr ""
+
+#: kparts/browserextension.cpp:485
+msgid "<qt>Do you want to search the Internet for <b>%1</b>?"
+msgstr ""
+
+#: kparts/browserextension.cpp:486
+msgid "Internet Search"
+msgstr ""
+
+#: kparts/browserextension.cpp:486
+msgid "&Search"
+msgstr ""
+
+#: kparts/part.cpp:492
+msgid ""
+"The document \"%1\" has been modified.\n"
+"Do you want to save your changes or discard them?"
+msgstr ""
+
+#: kparts/part.cpp:494
+msgid "Close Document"
+msgstr ""
+
+#: kparts/browserrun.cpp:275
+msgid "Do you really want to execute '%1'? "
+msgstr ""
+
+#: kparts/browserrun.cpp:276
+msgid "Execute File?"
+msgstr ""
+
+#: kparts/browserrun.cpp:276
+msgid "Execute"
+msgstr ""
+
+#: kparts/browserrun.cpp:294
+msgid ""
+"Open '%2'?\n"
+"Type: %1"
+msgstr ""
+
+#: kparts/browserrun.cpp:296
+msgid ""
+"Open '%3'?\n"
+"Name: %2\n"
+"Type: %1"
+msgstr ""
+
+#: kparts/browserrun.cpp:310
+msgid "&Open with '%1'"
+msgstr ""
+
+#: kparts/browserrun.cpp:311
+msgid "&Open With..."
+msgstr ""
+
+#: kparts/browserrun.cpp:353
+msgid "&Open"
+msgstr ""
+
+#: khtml/khtml_ext.cpp:889 kparts/browserrun.cpp:390
+msgid "The Download Manager (%1) could not be found in your $PATH "
+msgstr ""
+
+#: khtml/khtml_ext.cpp:890 kparts/browserrun.cpp:391
+msgid ""
+"Try to reinstall it  \n"
+"\n"
+"The integration with Konqueror will be disabled!"
+msgstr ""
+
+#: kspell2/ui/configdialog.cpp:38
+msgid "KSpell2 Configuration"
+msgstr ""
+
+#: kdeui/kspelldlg.cpp:53 kspell2/ui/dialog.cpp:62
+msgid "Check Spelling"
+msgstr ""
+
+#: kdeui/kspelldlg.cpp:54 kspell2/ui/dialog.cpp:64
+msgid "&Finished"
+msgstr ""
+
+#: kdecore/kstdaccel.cpp:71 kutils/kfind.cpp:47
+msgid "Find Next"
+msgstr ""
+
+#: kutils/kfind.cpp:53
+msgid "<qt>Find next occurrence of '<b>%1</b>'?</qt>"
+msgstr ""
+
+#: kutils/kfind.cpp:623 kutils/kfind.cpp:643
+#, c-format
+msgid ""
+"_n: 1 match found.\n"
+"%n matches found."
+msgstr ""
+
+#: kutils/kfind.cpp:625
+msgid "<qt>No matches found for '<b>%1</b>'.</qt>"
+msgstr ""
+
+#: kutils/kfind.cpp:645
+msgid "No matches found for '<b>%1</b>'."
+msgstr ""
+
+#: kutils/kfind.cpp:650 kutils/kreplace.cpp:307
+msgid "Beginning of document reached."
+msgstr ""
+
+#: kutils/kfind.cpp:652 kutils/kreplace.cpp:309
+msgid "End of document reached."
+msgstr ""
+
+#: kutils/kfind.cpp:659
+msgid "Continue from the end?"
+msgstr ""
+
+#: kutils/kfind.cpp:660
+msgid "Continue from the beginning?"
+msgstr ""
+
+#: kutils/kpluginselector.cpp:111
+msgid ""
+"<qt><table><tr><td><b>Description:</b></td><td>%1</td></tr><tr><td><b>Author:"
+"</b></td><td>%2</td></tr><tr><td><b>Version:</b></td><td>%3</td></tr><tr><td>"
+"<b>License:</b></td><td>%4</td></tr></table></qt>"
+msgstr ""
+
+#: kabc/addressee.cpp:329 kabc/addresseedialog.cpp:70
+#: kabc/addresseedialog.cpp:100 kabc/distributionlistdialog.cpp:174
+#: kabc/distributionlistdialog.cpp:189 kabc/distributionlisteditor.cpp:142
+#: kabc/distributionlisteditor.cpp:161 khtml/misc/knsplugininstaller.cpp:381
+#: knewstuff/downloaddialog.cpp:270 knewstuff/downloaddialog.cpp:276
+#: knewstuff/downloaddialog.cpp:282 knewstuff/providerdialog.cpp:65
+#: kresources/configpage.cpp:119 kutils/kpluginselector.cpp:200
+#: obj-x86_64-linux-gnu/kabc/addressee.cpp:329
+msgid "Name"
+msgstr ""
+
+#: kutils/kpluginselector.cpp:536
+msgid "(This plugin is not configurable)"
+msgstr ""
+
+#: kutils/kcmoduleloader.cpp:98
+msgid ""
+"<qt>There was an error when loading the module '%1'.<br><br>The desktop file "
+"(%2) as well as the library (%3) was found but yet the module could not be "
+"loaded properly. Most likely the factory declaration was wrong, or the "
+"create_* function was missing.</qt>"
+msgstr ""
+
+#: kutils/kcmoduleloader.cpp:111
+msgid "The specified library %1 could not be found."
+msgstr ""
+
+#: kutils/kcmoduleloader.cpp:134 kutils/kcmoduleloader.cpp:143
+msgid "The module %1 could not be found."
+msgstr ""
+
+#: kutils/kcmoduleloader.cpp:136
+msgid ""
+"<qt><p>The Lisa and lan:/ ioslave modules are not installed by default in "
+"Kubuntu, because they are obsolete and replaced by zeroconf.<br> If you "
+"still wish to use them, you should install the lisa package from the "
+"Universe repository.</p></qt>"
+msgstr ""
+
+#: kutils/kcmoduleloader.cpp:145
+msgid ""
+"<qt><p>The diagnostics is:<br>The desktop file %1 could not be "
+"found.</p></qt>"
+msgstr ""
+
+#: kutils/kcmoduleloader.cpp:166
+msgid "The module %1 could not be loaded."
+msgstr ""
+
+#: kutils/kcmoduleloader.cpp:185
+msgid "The module %1 is not a valid configuration module."
+msgstr ""
+
+#: kutils/kcmoduleloader.cpp:186
+msgid ""
+"<qt><p>The diagnostics is:<br>The desktop file %1 does not specify a "
+"library.</qt>"
+msgstr ""
+
+#: kutils/kcmoduleloader.cpp:220
+msgid "There was an error loading the module."
+msgstr ""
+
+#: kutils/kcmoduleloader.cpp:220 kutils/kcmoduleloader.cpp:288
+msgid ""
+"<qt><p>The diagnostics is:<br>%1<p>Possible reasons:</p><ul><li>An error "
+"occurred during your last KDE upgrade leaving an orphaned control "
+"module<li>You have old third party modules lying around.</ul><p>Check these "
+"points carefully and try to remove the module mentioned in the error "
+"message. If this fails, consider contacting your distributor or "
+"packager.</p></qt>"
+msgstr ""
+
+#: kutils/kcmoduleproxy.cpp:212
+msgid ""
+"<b>Changes in this section requires root access.</b><br />Click the "
+"\"Administrator Mode\" button to allow modifications."
+msgstr ""
+
+#: kutils/kcmoduleproxy.cpp:219
+msgid ""
+"This section requires special permissions, probably for system-wide changes; "
+"therefore, it is required that you provide the root password to be able to "
+"change the module's properties. If you do not provide the password, the "
+"module will be disabled."
+msgstr ""
+
+#: kutils/kcmoduleproxy.cpp:251
+#, c-format
+msgid ""
+"_: Argument is application name\n"
+"This configuration section is already opened in %1"
+msgstr ""
+
+#: kutils/kcmoduleproxy.cpp:324
+msgid "<big>Loading...</big>"
+msgstr ""
+
+#: kutils/kfinddialog.cpp:55 kutils/kfinddialog.cpp:66
+msgid "Find Text"
+msgstr ""
+
+#: kutils/kfinddialog.cpp:77
+msgid "Replace Text"
+msgstr ""
+
+#: kdecore/kkeyserver_x11.cpp:135 kdecore/kstdaccel.cpp:70
+#: kdeui/keditcl2.cpp:107 kdeui/keditcl2.cpp:120 kdeui/keditcl2.cpp:377
+#: kdeui/keditcl2.cpp:390 kdeui/keditcl2.cpp:700 kutils/kfinddialog.cpp:119
+msgid "Find"
+msgstr ""
+
+#: kutils/kfinddialog.cpp:126
+msgid "&Text to find:"
+msgstr ""
+
+#: kutils/kfinddialog.cpp:130
+msgid "Regular e&xpression"
+msgstr ""
+
+#: kresources/configpage.cpp:129 kutils/kfinddialog.cpp:131
+msgid "&Edit..."
+msgstr ""
+
+#: kutils/kfinddialog.cpp:140
+msgid "Replace With"
+msgstr ""
+
+#: kutils/kfinddialog.cpp:147
+msgid "Replace&ment text:"
+msgstr ""
+
+#: kutils/kfinddialog.cpp:151
+msgid "Use p&laceholders"
+msgstr ""
+
+#: kutils/kfinddialog.cpp:152
+msgid "Insert Place&holder"
+msgstr ""
+
+#: kutils/kfinddialog.cpp:168
+msgid "C&ase sensitive"
+msgstr ""
+
+#: kutils/kfinddialog.cpp:169
+msgid "&Whole words only"
+msgstr ""
+
+#: kutils/kfinddialog.cpp:170
+msgid "From c&ursor"
+msgstr ""
+
+#: kdeui/keditcl2.cpp:730 kdeui/keditcl2.cpp:870 kutils/kfinddialog.cpp:171
+msgid "Find &backwards"
+msgstr ""
+
+#: kutils/kfinddialog.cpp:172
+msgid "&Selected text"
+msgstr ""
+
+#: kutils/kfinddialog.cpp:179
+msgid "&Prompt on replace"
+msgstr ""
+
+#: kutils/kfinddialog.cpp:232
+msgid "Start replace"
+msgstr ""
+
+#: kutils/kfinddialog.cpp:233
+msgid ""
+"<qt>If you press the <b>Replace</b> button, the text you entered above is "
+"searched for within the document and any occurrence is replaced with the "
+"replacement text.</qt>"
+msgstr ""
+
+#: kdeui/keditcl2.cpp:701 kdeui/keditcl2.cpp:833 kdeui/kstdguiitem.cpp:254
+#: kutils/kfinddialog.cpp:239
+msgid "&Find"
+msgstr ""
+
+#: kutils/kfinddialog.cpp:240
+msgid "Start searching"
+msgstr ""
+
+#: kutils/kfinddialog.cpp:241
+msgid ""
+"<qt>If you press the <b>Find</b> button, the text you entered above is "
+"searched for within the document.</qt>"
+msgstr ""
+
+#: kutils/kfinddialog.cpp:247
+msgid ""
+"Enter a pattern to search for, or select a previous pattern from the list."
+msgstr ""
+
+#: kutils/kfinddialog.cpp:250
+msgid "If enabled, search for a regular expression."
+msgstr ""
+
+#: kutils/kfinddialog.cpp:252
+msgid "Click here to edit your regular expression using a graphical editor."
+msgstr ""
+
+#: kutils/kfinddialog.cpp:254
+msgid "Enter a replacement string, or select a previous one from the list."
+msgstr ""
+
+#: kutils/kfinddialog.cpp:256
+msgid ""
+"<qt>If enabled, any occurrence of <code><b>\\N</b></code>, where "
+"<code><b>N</b></code> is a integer number, will be replaced with the "
+"corresponding capture (\"parenthesized substring\") from the pattern.<p>To "
+"include (a literal <code><b>\\N</b></code> in your replacement, put an extra "
+"backslash in front of it, like <code><b>\\\\N</b></code>.</qt>"
+msgstr ""
+
+#: kutils/kfinddialog.cpp:263
+msgid "Click for a menu of available captures."
+msgstr ""
+
+#: kutils/kfinddialog.cpp:265
+msgid "Require word boundaries in both ends of a match to succeed."
+msgstr ""
+
+#: kutils/kfinddialog.cpp:267
+msgid "Start searching at the current cursor location rather than at the top."
+msgstr ""
+
+#: kutils/kfinddialog.cpp:269
+msgid "Only search within the current selection."
+msgstr ""
+
+#: kutils/kfinddialog.cpp:271
+msgid ""
+"Perform a case sensitive search: entering the pattern 'Joe' will not match "
+"'joe' or 'JOE', only 'Joe'."
+msgstr ""
+
+#: kutils/kfinddialog.cpp:274
+msgid "Search backwards."
+msgstr ""
+
+#: kutils/kfinddialog.cpp:276
+msgid "Ask before replacing each match found."
+msgstr ""
+
+#: kutils/kfinddialog.cpp:449
+msgid "Any Character"
+msgstr ""
+
+#: kutils/kfinddialog.cpp:450
+msgid "Start of Line"
+msgstr ""
+
+#: kdecore/kstdaccel.cpp:78 kutils/kfinddialog.cpp:451
+msgid "End of Line"
+msgstr ""
+
+#: kutils/kfinddialog.cpp:452
+msgid "Set of Characters"
+msgstr ""
+
+#: kutils/kfinddialog.cpp:453
+msgid "Repeats, Zero or More Times"
+msgstr ""
+
+#: kutils/kfinddialog.cpp:454
+msgid "Repeats, One or More Times"
+msgstr ""
+
+#: kutils/kfinddialog.cpp:455
+msgid "Optional"
+msgstr ""
+
+#: kutils/kfinddialog.cpp:456
+msgid "Escape"
+msgstr ""
+
+#: kutils/kfinddialog.cpp:457
+msgid "TAB"
+msgstr ""
+
+#: kutils/kfinddialog.cpp:458
+msgid "Newline"
+msgstr ""
+
+#: kutils/kfinddialog.cpp:459
+msgid "Carriage Return"
+msgstr ""
+
+#: kutils/kfinddialog.cpp:460
+msgid "White Space"
+msgstr ""
+
+#: kutils/kfinddialog.cpp:461
+msgid "Digit"
+msgstr ""
+
+#: kutils/kfinddialog.cpp:510
+msgid "Complete Match"
+msgstr ""
+
+#: kutils/kfinddialog.cpp:515
+msgid "Captured Text (%1)"
+msgstr ""
+
+#: kutils/kfinddialog.cpp:523
+msgid "You must enter some text to search for."
+msgstr ""
+
+#: kutils/kfinddialog.cpp:534
+msgid "Invalid regular expression."
+msgstr ""
+
+#: kutils/kreplacedialog.cpp:142
+msgid "Your replacement string is referencing a capture greater than '\\%1', "
+msgstr ""
+
+#: kutils/kreplacedialog.cpp:145
+#, c-format
+msgid ""
+"_n: but your pattern only defines 1 capture.\n"
+"but your pattern only defines %n captures."
+msgstr ""
+
+#: kutils/kreplacedialog.cpp:146
+msgid "but your pattern defines no captures."
+msgstr ""
+
+#: kutils/kreplacedialog.cpp:147
+msgid ""
+"\n"
+"Please correct."
+msgstr ""
+
+#: kutils/kreplace.cpp:49
+msgid "&All"
+msgstr ""
+
+#: kutils/kreplace.cpp:49
+msgid "&Skip"
+msgstr ""
+
+#: kutils/kreplace.cpp:58
+msgid "Replace '%1' with '%2'?"
+msgstr ""
+
+#: kutils/kreplace.cpp:105 kutils/kreplace.cpp:300
+msgid "No text was replaced."
+msgstr ""
+
+#: kutils/kreplace.cpp:107 kutils/kreplace.cpp:302
+#, c-format
+msgid ""
+"_n: 1 replacement done.\n"
+"%n replacements done."
+msgstr ""
+
+#: kutils/kreplace.cpp:316
+msgid "Do you want to restart search from the end?"
+msgstr ""
+
+#: kutils/kreplace.cpp:317
+msgid "Do you want to restart search at the beginning?"
+msgstr ""
+
+#: kutils/kreplace.cpp:319
+msgid "Restart"
+msgstr ""
+
+#: kutils/ksettings/componentsdialog.cpp:48
+msgid "Select Components"
+msgstr ""
+
+#: kutils/ksettings/dialog.cpp:590
+msgid "Select Components..."
+msgstr ""
+
+#: kdewidgets/makekdewidgets.cpp:15
+msgid "Builds Qt widget plugins from an ini style description file."
+msgstr ""
+
+#: kabc/vcardparser/testread.cpp:39 kdewidgets/makekdewidgets.cpp:112
+msgid "Input file"
+msgstr ""
+
+#: kdewidgets/makekdewidgets.cpp:113
+msgid "Output file"
+msgstr ""
+
+#: kdewidgets/makekdewidgets.cpp:114
+msgid "Name of the plugin class to generate"
+msgstr ""
+
+#: kdewidgets/makekdewidgets.cpp:115
+msgid "Default widget group name to display in designer"
+msgstr ""
+
+#: kdewidgets/makekdewidgets.cpp:116
+msgid "Embed pixmaps from a source directory"
+msgstr ""
+
+#: kdewidgets/makekdewidgets.cpp:129
+msgid "makekdewidgets"
+msgstr ""
+
+#: kabc/resourceselectdialog.cpp:39 kresources/selectdialog.cpp:42
+msgid "Resource Selection"
+msgstr ""
+
+#: kabc/resourceselectdialog.cpp:46 kresources/configpage.cpp:107
+#: kresources/selectdialog.cpp:49
+msgid "Resources"
+msgstr ""
+
+#: kresources/selectdialog.cpp:95
+msgid "There is no resource available!"
+msgstr ""
+
+#: kresources/resource.cpp:61
+msgid "resource"
+msgstr ""
+
+#: kresources/configdialog.cpp:40 kresources/configpage.cpp:103
+#: kresources/configpage.cpp:297
+msgid "Resource Configuration"
+msgstr ""
+
+#: kresources/configdialog.cpp:51
+msgid "General Settings"
+msgstr ""
+
+#: kdeui/kcolordialog.cpp:1133 knewstuff/uploaddialog.cpp:58
+#: kresources/configdialog.cpp:53
+msgid "Name:"
+msgstr ""
+
+#: kresources/configdialog.cpp:57
+msgid "Read-only"
+msgstr ""
+
+#: kresources/configdialog.cpp:66
+msgid "%1 Resource Settings"
+msgstr ""
+
+#: kresources/configdialog.cpp:107
+msgid "Please enter a resource name."
+msgstr ""
+
+#: kresources/kcmkresources.cpp:44
+msgid "kcmkresources"
+msgstr ""
+
+#: kresources/kcmkresources.cpp:45
+msgid "KDE Resources configuration module"
+msgstr ""
+
+#: kresources/kcmkresources.cpp:47
+msgid "(c) 2003 Tobias Koenig"
+msgstr ""
+
+#: kresources/configpage.cpp:120
+msgid "Type"
+msgstr ""
+
+#: kresources/configpage.cpp:121
+msgid "Standard"
+msgstr ""
+
+#: kresources/configpage.cpp:126
+msgid "&Add..."
+msgstr ""
+
+#: kresources/configpage.cpp:131
+msgid "&Use as Standard"
+msgstr ""
+
+#: kresources/configpage.cpp:283
+msgid "There is no standard resource! Please select one."
+msgstr ""
+
+#: kresources/configpage.cpp:298
+msgid "Please select type of the new resource:"
+msgstr ""
+
+#: kresources/configpage.cpp:308
+msgid "Unable to create resource of type '%1'."
+msgstr ""
+
+#: kresources/configpage.cpp:360
+msgid ""
+"You cannot remove your standard resource! Please select a new standard "
+"resource first."
+msgstr ""
+
+#: kresources/configpage.cpp:394 kresources/configpage.cpp:413
+msgid "You cannot use a read-only resource as standard!"
+msgstr ""
+
+#: kresources/configpage.cpp:418
+msgid "You cannot use an inactive resource as standard!"
+msgstr ""
+
+#: kresources/configpage.cpp:498
+msgid ""
+"You cannot deactivate the standard resource. Choose another standard "
+"resource first."
+msgstr ""
+
+#: kresources/configpage.cpp:528
+msgid ""
+"There is no valid standard resource! Please select one which is neither "
+"read-only nor inactive."
+msgstr ""
+
+#: interfaces/ktexteditor/editorchooser.cpp:60
+msgid "System Default (%1)"
+msgstr ""
+
+#: interfaces/kscript/scriptloader.cpp:40
+msgid "KDE Scripts"
+msgstr ""
+
+#: interfaces/kscript/scriptmanager.cpp:106
+msgid "Unable to get KScript Runner for type \"%1\"."
+msgstr ""
+
+#: interfaces/kscript/scriptmanager.cpp:106
+#: interfaces/kscript/scriptmanager.cpp:129
+msgid "KScript Error"
+msgstr ""
+
+#: interfaces/kscript/scriptmanager.cpp:129
+msgid "Unable find script \"%1\"."
+msgstr ""
+
+#: kinit/klauncher_main.cpp:58
+msgid ""
+"klauncher: This program is not supposed to be started manually.\n"
+"klauncher: It is started automatically by kdeinit.\n"
+msgstr ""
+
+#: kinit/kinit.cpp:475
+msgid ""
+"Unable to start new process.\n"
+"The system may have reached the maximum number of open files possible or the "
+"maximum number of open files that you are allowed to use has been reached."
+msgstr ""
+
+#: kinit/kinit.cpp:497
+msgid ""
+"Unable to create new process.\n"
+"The system may have reached the maximum number of processes possible or the "
+"maximum number of processes that you are allowed to use has been reached."
+msgstr ""
+
+#: kinit/kinit.cpp:589
+msgid "Could not find '%1' executable."
+msgstr ""
+
+#: kinit/kinit.cpp:605
+msgid ""
+"Could not open library '%1'.\n"
+"%2"
+msgstr ""
+
+#: kinit/kinit.cpp:606 kinit/kinit.cpp:649
+msgid "Unknown error"
+msgstr ""
+
+#: kinit/kinit.cpp:648
+msgid ""
+"Could not find 'kdemain' in '%1'.\n"
+"%2"
+msgstr ""
+
+#: kinit/klauncher.cpp:743
+msgid "KDEInit could not launch '%1'."
+msgstr ""
+
+#: kinit/klauncher.cpp:918 kinit/klauncher.cpp:943 kinit/klauncher.cpp:960
+msgid "Could not find service '%1'."
+msgstr ""
+
+#: kinit/klauncher.cpp:975 kinit/klauncher.cpp:1011
+msgid "Service '%1' is malformatted."
+msgstr ""
+
+#: kinit/klauncher.cpp:1087
+#, c-format
+msgid "Launching %1"
+msgstr ""
+
+#: kinit/klauncher.cpp:1281
+msgid "Unknown protocol '%1'.\n"
+msgstr ""
+
+#: kinit/klauncher.cpp:1334
+msgid "Error loading '%1'.\n"
+msgstr ""
+
+#: kabc/ldapconfigwidget.cpp:83
+msgid "User:"
+msgstr ""
+
+#: kabc/ldapconfigwidget.cpp:92
+msgid "Bind DN:"
+msgstr ""
+
+#: kabc/ldapconfigwidget.cpp:101
+msgid "Realm:"
+msgstr ""
+
+#: kabc/ldapconfigwidget.cpp:110
+msgid "Password:"
+msgstr ""
+
+#: kabc/ldapconfigwidget.cpp:120
+msgid "Host:"
+msgstr ""
+
+#: kabc/ldapconfigwidget.cpp:130
+msgid "Port:"
+msgstr ""
+
+#: kabc/ldapconfigwidget.cpp:141
+msgid "LDAP version:"
+msgstr ""
+
+#: kabc/ldapconfigwidget.cpp:152
+msgid "Size limit:"
+msgstr ""
+
+#: kabc/ldapconfigwidget.cpp:163
+msgid "Time limit:"
+msgstr ""
+
+#: kabc/ldapconfigwidget.cpp:167
+msgid " sec"
+msgstr ""
+
+#: kabc/ldapconfigwidget.cpp:175
+msgid ""
+"_: Distinguished Name\n"
+"DN:"
+msgstr ""
+
+#: kabc/ldapconfigwidget.cpp:182 kabc/ldapconfigwidget.cpp:231
+msgid "Query Server"
+msgstr ""
+
+#: kabc/ldapconfigwidget.cpp:190
+msgid "Filter:"
+msgstr ""
+
+#: kabc/ldapconfigwidget.cpp:199
+msgid "Security"
+msgstr ""
+
+#: kabc/ldapconfigwidget.cpp:201
+msgid "TLS"
+msgstr ""
+
+#: kabc/ldapconfigwidget.cpp:202
+msgid "SSL"
+msgstr ""
+
+#: kabc/ldapconfigwidget.cpp:216
+msgid "Authentication"
+msgstr ""
+
+#: kabc/ldapconfigwidget.cpp:218
+msgid "Anonymous"
+msgstr ""
+
+#: kabc/ldapconfigwidget.cpp:219
+msgid "Simple"
+msgstr ""
+
+#: kabc/ldapconfigwidget.cpp:220
+msgid "SASL"
+msgstr ""
+
+#: kabc/ldapconfigwidget.cpp:222
+msgid "SASL mechanism:"
+msgstr ""
+
+#: kabc/ldapconfigwidget.cpp:302
+msgid "LDAP Query"
+msgstr ""
+
+#: kabc/kab2kabc.cpp:42
+msgid "Disable automatic startup on login"
+msgstr ""
+
+#: kabc/kab2kabc.cpp:45
+msgid "Override existing entries"
+msgstr ""
+
+#: kabc/kab2kabc.cpp:287
+msgid ""
+"Address book file <b>%1</b> not found! Make sure the old address book is "
+"located there and you have read permission for this file."
+msgstr ""
+
+#: kabc/kab2kabc.cpp:435
+msgid "Kab to Kabc Converter"
+msgstr ""
+
+#: kabc/phonenumber.cpp:147
+msgid ""
+"_: Preferred phone\n"
+"Preferred"
+msgstr ""
+
+#: kabc/phonenumber.cpp:151
+msgid ""
+"_: Home phone\n"
+"Home"
+msgstr ""
+
+#: kabc/phonenumber.cpp:154
+msgid ""
+"_: Work phone\n"
+"Work"
+msgstr ""
+
+#: kabc/phonenumber.cpp:157
+msgid "Messenger"
+msgstr ""
+
+#: kabc/phonenumber.cpp:160
+msgid "Preferred Number"
+msgstr ""
+
+#: kabc/phonenumber.cpp:163
+msgid "Voice"
+msgstr ""
+
+#: kabc/phonenumber.cpp:166
+msgid "Fax"
+msgstr ""
+
+#: kabc/phonenumber.cpp:169
+msgid ""
+"_: Mobile Phone\n"
+"Mobile"
+msgstr ""
+
+#: kabc/phonenumber.cpp:172
+msgid "Video"
+msgstr ""
+
+#: kabc/phonenumber.cpp:175
+msgid "Mailbox"
+msgstr ""
+
+#: kabc/phonenumber.cpp:178
+msgid "Modem"
+msgstr ""
+
+#: kabc/phonenumber.cpp:181
+msgid ""
+"_: Car Phone\n"
+"Car"
+msgstr ""
+
+#: kabc/addressee.cpp:595 kabc/phonenumber.cpp:184
+#: obj-x86_64-linux-gnu/kabc/addressee.cpp:595
+msgid "ISDN"
+msgstr ""
+
+#: kabc/phonenumber.cpp:187
+msgid "PCS"
+msgstr ""
+
+#: kabc/addressee.cpp:601 kabc/phonenumber.cpp:190
+#: obj-x86_64-linux-gnu/kabc/addressee.cpp:601
+msgid "Pager"
+msgstr ""
+
+#: kabc/addressee.cpp:577 kabc/phonenumber.cpp:193
+#: obj-x86_64-linux-gnu/kabc/addressee.cpp:577
+msgid "Home Fax"
+msgstr ""
+
+#: kabc/phonenumber.cpp:196
+msgid "Work Fax"
+msgstr ""
+
+#: kabc/address.cpp:312 kabc/phonenumber.cpp:199 kdecore/kcharsets.cpp:43
+msgid "Other"
+msgstr ""
+
+#: kabc/distributionlistdialog.cpp:61 kabc/distributionlisteditor.cpp:43
+msgid "Select Email Address"
+msgstr ""
+
+#: kab/addressbook.cc:303 kabc/distributionlistdialog.cpp:69
+#: kabc/distributionlisteditor.cpp:49
+msgid "Email Addresses"
+msgstr ""
+
+#: kabc/distributionlisteditor.cpp:133
+msgid "New List"
+msgstr ""
+
+#: kabc/distributionlistdialog.cpp:160 kabc/distributionlisteditor.cpp:137
+msgid "Remove List"
+msgstr ""
+
+#: kabc/addresseedialog.cpp:71 kabc/addresseedialog.cpp:101
+#: kabc/distributionlistdialog.cpp:190 kabc/distributionlisteditor.cpp:143
+#: kabc/field.cpp:208 kabc/scripts/field.src.cpp:104 kdeui/kaboutdialog.cpp:91
+#: obj-x86_64-linux-gnu/kabc/field.cpp:208
+msgid "Email"
+msgstr ""
+
+#: kabc/distributionlistdialog.cpp:191 kabc/distributionlisteditor.cpp:144
+msgid "Use Preferred"
+msgstr ""
+
+#: kabc/distributionlisteditor.cpp:148
+msgid "Change Email"
+msgstr ""
+
+#: kabc/distributionlistdialog.cpp:202 kabc/distributionlisteditor.cpp:152
+msgid "Remove Entry"
+msgstr ""
+
+#: kabc/distributionlistdialog.cpp:183 kabc/distributionlisteditor.cpp:156
+msgid "Add Entry"
+msgstr ""
+
+#: kabc/distributionlistdialog.cpp:175 kabc/distributionlisteditor.cpp:162
+msgid "Preferred Email"
+msgstr ""
+
+#: kabc/distributionlistdialog.cpp:237 kabc/distributionlisteditor.cpp:196
+msgid "New Distribution List"
+msgstr ""
+
+#: kabc/distributionlisteditor.cpp:197
+msgid "Please enter name:"
+msgstr ""
+
+#: kabc/addresseehelper.cpp:67
+msgid "Dr."
+msgstr ""
+
+#: kabc/addresseehelper.cpp:68
+msgid "Miss"
+msgstr ""
+
+#: kabc/addresseehelper.cpp:69
+msgid "Mr."
+msgstr ""
+
+#: kabc/addresseehelper.cpp:70
+msgid "Mrs."
+msgstr ""
+
+#: kabc/addresseehelper.cpp:71
+msgid "Ms."
+msgstr ""
+
+#: kabc/addresseehelper.cpp:72
+msgid "Prof."
+msgstr ""
+
+#: kabc/addresseehelper.cpp:74
+msgid "I"
+msgstr ""
+
+#: kabc/addresseehelper.cpp:75
+msgid "II"
+msgstr ""
+
+#: kabc/addresseehelper.cpp:76
+msgid "III"
+msgstr ""
+
+#: kabc/addresseehelper.cpp:77
+msgid "Jr."
+msgstr ""
+
+#: kabc/addresseehelper.cpp:78
+msgid "Sr."
+msgstr ""
+
+#: kabc/address.cpp:145
+msgid "Post Office Box"
+msgstr ""
+
+#: kabc/address.cpp:163
+msgid "Extended Address Information"
+msgstr ""
+
+#: kabc/address.cpp:181
+msgid "Street"
+msgstr ""
+
+#: kabc/address.cpp:199
+msgid "Locality"
+msgstr ""
+
+#: kabc/address.cpp:217 kdeui/ktimezonewidget.cpp:46
+msgid "Region"
+msgstr ""
+
+#: kabc/address.cpp:235
+msgid "Postal Code"
+msgstr ""
+
+#: kab/addressbook.cc:204 kabc/address.cpp:253
+msgid "Country"
+msgstr ""
+
+#: kab/addressbook.cc:188 kabc/address.cpp:271
+msgid "Delivery Label"
+msgstr ""
+
+#: kabc/address.cpp:287
+msgid ""
+"_: Preferred address\n"
+"Preferred"
+msgstr ""
+
+#: kabc/address.cpp:291
+msgid "Domestic"
+msgstr ""
+
+#: kabc/address.cpp:294
+msgid "International"
+msgstr ""
+
+#: kabc/address.cpp:297
+msgid "Postal"
+msgstr ""
+
+#: kabc/address.cpp:300
+msgid "Parcel"
+msgstr ""
+
+#: kabc/address.cpp:303
+msgid ""
+"_: Home Address\n"
+"Home"
+msgstr ""
+
+#: kabc/address.cpp:306
+msgid ""
+"_: Work Address\n"
+"Work"
+msgstr ""
+
+#: kabc/address.cpp:309
+msgid "Preferred Address"
+msgstr ""
+
+#: kabc/resource.cpp:332
+msgid "Loading resource '%1' failed!"
+msgstr ""
+
+#: kabc/resource.cpp:343
+msgid "Saving resource '%1' failed!"
+msgstr ""
+
+#: kabc/distributionlistdialog.cpp:44
+msgid "Configure Distribution Lists"
+msgstr ""
+
+#: kabc/distributionlistdialog.cpp:152
+msgid "New List..."
+msgstr ""
+
+#: kabc/distributionlistdialog.cpp:156
+msgid "Rename List..."
+msgstr ""
+
+#: kabc/distributionlistdialog.cpp:167
+msgid "Available addresses:"
+msgstr ""
+
+#: kabc/distributionlistdialog.cpp:198
+msgid "Change Email..."
+msgstr ""
+
+#: kabc/distributionlistdialog.cpp:238
+msgid "Please enter &name:"
+msgstr ""
+
+#: kabc/distributionlistdialog.cpp:255
+msgid "Distribution List"
+msgstr ""
+
+#: kabc/distributionlistdialog.cpp:256
+msgid "Please change &name:"
+msgstr ""
+
+#: kabc/distributionlistdialog.cpp:273
+msgid "Delete distribution list '%1'?"
+msgstr ""
+
+#: kabc/distributionlistdialog.cpp:339
+msgid "Selected addressees:"
+msgstr ""
+
+#: kabc/distributionlistdialog.cpp:341
+msgid "Selected addresses in '%1':"
+msgstr ""
+
+#: kabc/stdaddressbook.cpp:148
+msgid "Unable to save to resource '%1'. It is locked."
+msgstr ""
+
+#: kabc/errorhandler.cpp:42
+msgid "Error in libkabc"
+msgstr ""
+
+#: kabc/key.cpp:127
+msgid "X509"
+msgstr ""
+
+#: kabc/key.cpp:130
+msgid "PGP"
+msgstr ""
+
+#: kab/addressbook.cc:335 kabc/field.cpp:214 kabc/key.cpp:133
+#: kabc/scripts/field.src.cpp:110 obj-x86_64-linux-gnu/kabc/field.cpp:214
+msgid "Custom"
+msgstr ""
+
+#: kabc/key.cpp:136 kabc/secrecy.cpp:80
+msgid "Unknown type"
+msgstr ""
+
+#: kabc/formatfactory.cpp:55 kabc/formatfactory.cpp:119
+msgid "vCard"
+msgstr ""
+
+#: kabc/formatfactory.cpp:56 kabc/formatfactory.cpp:120
+msgid "vCard Format"
+msgstr ""
+
+#: kabc/formatfactory.cpp:75
+msgid "No description available."
+msgstr ""
+
+#: kabc/secrecy.cpp:71
+msgid "Public"
+msgstr ""
+
+#: kab/addressbook.cc:1950 kabc/secrecy.cpp:74
+msgid "Private"
+msgstr ""
+
+#: kabc/secrecy.cpp:77
+msgid "Confidential"
+msgstr ""
+
+#: kabc/addressbook.cpp:346 kabc/addressbook.cpp:365
+msgid "Unable to load resource '%1'"
+msgstr ""
+
+#: kabc/ldifconverter.cpp:469
+msgid "List of Emails"
+msgstr ""
+
+#: kabc/locknull.cpp:60
+msgid "LockNull: All locks succeed but no actual locking is done."
+msgstr ""
+
+#: kabc/locknull.cpp:62
+msgid "LockNull: All locks fail."
+msgstr ""
+
+#: kabc/lock.cpp:93
+msgid "Unable to open lock file."
+msgstr ""
+
+#: kabc/lock.cpp:106
+msgid ""
+"The address book '%1' is locked by application '%2'.\n"
+"If you believe this is incorrect, just remove the lock file from '%3'"
+msgstr ""
+
+#: kabc/lock.cpp:146
+msgid "Unlock failed. Lock file is owned by other process: %1 (%2)"
+msgstr ""
+
+#: kabc/addresseedialog.cpp:60
+msgid "Select Addressee"
+msgstr ""
+
+#: kabc/addresseedialog.cpp:95
+msgid "Selected"
+msgstr ""
+
+#: kabc/addresseedialog.cpp:107
+msgid "Unselect"
+msgstr ""
+
+#: kabc/addressee.cpp:311 kabc/scripts/addressee.src.cpp:180
+#: obj-x86_64-linux-gnu/kabc/addressee.cpp:311
+msgid "Unique Identifier"
+msgstr ""
+
+#: kab/addressbook.cc:271 kabc/addressee.cpp:348
+#: obj-x86_64-linux-gnu/kabc/addressee.cpp:348
+msgid "Formatted Name"
+msgstr ""
+
+#: kabc/addressee.cpp:367 obj-x86_64-linux-gnu/kabc/addressee.cpp:367
+msgid "Family Name"
+msgstr ""
+
+#: kabc/addressee.cpp:386 obj-x86_64-linux-gnu/kabc/addressee.cpp:386
+msgid "Given Name"
+msgstr ""
+
+#: kabc/addressee.cpp:405 obj-x86_64-linux-gnu/kabc/addressee.cpp:405
+msgid "Additional Names"
+msgstr ""
+
+#: kabc/addressee.cpp:424 obj-x86_64-linux-gnu/kabc/addressee.cpp:424
+msgid "Honorific Prefixes"
+msgstr ""
+
+#: kabc/addressee.cpp:443 obj-x86_64-linux-gnu/kabc/addressee.cpp:443
+msgid "Honorific Suffixes"
+msgstr ""
+
+#: kabc/addressee.cpp:462 obj-x86_64-linux-gnu/kabc/addressee.cpp:462
+msgid "Nick Name"
+msgstr ""
+
+#: kab/addressbook.cc:291 kabc/addressee.cpp:481
+#: obj-x86_64-linux-gnu/kabc/addressee.cpp:481
+msgid "Birthday"
+msgstr ""
+
+#: kabc/addressee.cpp:487 obj-x86_64-linux-gnu/kabc/addressee.cpp:487
+msgid "Home Address Street"
+msgstr ""
+
+#: kabc/addressee.cpp:493 obj-x86_64-linux-gnu/kabc/addressee.cpp:493
+msgid "Home Address City"
+msgstr ""
+
+#: kabc/addressee.cpp:499 obj-x86_64-linux-gnu/kabc/addressee.cpp:499
+msgid "Home Address State"
+msgstr ""
+
+#: kabc/addressee.cpp:505 obj-x86_64-linux-gnu/kabc/addressee.cpp:505
+msgid "Home Address Zip Code"
+msgstr ""
+
+#: kabc/addressee.cpp:511 obj-x86_64-linux-gnu/kabc/addressee.cpp:511
+msgid "Home Address Country"
+msgstr ""
+
+#: kabc/addressee.cpp:517 obj-x86_64-linux-gnu/kabc/addressee.cpp:517
+msgid "Home Address Label"
+msgstr ""
+
+#: kabc/addressee.cpp:523 obj-x86_64-linux-gnu/kabc/addressee.cpp:523
+msgid "Business Address Street"
+msgstr ""
+
+#: kabc/addressee.cpp:529 obj-x86_64-linux-gnu/kabc/addressee.cpp:529
+msgid "Business Address City"
+msgstr ""
+
+#: kabc/addressee.cpp:535 obj-x86_64-linux-gnu/kabc/addressee.cpp:535
+msgid "Business Address State"
+msgstr ""
+
+#: kabc/addressee.cpp:541 obj-x86_64-linux-gnu/kabc/addressee.cpp:541
+msgid "Business Address Zip Code"
+msgstr ""
+
+#: kabc/addressee.cpp:547 obj-x86_64-linux-gnu/kabc/addressee.cpp:547
+msgid "Business Address Country"
+msgstr ""
+
+#: kabc/addressee.cpp:553 obj-x86_64-linux-gnu/kabc/addressee.cpp:553
+msgid "Business Address Label"
+msgstr ""
+
+#: kabc/addressee.cpp:559 obj-x86_64-linux-gnu/kabc/addressee.cpp:559
+msgid "Home Phone"
+msgstr ""
+
+#: kabc/addressee.cpp:565 obj-x86_64-linux-gnu/kabc/addressee.cpp:565
+msgid "Business Phone"
+msgstr ""
+
+#: kabc/addressee.cpp:571 obj-x86_64-linux-gnu/kabc/addressee.cpp:571
+msgid "Mobile Phone"
+msgstr ""
+
+#: kabc/addressee.cpp:583 obj-x86_64-linux-gnu/kabc/addressee.cpp:583
+msgid "Business Fax"
+msgstr ""
+
+#: kabc/addressee.cpp:589 obj-x86_64-linux-gnu/kabc/addressee.cpp:589
+msgid "Car Phone"
+msgstr ""
+
+#: kabc/addressee.cpp:607 obj-x86_64-linux-gnu/kabc/addressee.cpp:607
+msgid "Email Address"
+msgstr ""
+
+#: kabc/addressee.cpp:626 obj-x86_64-linux-gnu/kabc/addressee.cpp:626
+msgid "Mail Client"
+msgstr ""
+
+#: kabc/addressee.cpp:645 obj-x86_64-linux-gnu/kabc/addressee.cpp:645
+msgid "Time Zone"
+msgstr ""
+
+#: kabc/addressee.cpp:664 obj-x86_64-linux-gnu/kabc/addressee.cpp:664
+msgid "Geographic Position"
+msgstr ""
+
+#: kab/addressbook.cc:263 kabc/addressee.cpp:683
+#: obj-x86_64-linux-gnu/kabc/addressee.cpp:683
+msgid ""
+"_: person\n"
+"Title"
+msgstr ""
+
+#: kabc/addressee.cpp:702 obj-x86_64-linux-gnu/kabc/addressee.cpp:702
+msgid ""
+"_: person in organization\n"
+"Role"
+msgstr ""
+
+#: kab/addressbook.cc:176 kabc/addressee.cpp:721 kabc/field.cpp:212
+#: kabc/scripts/field.src.cpp:108 obj-x86_64-linux-gnu/kabc/addressee.cpp:721
+#: obj-x86_64-linux-gnu/kabc/field.cpp:212
+msgid "Organization"
+msgstr ""
+
+#: kabc/addressee.cpp:740 obj-x86_64-linux-gnu/kabc/addressee.cpp:740
+msgid "Note"
+msgstr ""
+
+#: kabc/addressee.cpp:759 obj-x86_64-linux-gnu/kabc/addressee.cpp:759
+msgid "Product Identifier"
+msgstr ""
+
+#: kabc/addressee.cpp:778 obj-x86_64-linux-gnu/kabc/addressee.cpp:778
+msgid "Revision Date"
+msgstr ""
+
+#: kabc/addressee.cpp:797 obj-x86_64-linux-gnu/kabc/addressee.cpp:797
+msgid "Sort String"
+msgstr ""
+
+#: kabc/addressee.cpp:816 kdeui/kaboutdialog.cpp:92
+#: obj-x86_64-linux-gnu/kabc/addressee.cpp:816
+msgid "Homepage"
+msgstr ""
+
+#: kabc/addressee.cpp:835 obj-x86_64-linux-gnu/kabc/addressee.cpp:835
+msgid "Security Class"
+msgstr ""
+
+#: kabc/addressee.cpp:854 obj-x86_64-linux-gnu/kabc/addressee.cpp:854
+msgid "Logo"
+msgstr ""
+
+#: kabc/addressee.cpp:873 obj-x86_64-linux-gnu/kabc/addressee.cpp:873
+msgid "Photo"
+msgstr ""
+
+#: kabc/addressee.cpp:892 obj-x86_64-linux-gnu/kabc/addressee.cpp:892
+msgid "Sound"
+msgstr ""
+
+#: kabc/addressee.cpp:911 obj-x86_64-linux-gnu/kabc/addressee.cpp:911
+msgid "Agent"
+msgstr ""
+
+#: kabc/field.cpp:189 kabc/scripts/field.src.cpp:85
+#: obj-x86_64-linux-gnu/kabc/field.cpp:189
+msgid "Unknown Field"
+msgstr ""
+
+#: kabc/field.cpp:202 kabc/scripts/field.src.cpp:98
+#: obj-x86_64-linux-gnu/kabc/field.cpp:202
+msgid "All"
+msgstr ""
+
+#: kabc/field.cpp:204 kabc/scripts/field.src.cpp:100
+#: obj-x86_64-linux-gnu/kabc/field.cpp:204
+msgid "Frequent"
+msgstr ""
+
+#: kab/addressbook.cc:192 kabc/field.cpp:206 kabc/scripts/field.src.cpp:102
+#: obj-x86_64-linux-gnu/kabc/field.cpp:206
+msgid ""
+"_: street/postal\n"
+"Address"
+msgstr ""
+
+#: kabc/field.cpp:210 kabc/scripts/field.src.cpp:106
+#: obj-x86_64-linux-gnu/kabc/field.cpp:210
+msgid "Personal"
+msgstr ""
+
+#: kabc/field.cpp:216 kabc/scripts/field.src.cpp:112
+#: obj-x86_64-linux-gnu/kabc/field.cpp:216
+msgid "Undefined"
+msgstr ""
+
+#: kabc/vcardparser/testread.cpp:38
+msgid "vCard 2.1"
+msgstr ""
+
+#: kabc/vcard/testwrite.cpp:11
+msgid "TestWritevCard"
+msgstr ""
+
+#: kmdi/kmdichildfrmcaption.cpp:71 kmdi/kmdichildview.cpp:63
+#: kmdi/kmdichildview.cpp:89
+msgid "Unnamed"
+msgstr ""
+
+#: kmdi/kmdimainfrm.cpp:979
+msgid "Window"
+msgstr ""
+
+#: kmdi/kmdimainfrm.cpp:992
+msgid "Undock"
+msgstr ""
+
+#: kmdi/kmdimainfrm.cpp:1002
+msgid "Dock"
+msgstr ""
+
+#: kmdi/kmdimainfrm.cpp:1007
+msgid "Operations"
+msgstr ""
+
+#: kmdi/kmdimainfrm.cpp:2577
+msgid "Close &All"
+msgstr ""
+
+#: kmdi/kmdimainfrm.cpp:2586
+msgid "&Minimize All"
+msgstr ""
+
+#: kmdi/kmdimainfrm.cpp:2592
+msgid "&MDI Mode"
+msgstr ""
+
+#: kmdi/kmdiguiclient.cpp:144 kmdi/kmdimainfrm.cpp:2594
+msgid "&Toplevel Mode"
+msgstr ""
+
+#: kmdi/kmdiguiclient.cpp:144 kmdi/kmdimainfrm.cpp:2595
+msgid "C&hildframe Mode"
+msgstr ""
+
+#: kmdi/kmdiguiclient.cpp:144 kmdi/kmdimainfrm.cpp:2596
+msgid "Ta&b Page Mode"
+msgstr ""
+
+#: kmdi/kmdiguiclient.cpp:144 kmdi/kmdimainfrm.cpp:2597
+msgid "I&DEAl Mode"
+msgstr ""
+
+#: kmdi/kmdimainfrm.cpp:2619
+msgid "&Tile"
+msgstr ""
+
+#: kmdi/kmdimainfrm.cpp:2621
+msgid "Ca&scade Windows"
+msgstr ""
+
+#: kmdi/kmdimainfrm.cpp:2622
+msgid "Cascade &Maximized"
+msgstr ""
+
+#: kmdi/kmdimainfrm.cpp:2623
+msgid "Expand &Vertically"
+msgstr ""
+
+#: kmdi/kmdimainfrm.cpp:2624
+msgid "Expand &Horizontally"
+msgstr ""
+
+#: kmdi/kmdimainfrm.cpp:2625
+msgid "Tile &Non-Overlapped"
+msgstr ""
+
+#: kmdi/kmdimainfrm.cpp:2626
+msgid "Tile Overla&pped"
+msgstr ""
+
+#: kmdi/kmdimainfrm.cpp:2627
+msgid "Tile V&ertically"
+msgstr ""
+
+#: kmdi/kmdimainfrm.cpp:2633
+msgid "&Dock/Undock"
+msgstr ""
+
+#: kmdi/kmdi/dockcontainer.cpp:196 kmdi/kmdidockcontainer.cpp:218
+msgid ""
+"_: Switch between overlap and side by side mode\n"
+"Overlap"
+msgstr ""
+
+#: kmdi/kmdi/guiclient.cpp:79 kmdi/kmdiguiclient.cpp:139
+msgid "Tool &Views"
+msgstr ""
+
+#: kmdi/kmdiguiclient.cpp:142
+msgid "MDI Mode"
+msgstr ""
+
+#: kmdi/kmdi/guiclient.cpp:81 kmdi/kmdiguiclient.cpp:154
+msgid "Tool &Docks"
+msgstr ""
+
+#: kmdi/kmdi/guiclient.cpp:82 kmdi/kmdiguiclient.cpp:155
+msgid "Switch Top Dock"
+msgstr ""
+
+#: kmdi/kmdi/guiclient.cpp:84 kmdi/kmdiguiclient.cpp:157
+msgid "Switch Left Dock"
+msgstr ""
+
+#: kmdi/kmdi/guiclient.cpp:86 kmdi/kmdiguiclient.cpp:159
+msgid "Switch Right Dock"
+msgstr ""
+
+#: kmdi/kmdi/guiclient.cpp:88 kmdi/kmdiguiclient.cpp:161
+msgid "Switch Bottom Dock"
+msgstr ""
+
+#: kmdi/kmdi/guiclient.cpp:91 kmdi/kmdiguiclient.cpp:164
+msgid "Previous Tool View"
+msgstr ""
+
+#: kmdi/kmdi/guiclient.cpp:93 kmdi/kmdiguiclient.cpp:166
+msgid "Next Tool View"
+msgstr ""
+
+#: kdeui/kdockwidget.cpp:2945 kmdi/kmdi/guiclient.cpp:148
+#: kmdi/kmdiguiclient.cpp:260
+#, c-format
+msgid "Show %1"
+msgstr ""
+
+#: kdeui/kdockwidget.cpp:2939 kmdi/kmdi/guiclient.cpp:152
+#: kmdi/kmdiguiclient.cpp:265
+#, c-format
+msgid "Hide %1"
+msgstr ""
+
+#: kmdi/kmdichildfrm.cpp:1239
+msgid "R&esize"
+msgstr ""
+
+#: kmdi/kmdichildfrm.cpp:1240
+msgid "M&inimize"
+msgstr ""
+
+#: kmdi/kmdichildfrm.cpp:1241
+msgid "M&aximize"
+msgstr ""
+
+#: kmdi/kmdichildfrm.cpp:1261
+msgid "&Maximize"
+msgstr ""
+
+#: kdeui/ksystemtray.cpp:155 kmdi/kmdichildfrm.cpp:1263
+msgid "&Minimize"
+msgstr ""
+
+#: kmdi/kmdichildfrm.cpp:1265
+msgid "M&ove"
+msgstr ""
+
+#: kmdi/kmdichildfrm.cpp:1267
+msgid "&Resize"
+msgstr ""
+
+#: kmdi/kmdichildfrm.cpp:1270
+msgid "&Undock"
+msgstr ""
+
+#: knewstuff/engine.cpp:218
+msgid "Successfully installed hot new stuff."
+msgstr ""
+
+#: knewstuff/engine.cpp:223
+msgid "Failed to install hot new stuff."
+msgstr ""
+
+#: knewstuff/engine.cpp:278
+msgid "Unable to create file to upload."
+msgstr ""
+
+#: knewstuff/engine.cpp:293
+msgid "The files to be uploaded have been created at:\n"
+msgstr ""
+
+#: knewstuff/engine.cpp:294
+msgid "Data file: %1\n"
+msgstr ""
+
+#: knewstuff/engine.cpp:296
+msgid "Preview image: %1\n"
+msgstr ""
+
+#: knewstuff/engine.cpp:298
+msgid "Content information: %1\n"
+msgstr ""
+
+#: knewstuff/engine.cpp:299
+msgid "Those files can now be uploaded.\n"
+msgstr ""
+
+#: knewstuff/engine.cpp:300
+msgid "Beware that any people might have access to them at any time."
+msgstr ""
+
+#: knewstuff/engine.cpp:302
+msgid "Upload Files"
+msgstr ""
+
+#: knewstuff/engine.cpp:307
+msgid "Please upload the files manually."
+msgstr ""
+
+#: knewstuff/engine.cpp:311
+msgid "Upload Info"
+msgstr ""
+
+#: knewstuff/engine.cpp:319
+msgid "&Upload"
+msgstr ""
+
+#: knewstuff/engine.cpp:421
+msgid "Successfully uploaded new stuff."
+msgstr ""
+
+#: knewstuff/knewstuff.cpp:38 knewstuff/knewstuffbutton.cpp:61
+#, c-format
+msgid "Download New %1"
+msgstr ""
+
+#: knewstuff/uploaddialog.cpp:47
+msgid "Share Hot New Stuff"
+msgstr ""
+
+#: knewstuff/uploaddialog.cpp:63
+msgid "Author:"
+msgstr ""
+
+#: knewstuff/uploaddialog.cpp:68
+msgid "Email:"
+msgstr ""
+
+#: kdeui/kbugreport.cpp:174 knewstuff/uploaddialog.cpp:73
+msgid "Version:"
+msgstr ""
+
+#: knewstuff/uploaddialog.cpp:78
+msgid "Release:"
+msgstr ""
+
+#: knewstuff/uploaddialog.cpp:84
+msgid "License:"
+msgstr ""
+
+#: knewstuff/uploaddialog.cpp:88
+msgid "GPL"
+msgstr ""
+
+#: knewstuff/uploaddialog.cpp:89
+msgid "LGPL"
+msgstr ""
+
+#: knewstuff/uploaddialog.cpp:90
+msgid "BSD"
+msgstr ""
+
+#: knewstuff/uploaddialog.cpp:93
+msgid "Language:"
+msgstr ""
+
+#: knewstuff/uploaddialog.cpp:99
+msgid "Preview URL:"
+msgstr ""
+
+#: knewstuff/uploaddialog.cpp:104
+msgid "Summary:"
+msgstr ""
+
+#: knewstuff/uploaddialog.cpp:121
+msgid "Please put in a name."
+msgstr ""
+
+#: knewstuff/uploaddialog.cpp:191
+msgid "Old upload information found, fill out fields?"
+msgstr ""
+
+#: knewstuff/uploaddialog.cpp:191
+msgid "Fill Out"
+msgstr ""
+
+#: knewstuff/uploaddialog.cpp:191
+msgid "Do Not Fill Out"
+msgstr ""
+
+#: knewstuff/khotnewstuff.cpp:31
+msgid "Display only media of this type"
+msgstr ""
+
+#: knewstuff/khotnewstuff.cpp:32
+msgid "Provider list to use"
+msgstr ""
+
+#: knewstuff/knewstuffsecure.cpp:83
+msgid ""
+"There was an error with the downloaded resource tarball file. Possible "
+"causes are damaged archive or invalid directory structure in the archive."
+msgstr ""
+
+#: knewstuff/knewstuffsecure.cpp:83
+msgid "Resource Installation Error"
+msgstr ""
+
+#: knewstuff/knewstuffsecure.cpp:94
+msgid "No keys were found."
+msgstr ""
+
+#: knewstuff/knewstuffsecure.cpp:99
+msgid "The validation failed for unknown reason."
+msgstr ""
+
+#: knewstuff/knewstuffsecure.cpp:106
+msgid "The MD5SUM check failed, the archive might be broken."
+msgstr ""
+
+#: knewstuff/knewstuffsecure.cpp:111
+msgid "The signature is bad, the archive might be broken or altered."
+msgstr ""
+
+#: knewstuff/knewstuffsecure.cpp:121
+msgid "The signature is valid, but untrusted."
+msgstr ""
+
+#: knewstuff/knewstuffsecure.cpp:127
+msgid "The signature is unknown."
+msgstr ""
+
+#: knewstuff/knewstuffsecure.cpp:131
+msgid ""
+"The resource was signed with key <i>0x%1</i>, belonging to <i>%2 "
+"&lt;%3&gt;</i>."
+msgstr ""
+
+#: knewstuff/knewstuffsecure.cpp:137
+msgid ""
+"<qt>There is a problem with the resource file you have downloaded. The "
+"errors are :<b>%1</b><br>%2<br><br>Installation of the resource is <b>not "
+"recommended</b>.<br><br>Do you want to proceed with the installation?</qt>"
+msgstr ""
+
+#: knewstuff/knewstuffsecure.cpp:137
+msgid "Problematic Resource File"
+msgstr ""
+
+#: knewstuff/knewstuffsecure.cpp:140
+msgid "<qt>%1<br><br>Press OK to install it.</qt>"
+msgstr ""
+
+#: knewstuff/knewstuffsecure.cpp:140
+msgid "Valid Resource"
+msgstr ""
+
+#: knewstuff/knewstuffsecure.cpp:190
+msgid "The signing failed for unknown reason."
+msgstr ""
+
+#: knewstuff/knewstuffsecure.cpp:195
+msgid ""
+"There are no keys usable for signing or you did not entered the correct "
+"passphrase.\n"
+"Proceed without signing the resource?"
+msgstr ""
+
+#: knewstuff/knewstuffgeneric.cpp:139
+msgid "The file '%1' already exists. Do you want to overwrite it?"
+msgstr ""
+
+#: khtml/khtml_ext.cpp:828 knewstuff/knewstuffgeneric.cpp:141
+msgid "Overwrite"
+msgstr ""
+
+#: knewstuff/security.cpp:63
+msgid ""
+"<qt>Cannot start <i>gpg</i> and retrieve the available keys. Make sure that "
+"<i>gpg</i> is installed, otherwise verification of downloaded resources will "
+"not be possible.</qt>"
+msgstr ""
+
+#: knewstuff/security.cpp:177
+msgid ""
+"<qt>Enter passphrase for key <b>0x%1</b>, belonging "
+"to<br><i>%2&lt;%3&gt;</i>:</qt>"
+msgstr ""
+
+#: knewstuff/security.cpp:257
+msgid ""
+"<qt>Cannot start <i>gpg</i> and check the validity of the file. Make sure "
+"that <i>gpg</i> is installed, otherwise verification of downloaded resources "
+"will not be possible.</qt>"
+msgstr ""
+
+#: knewstuff/security.cpp:317
+msgid "Select Signing Key"
+msgstr ""
+
+#: knewstuff/security.cpp:317
+msgid "Key used for signing:"
+msgstr ""
+
+#: knewstuff/security.cpp:338
+msgid ""
+"<qt>Cannot start <i>gpg</i> and sign the file. Make sure that <i>gpg</i> is "
+"installed, otherwise signing of the resources will not be possible.</qt>"
+msgstr ""
+
+#: knewstuff/providerdialog.cpp:53
+msgid "Hot New Stuff Providers"
+msgstr ""
+
+#: knewstuff/providerdialog.cpp:61
+msgid "Please select one of the providers listed below:"
+msgstr ""
+
+#: knewstuff/providerdialog.cpp:88
+msgid "No provider selected."
+msgstr ""
+
+#: knewstuff/provider.cpp:270
+msgid "Error parsing providers list."
+msgstr ""
+
+#: knewstuff/ghns.cpp:50
+msgid "Get hot new stuff:"
+msgstr ""
+
+#: knewstuff/downloaddialog.cpp:101 knewstuff/downloaddialog.cpp:108
+#: knewstuff/downloaddialog.cpp:124 knewstuff/downloaddialog.cpp:131
+msgid "Get Hot New Stuff"
+msgstr ""
+
+#: knewstuff/downloaddialog.cpp:228
+msgid "Welcome"
+msgstr ""
+
+#: knewstuff/downloaddialog.cpp:259
+msgid "Highest Rated"
+msgstr ""
+
+#: knewstuff/downloaddialog.cpp:260
+msgid "Most Downloads"
+msgstr ""
+
+#: knewstuff/downloaddialog.cpp:261
+msgid "Latest"
+msgstr ""
+
+#: knewstuff/downloaddialog.cpp:271 knewstuff/downloaddialog.cpp:277
+#: knewstuff/downloaddialog.cpp:283
+msgid "Version"
+msgstr ""
+
+#: knewstuff/downloaddialog.cpp:272
+msgid "Rating"
+msgstr ""
+
+#: knewstuff/downloaddialog.cpp:278
+msgid "Downloads"
+msgstr ""
+
+#: knewstuff/downloaddialog.cpp:284
+msgid "Release Date"
+msgstr ""
+
+#: knewstuff/downloaddialog.cpp:294
+msgid "Install"
+msgstr ""
+
+#: kdeui/kmessagebox.cpp:246 knewstuff/downloaddialog.cpp:295
+#: knewstuff/downloaddialog.cpp:505
+msgid "Details"
+msgstr ""
+
+#: knewstuff/downloaddialog.cpp:477
+msgid ""
+"Name: %1\n"
+"Author: %2\n"
+"License: %3\n"
+"Version: %4\n"
+"Release: %5\n"
+"Rating: %6\n"
+"Downloads: %7\n"
+"Release date: %8\n"
+"Summary: %9\n"
+msgstr ""
+
+#: knewstuff/downloaddialog.cpp:499
+msgid ""
+"Preview: %1\n"
+"Payload: %2\n"
+msgstr ""
+
+#: knewstuff/downloaddialog.cpp:600
+msgid "Installation successful."
+msgstr ""
+
+#: knewstuff/downloaddialog.cpp:600 knewstuff/downloaddialog.cpp:602
+msgid "Installation"
+msgstr ""
+
+#: knewstuff/downloaddialog.cpp:602
+msgid "Installation failed."
+msgstr ""
+
+#: knewstuff/downloaddialog.cpp:696
+msgid "Preview not available."
+msgstr ""
+
+#: knewstuff/knewstuffbutton.cpp:49
+msgid "Download New Stuff"
+msgstr ""
+
+#: kjs/internal.cpp:135
+msgid "Undefined value"
+msgstr ""
+
+#: kjs/internal.cpp:166
+msgid "Null value"
+msgstr ""
+
+#: kjs/function_object.cpp:290
+msgid "Syntax error in parameter list"
+msgstr ""
+
+#: kjs/reference.cpp:96
+msgid "Invalid reference base"
+msgstr ""
+
+#: kjs/reference.cpp:127
+msgid "Can't find variable: "
+msgstr ""
+
+#: kjs/reference.cpp:134
+msgid "Base is not an object"
+msgstr ""
+
+#: kjs/object.cpp:349
+msgid "No default value"
+msgstr ""
+
+#: kjs/object.cpp:494
+msgid "Evaluation error"
+msgstr ""
+
+#: kjs/object.cpp:495
+msgid "Range error"
+msgstr ""
+
+#: kjs/object.cpp:496
+msgid "Reference error"
+msgstr ""
+
+#: kjs/object.cpp:497
+msgid "Syntax error"
+msgstr ""
+
+#: kjs/object.cpp:498
+msgid "Type error"
+msgstr ""
+
+#: kjs/object.cpp:499
+msgid "URI error"
+msgstr ""
+
+#: khtml/khtml_printsettings.cpp:31
+msgid ""
+"<qt><p><strong>'Print images'</strong></p><p>If this checkbox is enabled, "
+"images contained in the HTML page will be printed. Printing may take longer "
+"and use more ink or toner.</p><p>If this checkbox is disabled, only the text "
+"of the HTML page will be printed, without the included images. Printing will "
+"be faster and use less ink or toner.</p> </qt>"
+msgstr ""
+
+#: khtml/khtml_printsettings.cpp:43
+msgid ""
+"<qt><p><strong>'Print header'</strong></p><p>If this checkbox is enabled, "
+"the printout of the HTML document will contain a header line at the top of "
+"each page. This header contains the current date, the location URL of the "
+"printed page and the page number.</p><p>If this checkbox is disabled, the "
+"printout of the HTML document will not contain such a header line.</p> </qt>"
+msgstr ""
+
+#: khtml/khtml_printsettings.cpp:56
+msgid ""
+"<qt><p><strong>'Printerfriendly mode'</strong></p><p>If this checkbox is "
+"enabled, the printout of the HTML document will be black and white only, and "
+"all colored background will be converted into white. Printout will be faster "
+"and use less ink or toner.</p><p>If this checkbox is disabled, the printout "
+"of the HTML document will happen in the original color settings as you see "
+"in your application. This may result in areas of full-page color (or "
+"grayscale, if you use a black+white printer). Printout will possibly happen "
+"slower and will certainly use much more toner or ink.</p> </qt>"
+msgstr ""
+
+#: khtml/khtml_printsettings.cpp:71
+msgid "HTML Settings"
+msgstr ""
+
+#: khtml/khtml_printsettings.cpp:73
+msgid "Printer friendly mode (black text, no background)"
+msgstr ""
+
+#: khtml/khtml_printsettings.cpp:76
+msgid "Print images"
+msgstr ""
+
+#: khtml/khtml_printsettings.cpp:79
+msgid "Print header"
+msgstr ""
+
+#: khtml/khtmlimage.cpp:199
+msgid "%1 (%2 - %3x%4 Pixels)"
+msgstr ""
+
+#: khtml/khtmlimage.cpp:201
+msgid "%1 - %2x%3 Pixels"
+msgstr ""
+
+#: khtml/khtmlimage.cpp:206
+msgid "%1 (%2x%3 Pixels)"
+msgstr ""
+
+#: khtml/khtmlimage.cpp:208
+msgid "Image - %1x%2 Pixels"
+msgstr ""
+
+#: khtml/khtmlimage.cpp:214
+msgid "Done."
+msgstr ""
+
+#: khtml/khtml_factory.cpp:177
+msgid "KHTML"
+msgstr ""
+
+#: khtml/khtml_factory.cpp:178
+msgid "Embeddable HTML component"
+msgstr ""
+
+#: khtml/khtmlview.cpp:1618
+msgid "Find stopped."
+msgstr ""
+
+#: khtml/khtmlview.cpp:1629
+msgid "Starting -- find links as you type"
+msgstr ""
+
+#: khtml/khtmlview.cpp:1635
+msgid "Starting -- find text as you type"
+msgstr ""
+
+#: khtml/khtmlview.cpp:1656
+msgid "Link found: \"%1\"."
+msgstr ""
+
+#: khtml/khtmlview.cpp:1661
+msgid "Link not found: \"%1\"."
+msgstr ""
+
+#: khtml/khtmlview.cpp:1669
+msgid "Text found: \"%1\"."
+msgstr ""
+
+#: khtml/khtmlview.cpp:1674
+msgid "Text not found: \"%1\"."
+msgstr ""
+
+#: khtml/khtmlview.cpp:1718
+msgid "Access Keys activated"
+msgstr ""
+
+#: khtml/html/html_formimpl.cpp:1521 khtml/html/html_formimpl.cpp:2127
+#: khtml/khtml_part.cpp:4821 khtml/khtmlview.cpp:2520 khtml/khtmlview.cpp:2562
+msgid "Submit"
+msgstr ""
+
+#: kdeui/kedittoolbar.cpp:447 khtml/html/html_formimpl.cpp:2119
+#: khtml/khtmlview.cpp:2534 khtml/khtmlview.cpp:2567
+msgid "Reset"
+msgstr ""
+
+#: khtml/khtmlview.cpp:2749
+#, c-format
+msgid "Print %1"
+msgstr ""
+
+#: khtml/khtml_part.cpp:255
+msgid "View Do&cument Source"
+msgstr ""
+
+#: khtml/khtml_ext.cpp:564 khtml/khtml_part.cpp:256
+msgid "View Frame Source"
+msgstr ""
+
+#: khtml/khtml_part.cpp:257
+msgid "View Document Information"
+msgstr ""
+
+#: khtml/khtml_part.cpp:258
+msgid "Save &Background Image As..."
+msgstr ""
+
+#: khtml/khtml_ext.cpp:571 khtml/khtml_part.cpp:262
+msgid "Save &Frame As..."
+msgstr ""
+
+#: khtml/khtml_part.cpp:263
+msgid "Security..."
+msgstr ""
+
+#: khtml/khtml_part.cpp:264
+msgid ""
+"Security Settings<p>Shows the certificate of the displayed page. Only pages "
+"that have been transmitted using a secure, encrypted connection have a "
+"certificate.<p> Hint: If the image shows a closed lock, the page has been "
+"transmitted over a secure connection."
+msgstr ""
+
+#: khtml/khtml_part.cpp:270
+msgid "Print Rendering Tree to STDOUT"
+msgstr ""
+
+#: khtml/khtml_part.cpp:271
+msgid "Print DOM Tree to STDOUT"
+msgstr ""
+
+#: khtml/khtml_part.cpp:272
+msgid "Stop Animated Images"
+msgstr ""
+
+#: khtml/khtml_part.cpp:274
+msgid "Set &Encoding"
+msgstr ""
+
+#: khtml/khtml_part.cpp:279
+msgid "Semi-Automatic"
+msgstr ""
+
+#: kdecore/kcharsets.cpp:44 khtml/khtml_part.cpp:280
+msgid "Arabic"
+msgstr ""
+
+#: kdecore/kcharsets.cpp:45 khtml/khtml_part.cpp:281
+msgid "Baltic"
+msgstr ""
+
+#: kdecore/kcharsets.cpp:46 khtml/khtml_part.cpp:282
+msgid "Central European"
+msgstr ""
+
+#: kdecore/kcharsets.cpp:50 khtml/khtml_part.cpp:284
+msgid "Greek"
+msgstr ""
+
+#: kdecore/kcharsets.cpp:51 kdeui/ksconfig.cpp:235 kdeui/ksconfig.cpp:395
+#: kdeui/ksconfig.cpp:650 khtml/khtml_part.cpp:285
+msgid "Hebrew"
+msgstr ""
+
+#: kdecore/kcharsets.cpp:52 khtml/khtml_part.cpp:286
+msgid "Japanese"
+msgstr ""
+
+#: kdeui/ksconfig.cpp:324 khtml/khtml_part.cpp:288
+msgid "Russian"
+msgstr ""
+
+#: kdecore/kcharsets.cpp:55 kdeui/ksconfig.cpp:240 kdeui/ksconfig.cpp:400
+#: kdeui/ksconfig.cpp:655 khtml/khtml_part.cpp:290
+msgid "Turkish"
+msgstr ""
+
+#: kdeui/ksconfig.cpp:342 khtml/khtml_part.cpp:291
+msgid "Ukrainian"
+msgstr ""
+
+#: kdecore/kcharsets.cpp:56 khtml/khtml_part.cpp:293
+msgid "Western European"
+msgstr ""
+
+#: khtml/khtml_part.cpp:297 khtml/khtml_part.cpp:2298
+msgid "Automatic Detection"
+msgstr ""
+
+#: khtml/khtml_part.cpp:302
+msgid ""
+"_: short for Manual Detection\n"
+"Manual"
+msgstr ""
+
+#: khtml/khtml_part.cpp:357
+msgid "Use S&tylesheet"
+msgstr ""
+
+#: khtml/khtml_part.cpp:361
+msgid "Enlarge Font"
+msgstr ""
+
+#: khtml/khtml_part.cpp:363
+msgid ""
+"Enlarge Font<p>Make the font in this window bigger. Click and hold down the "
+"mouse button for a menu with all available font sizes."
+msgstr ""
+
+#: khtml/khtml_part.cpp:367
+msgid "Shrink Font"
+msgstr ""
+
+#: khtml/khtml_part.cpp:369
+msgid ""
+"Shrink Font<p>Make the font in this window smaller. Click and hold down the "
+"mouse button for a menu with all available font sizes."
+msgstr ""
+
+#: khtml/khtml_part.cpp:375
+msgid ""
+"Find text<p>Shows a dialog that allows you to find text on the displayed "
+"page."
+msgstr ""
+
+#: khtml/khtml_part.cpp:379
+msgid ""
+"Find next<p>Find the next occurrence of the text that you have found using "
+"the <b>Find Text</b> function"
+msgstr ""
+
+#: khtml/khtml_part.cpp:384
+msgid ""
+"Find previous<p>Find the previous occurrence of the text that you have found "
+"using the <b>Find Text</b> function"
+msgstr ""
+
+#: khtml/khtml_part.cpp:388
+msgid "Find Text as You Type"
+msgstr ""
+
+#: khtml/khtml_part.cpp:390
+msgid "Find Links as You Type"
+msgstr ""
+
+#: khtml/khtml_ext.cpp:570 khtml/khtml_part.cpp:404
+msgid "Print Frame..."
+msgstr ""
+
+#: khtml/khtml_part.cpp:405
+msgid ""
+"Print Frame<p>Some pages have several frames. To print only a single frame, "
+"click on it and then use this function."
+msgstr ""
+
+#: khtml/khtml_part.cpp:413
+msgid "Toggle Caret Mode"
+msgstr ""
+
+#: khtml/khtml_part.cpp:618
+msgid "The fake user-agent '%1' is in use."
+msgstr ""
+
+#: khtml/khtml_part.cpp:1081
+msgid "This web page contains coding errors."
+msgstr ""
+
+#: khtml/khtml_part.cpp:1123
+msgid "&Hide Errors"
+msgstr ""
+
+#: khtml/khtml_part.cpp:1124
+msgid "&Disable Error Reporting"
+msgstr ""
+
+#: khtml/khtml_part.cpp:1164
+msgid "<b>Error</b>: %1: %2"
+msgstr ""
+
+#: khtml/khtml_part.cpp:1208
+msgid "<b>Error</b>: node %1: %2"
+msgstr ""
+
+#: khtml/khtml_part.cpp:1351
+msgid "Display Images on Page"
+msgstr ""
+
+#: khtml/khtml_part.cpp:1539 khtml/khtml_part.cpp:1629
+msgid "Session is secured with %1 bit %2."
+msgstr ""
+
+#: khtml/khtml_part.cpp:1540 khtml/khtml_part.cpp:1631
+msgid "Session is not secured."
+msgstr ""
+
+#: khtml/khtml_part.cpp:1727
+#, c-format
+msgid "Error while loading %1"
+msgstr ""
+
+#: khtml/khtml_part.cpp:1729
+msgid "An error occurred while loading <B>%1</B>:"
+msgstr ""
+
+#: khtml/khtml_part.cpp:1764
+msgid "Error: "
+msgstr ""
+
+#: khtml/khtml_part.cpp:1767
+msgid "The requested operation could not be completed"
+msgstr ""
+
+#: khtml/khtml_part.cpp:1773
+msgid "Technical Reason: "
+msgstr ""
+
+#: khtml/khtml_part.cpp:1778
+msgid "Details of the Request:"
+msgstr ""
+
+#: khtml/khtml_part.cpp:1780
+#, c-format
+msgid "URL: %1"
+msgstr ""
+
+#: khtml/khtml_part.cpp:1787
+#, c-format
+msgid "Date and Time: %1"
+msgstr ""
+
+#: khtml/khtml_part.cpp:1789
+#, c-format
+msgid "Additional Information: %1"
+msgstr ""
+
+#: khtml/khtml_part.cpp:1791
+msgid "Description:"
+msgstr ""
+
+#: khtml/khtml_part.cpp:1797
+msgid "Possible Causes:"
+msgstr ""
+
+#: khtml/khtml_part.cpp:1804
+msgid "Possible Solutions:"
+msgstr ""
+
+#: khtml/khtml_part.cpp:2135
+msgid "Page loaded."
+msgstr ""
+
+#: khtml/khtml_part.cpp:2137
+msgid ""
+"_n: %n Image of %1 loaded.\n"
+"%n Images of %1 loaded."
+msgstr ""
+
+#: khtml/khtml_part.cpp:3737 khtml/khtml_part.cpp:3824
+#: khtml/khtml_part.cpp:3835
+msgid " (In new window)"
+msgstr ""
+
+#: khtml/khtml_part.cpp:3776
+msgid "Symbolic Link"
+msgstr ""
+
+#: khtml/khtml_part.cpp:3778
+msgid "%1 (Link)"
+msgstr ""
+
+#: khtml/khtml_part.cpp:3798
+msgid "%2 (%1 bytes)"
+msgstr ""
+
+#: khtml/khtml_part.cpp:3802
+msgid "%2 (%1 K)"
+msgstr ""
+
+#: khtml/khtml_part.cpp:3837
+msgid " (In other frame)"
+msgstr ""
+
+#: khtml/khtml_part.cpp:3842
+msgid "Email to: "
+msgstr ""
+
+#: khtml/khtml_part.cpp:3848
+msgid " - Subject: "
+msgstr ""
+
+#: khtml/khtml_part.cpp:3850
+msgid " - CC: "
+msgstr ""
+
+#: khtml/khtml_part.cpp:3852
+msgid " - BCC: "
+msgstr ""
+
+#: khtml/khtml_part.cpp:3941
+msgid ""
+"<qt>This untrusted page links to<BR><B>%1</B>.<BR>Do you want to follow the "
+"link?"
+msgstr ""
+
+#: khtml/khtml_part.cpp:3942
+msgid "Follow"
+msgstr ""
+
+#: khtml/khtml_part.cpp:4042
+msgid "Frame Information"
+msgstr ""
+
+#: khtml/khtml_part.cpp:4048
+msgid "   <a href=\"%1\">[Properties]</a>"
+msgstr ""
+
+#: khtml/khtml_part.cpp:4128
+msgid "Save Background Image As"
+msgstr ""
+
+#: khtml/khtml_part.cpp:4215
+msgid "Save Frame As"
+msgstr ""
+
+#: khtml/khtml_part.cpp:4255
+msgid "&Find in Frame..."
+msgstr ""
+
+#: khtml/khtml_part.cpp:4762
+msgid ""
+"Warning:  This is a secure form but it is attempting to send your data back "
+"unencrypted.\n"
+"A third party may be able to intercept and view this information.\n"
+"Are you sure you wish to continue?"
+msgstr ""
+
+#: khtml/khtml_part.cpp:4765 khtml/khtml_part.cpp:4774
+#: khtml/khtml_part.cpp:4798
+msgid "Network Transmission"
+msgstr ""
+
+#: khtml/khtml_part.cpp:4765 khtml/khtml_part.cpp:4775
+msgid "&Send Unencrypted"
+msgstr ""
+
+#: khtml/khtml_part.cpp:4772
+msgid ""
+"Warning: Your data is about to be transmitted across the network "
+"unencrypted.\n"
+"Are you sure you wish to continue?"
+msgstr ""
+
+#: khtml/khtml_part.cpp:4796
+msgid ""
+"This site is attempting to submit form data via email.\n"
+"Do you want to continue?"
+msgstr ""
+
+#: khtml/khtml_part.cpp:4799
+msgid "&Send Email"
+msgstr ""
+
+#: khtml/khtml_part.cpp:4820
+msgid ""
+"<qt>The form will be submitted to <BR><B>%1</B><BR>on your local "
+"filesystem.<BR>Do you want to submit the form?"
+msgstr ""
+
+#: khtml/khtml_part.cpp:4869
+msgid ""
+"This site attempted to attach a file from your computer in the form "
+"submission. The attachment was removed for your protection."
+msgstr ""
+
+#: khtml/khtml_part.cpp:4869
+msgid "KDE"
+msgstr ""
+
+#: khtml/khtml_part.cpp:5775
+msgid "(%1/s)"
+msgstr ""
+
+#: khtml/khtml_part.cpp:6828
+msgid "Security Warning"
+msgstr ""
+
+#: khtml/khtml_part.cpp:6834
+msgid "<qt>Access by untrusted page to<BR><B>%1</B><BR> denied."
+msgstr ""
+
+#: khtml/java/kjavaappletserver.cpp:784 khtml/khtml_part.cpp:6835
+msgid "Security Alert"
+msgstr ""
+
+#: khtml/khtml_part.cpp:7260
+msgid "The wallet '%1' is open and being used for form data and passwords."
+msgstr ""
+
+#: khtml/khtml_part.cpp:7314
+msgid "&Close Wallet"
+msgstr ""
+
+#: khtml/khtml_part.cpp:7357
+msgid "JavaScript &Debugger"
+msgstr ""
+
+#: khtml/khtml_part.cpp:7392
+msgid "This page was prevented from opening a new window via JavaScript."
+msgstr ""
+
+#: khtml/khtml_part.cpp:7398
+msgid "Popup Window Blocked"
+msgstr ""
+
+#: khtml/khtml_part.cpp:7398
+msgid ""
+"This page has attempted to open a popup window but was blocked.\n"
+"You can click on this icon in the status bar to control this behavior\n"
+"or to open the popup."
+msgstr ""
+
+#: khtml/khtml_part.cpp:7412
+#, c-format
+msgid ""
+"_n: &Show Blocked Popup Window\n"
+"Show %n Blocked Popup Windows"
+msgstr ""
+
+#: khtml/khtml_part.cpp:7413
+msgid "Show Blocked Window Passive Popup &Notification"
+msgstr ""
+
+#: khtml/khtml_part.cpp:7415
+msgid "&Configure JavaScript New Window Policies..."
+msgstr ""
+
+#: khtml/khtml_ext.cpp:434
+msgid "&Copy Text"
+msgstr ""
+
+#: khtml/khtml_ext.cpp:480
+msgid "Search for '%1' with %2"
+msgstr ""
+
+#: khtml/khtml_ext.cpp:489
+msgid "Search for '%1' with"
+msgstr ""
+
+#: khtml/khtml_ext.cpp:518
+msgid "Open '%1'"
+msgstr ""
+
+#: khtml/khtml_ext.cpp:525 khtml/khtml_ext.cpp:582
+msgid "Stop Animations"
+msgstr ""
+
+#: khtml/khtml_ext.cpp:533
+msgid "Copy Email Address"
+msgstr ""
+
+#: khtml/khtml_ext.cpp:538
+msgid "&Save Link As..."
+msgstr ""
+
+#: khtml/khtml_ext.cpp:540
+msgid "Copy &Link Address"
+msgstr ""
+
+#: khtml/khtml_ext.cpp:550
+msgid "Open in New &Window"
+msgstr ""
+
+#: khtml/khtml_ext.cpp:552
+msgid "Open in &This Window"
+msgstr ""
+
+#: khtml/khtml_ext.cpp:554
+msgid "Open in &New Tab"
+msgstr ""
+
+#: khtml/khtml_ext.cpp:556
+msgid "Reload Frame"
+msgstr ""
+
+#: khtml/khtml_ext.cpp:561
+msgid "Block IFrame..."
+msgstr ""
+
+#: khtml/khtml_ext.cpp:566
+msgid "View Frame Information"
+msgstr ""
+
+#: khtml/khtml_ext.cpp:601
+msgid "Save Image As..."
+msgstr ""
+
+#: khtml/khtml_ext.cpp:603
+msgid "Send Image..."
+msgstr ""
+
+#: khtml/khtml_ext.cpp:608
+msgid "Copy Image"
+msgstr ""
+
+#: khtml/khtml_ext.cpp:613
+msgid "Copy Image Location"
+msgstr ""
+
+#: khtml/khtml_ext.cpp:618
+msgid "View Image (%1)"
+msgstr ""
+
+#: khtml/khtml_ext.cpp:623
+msgid "Block Image..."
+msgstr ""
+
+#: khtml/khtml_ext.cpp:629
+#, c-format
+msgid "Block Images From %1"
+msgstr ""
+
+#: khtml/khtml_ext.cpp:653
+msgid "Save Link As"
+msgstr ""
+
+#: khtml/khtml_ext.cpp:673
+msgid "Save Image As"
+msgstr ""
+
+#: khtml/khtml_ext.cpp:687 khtml/khtml_ext.cpp:700
+msgid "Add URL to Filter"
+msgstr ""
+
+#: khtml/khtml_ext.cpp:828
+msgid ""
+"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
+msgstr ""
+
+#: khtml/khtml_ext.cpp:828
+msgid "Overwrite File?"
+msgstr ""
+
+#: khtml/khtml_ext.cpp:983
+#, no-c-format
+msgid "Default Font Size (100%)"
+msgstr ""
+
+#: khtml/khtml_ext.cpp:996
+#, no-c-format
+msgid "%1%"
+msgstr ""
+
+#: khtml/misc/knsplugininstaller.cpp:349
+msgid "KDE plugin wizard"
+msgstr ""
+
+#: khtml/misc/knsplugininstaller.cpp:379
+msgid "The following plugins are available."
+msgstr ""
+
+#: khtml/misc/knsplugininstaller.cpp:383
+msgid "Click on next to install the selected plugin."
+msgstr ""
+
+#: khtml/misc/knsplugininstaller.cpp:384
+msgid "Plugin installation confirmation"
+msgstr ""
+
+#: khtml/misc/knsplugininstaller.cpp:415
+msgid "I agree."
+msgstr ""
+
+#: khtml/misc/knsplugininstaller.cpp:417
+msgid "I do not agree (plugin will not be installed)."
+msgstr ""
+
+#: khtml/misc/knsplugininstaller.cpp:423
+msgid "Plugin licence"
+msgstr ""
+
+#: khtml/misc/knsplugininstaller.cpp:433
+msgid "Installation in progress."
+msgstr ""
+
+#: khtml/misc/knsplugininstaller.cpp:439
+msgid "Plugin installation"
+msgstr ""
+
+#: khtml/misc/knsplugininstaller.cpp:452
+msgid "Installation status"
+msgstr ""
+
+#: khtml/misc/knsplugininstaller.cpp:499
+msgid "To install "
+msgstr ""
+
+#: khtml/misc/knsplugininstaller.cpp:499
+msgid " you need to agree to the following"
+msgstr ""
+
+#: khtml/misc/knsplugininstaller.cpp:530
+msgid "Installation completed. Reload the page."
+msgstr ""
+
+#: khtml/misc/knsplugininstaller.cpp:533
+msgid "Installation failed"
+msgstr ""
+
+#: khtml/kmultipart/kmultipart.cpp:320
+msgid "No handler found for %1!"
+msgstr ""
+
+#: khtml/kmultipart/kmultipart.cpp:576
+msgid "KMultiPart"
+msgstr ""
+
+#: khtml/kmultipart/kmultipart.cpp:578
+msgid "Embeddable component for multipart/mixed"
+msgstr ""
+
+#: khtml/xml/dom_docimpl.cpp:2077
+msgid "Basic Page Style"
+msgstr ""
+
+#: khtml/xml/xml_tokenizer.cpp:312
+msgid "the document is not in the correct file format"
+msgstr ""
+
+#: khtml/xml/xml_tokenizer.cpp:318
+msgid "fatal parsing error: %1 in line %2, column %3"
+msgstr ""
+
+#: khtml/xml/xml_tokenizer.cpp:477
+msgid "XML parsing error"
+msgstr ""
+
+#: kdeui/ktextedit.cpp:353 khtml/rendering/render_form.cpp:331
+msgid "Spell Checking"
+msgstr ""
+
+#: kdeui/kcombobox.cpp:444 khtml/rendering/render_form.cpp:388
+msgid "Clear &History"
+msgstr ""
+
+#: khtml/rendering/render_frames.cpp:957
+msgid ""
+"No plugin found for '%1'.\n"
+"Do you want to download one from %2?"
+msgstr ""
+
+#: khtml/rendering/render_frames.cpp:958
+msgid "Missing Plugin"
+msgstr ""
+
+#: khtml/rendering/render_frames.cpp:958
+msgid "Download"
+msgstr ""
+
+#: khtml/rendering/render_frames.cpp:958
+msgid "Do Not Download"
+msgstr ""
+
+#: khtml/java/kjavaappletviewer.cpp:122
+msgid "Applet Parameters"
+msgstr ""
+
+#: khtml/java/kjavaappletviewer.cpp:131
+msgid "Parameter"
+msgstr ""
+
+#: khtml/java/kjavaappletviewer.cpp:133
+msgid "Class"
+msgstr ""
+
+#: khtml/java/kjavaappletviewer.cpp:137
+msgid "Base URL"
+msgstr ""
+
+#: khtml/java/kjavaappletviewer.cpp:141
+msgid "Archives"
+msgstr ""
+
+#: khtml/java/kjavaappletviewer.cpp:451
+msgid "KDE Java Applet Plugin"
+msgstr ""
+
+#: khtml/java/kjavaappletserver.cpp:145
+msgid "Loading Applet"
+msgstr ""
+
+#: khtml/java/kjavaappletserver.cpp:149
+msgid "Error: java executable not found"
+msgstr ""
+
+#: khtml/java/kjavaappletserver.cpp:633
+msgid "Signed by (validation: "
+msgstr ""
+
+#: khtml/java/kjavaappletserver.cpp:635
+msgid "Certificate (validation: "
+msgstr ""
+
+#: khtml/java/kjavaappletserver.cpp:638
+msgid "Ok"
+msgstr ""
+
+#: khtml/java/kjavaappletserver.cpp:640
+msgid "NoCARoot"
+msgstr ""
+
+#: khtml/java/kjavaappletserver.cpp:642
+msgid "InvalidPurpose"
+msgstr ""
+
+#: khtml/java/kjavaappletserver.cpp:644
+msgid "PathLengthExceeded"
+msgstr ""
+
+#: khtml/java/kjavaappletserver.cpp:646
+msgid "InvalidCA"
+msgstr ""
+
+#: khtml/java/kjavaappletserver.cpp:648
+msgid "Expired"
+msgstr ""
+
+#: khtml/java/kjavaappletserver.cpp:650
+msgid "SelfSigned"
+msgstr ""
+
+#: khtml/java/kjavaappletserver.cpp:652
+msgid "ErrorReadingRoot"
+msgstr ""
+
+#: khtml/java/kjavaappletserver.cpp:654
+msgid "Revoked"
+msgstr ""
+
+#: khtml/java/kjavaappletserver.cpp:656
+msgid "Untrusted"
+msgstr ""
+
+#: khtml/java/kjavaappletserver.cpp:658
+msgid "SignatureFailed"
+msgstr ""
+
+#: khtml/java/kjavaappletserver.cpp:660
+msgid "Rejected"
+msgstr ""
+
+#: khtml/java/kjavaappletserver.cpp:662
+msgid "PrivateKeyFailed"
+msgstr ""
+
+#: khtml/java/kjavaappletserver.cpp:664
+msgid "InvalidHost"
+msgstr ""
+
+#: khtml/java/kjavaappletserver.cpp:667
+msgid "Unknown"
+msgstr ""
+
+#: khtml/java/kjavaappletserver.cpp:788
+msgid "Do you grant Java applet with certificate(s):"
+msgstr ""
+
+#: khtml/java/kjavaappletserver.cpp:790
+msgid "the following permission"
+msgstr ""
+
+#: kdeui/kstdguiitem.cpp:115 khtml/java/kjavaappletserver.cpp:797
+msgid "&No"
+msgstr ""
+
+#: khtml/java/kjavaappletserver.cpp:801
+msgid "&Reject All"
+msgstr ""
+
+#: kdeui/kstdguiitem.cpp:110 khtml/java/kjavaappletserver.cpp:804
+msgid "&Yes"
+msgstr ""
+
+#: khtml/java/kjavaappletserver.cpp:807
+msgid "&Grant All"
+msgstr ""
+
+#: khtml/java/kjavaapplet.cpp:225
+msgid "Initializing Applet \"%1\"..."
+msgstr ""
+
+#: khtml/java/kjavaapplet.cpp:232
+msgid "Starting Applet \"%1\"..."
+msgstr ""
+
+#: khtml/java/kjavaapplet.cpp:239
+msgid "Applet \"%1\" started"
+msgstr ""
+
+#: khtml/java/kjavaapplet.cpp:245
+msgid "Applet \"%1\" stopped"
+msgstr ""
+
+#: khtml/ecma/kjs_html.cpp:2155 khtml/ecma/kjs_window.cpp:1562
+msgid "Confirmation: JavaScript Popup"
+msgstr ""
+
+#: khtml/ecma/kjs_window.cpp:1565
+msgid ""
+"This site is requesting to open up a new browser window via JavaScript.\n"
+"Do you want to allow this?"
+msgstr ""
+
+#: khtml/ecma/kjs_window.cpp:1568
+msgid ""
+"<qt>This site is requesting to open<p>%1</p>in a new browser window via "
+"JavaScript.<br />Do you want to allow this?</qt>"
+msgstr ""
+
+#: khtml/ecma/kjs_html.cpp:2162 khtml/ecma/kjs_window.cpp:1570
+msgid "Allow"
+msgstr ""
+
+#: khtml/ecma/kjs_html.cpp:2162 khtml/ecma/kjs_window.cpp:1570
+msgid "Do Not Allow"
+msgstr ""
+
+#: khtml/ecma/kjs_window.cpp:1862
+msgid "Close window?"
+msgstr ""
+
+#: khtml/ecma/kjs_window.cpp:1862
+msgid "Confirmation Required"
+msgstr ""
+
+#: khtml/ecma/kjs_window.cpp:2744
+msgid ""
+"Do you want a bookmark pointing to the location \"%1\" to be added to your "
+"collection?"
+msgstr ""
+
+#: khtml/ecma/kjs_window.cpp:2747
+msgid ""
+"Do you want a bookmark pointing to the location \"%1\" titled \"%2\" to be "
+"added to your collection?"
+msgstr ""
+
+#: khtml/ecma/kjs_window.cpp:2755
+msgid "JavaScript Attempted Bookmark Insert"
+msgstr ""
+
+#: khtml/ecma/kjs_window.cpp:2759
+msgid "Disallow"
+msgstr ""
+
+#: khtml/ecma/kjs_proxy.cpp:405
+msgid ""
+"A script on this page is causing KHTML to freeze. If it continues to run, "
+"other applications may become less responsive.\n"
+"Do you want to abort the script?"
+msgstr ""
+
+#: khtml/ecma/kjs_proxy.cpp:405
+msgid "JavaScript"
+msgstr ""
+
+#: khtml/ecma/kjs_proxy.cpp:405
+msgid "&Abort"
+msgstr ""
+
+#: khtml/ecma/kjs_debugwin.cpp:291
+msgid "JavaScript Error"
+msgstr ""
+
+#: khtml/ecma/kjs_debugwin.cpp:305
+msgid "&Do not show this message again"
+msgstr ""
+
+#: khtml/ecma/kjs_debugwin.cpp:369
+msgid "JavaScript Debugger"
+msgstr ""
+
+#: khtml/ecma/kjs_debugwin.cpp:383
+msgid "Call stack"
+msgstr ""
+
+#: khtml/ecma/kjs_debugwin.cpp:418
+msgid "JavaScript console"
+msgstr ""
+
+#: khtml/ecma/kjs_debugwin.cpp:448
+msgid ""
+"_: Next breakpoint\n"
+"&Next"
+msgstr ""
+
+#: khtml/ecma/kjs_debugwin.cpp:450
+msgid "&Step"
+msgstr ""
+
+#: khtml/ecma/kjs_debugwin.cpp:455
+msgid "&Continue"
+msgstr ""
+
+#: khtml/ecma/kjs_debugwin.cpp:459
+msgid "&Break at Next Statement"
+msgstr ""
+
+#: khtml/ecma/kjs_debugwin.cpp:463
+msgid ""
+"_: Next breakpoint\n"
+"Next"
+msgstr ""
+
+#: khtml/ecma/kjs_debugwin.cpp:464
+msgid "Step"
+msgstr ""
+
+#: khtml/ecma/kjs_debugwin.cpp:826
+msgid "Parse error at %1 line %2"
+msgstr ""
+
+#: khtml/ecma/kjs_debugwin.cpp:837
+#, c-format
+msgid ""
+"An error occurred while attempting to run a script on this page.\n"
+"\n"
+"%1"
+msgstr ""
+
+#: khtml/ecma/kjs_debugwin.cpp:846
+msgid ""
+"An error occurred while attempting to run a script on this page.\n"
+"\n"
+"%1 line %2:\n"
+"%3"
+msgstr ""
+
+#: khtml/ecma/kjs_html.cpp:2157
+msgid ""
+"This site is submitting a form which will open up a new browser window via "
+"JavaScript.\n"
+"Do you want to allow the form to be submitted?"
+msgstr ""
+
+#: khtml/ecma/kjs_html.cpp:2160
+msgid ""
+"<qt>This site is submitting a form which will open <p>%1</p> in a new "
+"browser window via JavaScript.<br />Do you want to allow the form to be "
+"submitted?</qt>"
+msgstr ""
+
+#: khtml/html/html_formimpl.cpp:353
+msgid ""
+"The following files will not be uploaded because they could not be found.\n"
+"Do you want to continue?"
+msgstr ""
+
+#: khtml/html/html_formimpl.cpp:357
+msgid "Submit Confirmation"
+msgstr ""
+
+#: khtml/html/html_formimpl.cpp:357
+msgid "&Submit Anyway"
+msgstr ""
+
+#: khtml/html/html_formimpl.cpp:368
+msgid ""
+"You're about to transfer the following files from your local computer to the "
+"Internet.\n"
+"Do you really want to continue?"
+msgstr ""
+
+#: khtml/html/html_formimpl.cpp:372
+msgid "Send Confirmation"
+msgstr ""
+
+#: khtml/html/html_formimpl.cpp:372
+msgid "&Send Files"
+msgstr ""
+
+#: khtml/html/html_formimpl.cpp:609
+msgid "Save Login Information"
+msgstr ""
+
+#: khtml/html/html_formimpl.cpp:613
+msgid "Store"
+msgstr ""
+
+#: khtml/html/html_formimpl.cpp:613
+msgid "Ne&ver for This Site"
+msgstr ""
+
+#: khtml/html/html_formimpl.cpp:613
+msgid "Do Not Store"
+msgstr ""
+
+#: khtml/html/html_formimpl.cpp:617
+msgid "Store passwords on this page?"
+msgstr ""
+
+#: khtml/html/htmlparser.cpp:1709
+msgid "This is a searchable index. Enter search keywords: "
+msgstr ""
+
+#: arts/kde/kvideowidget.cpp:82
+msgid "Video Toolbar"
+msgstr ""
+
+#: arts/kde/kvideowidget.cpp:104
+msgid "Fullscreen &Mode"
+msgstr ""
+
+#: arts/kde/kvideowidget.cpp:107
+msgid "&Half Size"
+msgstr ""
+
+#: arts/kde/kvideowidget.cpp:110
+msgid "&Normal Size"
+msgstr ""
+
+#: arts/kde/kvideowidget.cpp:113
+msgid "&Double Size"
+msgstr ""
+
+#: kstyles/utils/installtheme/main.cpp:35
+msgid "KDE Tool to build a cache list of all pixmap themes installed"
+msgstr ""
+
+#: kstyles/utils/installtheme/main.cpp:40
+msgid "KInstalltheme"
+msgstr ""
+
+#: kdecore/kapplication.cpp:1948 kstyles/klegacy/klegacystyle.cpp:3044
+#: kstyles/web/webstyle.cpp:1604
+msgid "modified"
+msgstr ""
+
+#: kstyles/klegacy/plugin.cpp:28
+msgid "KDE LegacyStyle plugin"
+msgstr ""
+
+#: kstyles/web/plugin.cpp:9
+msgid "Web style plugin"
+msgstr ""
+
+#: kdeui/kwhatsthismanager.cpp:50
+msgid ""
+"<b>Not Defined</b><br>There is no \"What's This?\" help assigned to this "
+"widget. If you want to help us to  describe the widget, you are welcome to "
+"<a href=\"submit-whatsthis\">send us your own \"What's This?\" help</a> for "
+"it."
+msgstr ""
+
+#: kdeui/kfontrequester.cpp:38
+msgid "Choose..."
+msgstr ""
+
+#: kdeui/kfontrequester.cpp:102
+msgid "Click to select a font"
+msgstr ""
+
+#: kdeui/kfontrequester.cpp:109
+msgid "Preview of the selected font"
+msgstr ""
+
+#: kdeui/kfontrequester.cpp:111
+msgid ""
+"This is a preview of the selected font. You can change it by clicking the "
+"\"Choose...\" button."
+msgstr ""
+
+#: kdeui/kfontrequester.cpp:117
+msgid "Preview of the \"%1\" font"
+msgstr ""
+
+#: kdeui/kfontrequester.cpp:119
+msgid ""
+"This is a preview of the \"%1\" font. You can change it by clicking the "
+"\"Choose...\" button."
+msgstr ""
+
+#: kdeui/kdatepicker.cpp:88
+#, c-format
+msgid "Week %1"
+msgstr ""
+
+#: kdeui/kdatepicker.cpp:163
+msgid "Next year"
+msgstr ""
+
+#: kdeui/kdatepicker.cpp:164
+msgid "Previous year"
+msgstr ""
+
+#: kdeui/kdatepicker.cpp:165
+msgid "Next month"
+msgstr ""
+
+#: kdeui/kdatepicker.cpp:166
+msgid "Previous month"
+msgstr ""
+
+#: kdeui/kdatepicker.cpp:167
+msgid "Select a week"
+msgstr ""
+
+#: kdeui/kdatepicker.cpp:168
+msgid "Select a month"
+msgstr ""
+
+#: kdeui/kdatepicker.cpp:169
+msgid "Select a year"
+msgstr ""
+
+#: kdeui/kdatepicker.cpp:170
+msgid "Select the current day"
+msgstr ""
+
+#: kdeui/kwindowlistmenu.cpp:129
+msgid "Unclutter Windows"
+msgstr ""
+
+#: kdeui/kwindowlistmenu.cpp:131
+msgid "Cascade Windows"
+msgstr ""
+
+#: kdeui/kwindowlistmenu.cpp:185
+msgid "On All Desktops"
+msgstr ""
+
+#: kdeui/kwindowlistmenu.cpp:213
+msgid "No Windows"
+msgstr ""
+
+#: kdeui/kcolorcombo.cpp:187 kdeui/kcolorcombo.cpp:240
+msgid "Custom..."
+msgstr ""
+
+#: kdeui/kcolordialog.cpp:84
+msgid ""
+"_: palette name\n"
+"* Recent Colors *"
+msgstr ""
+
+#: kdeui/kcolordialog.cpp:85
+msgid ""
+"_: palette name\n"
+"* Custom Colors *"
+msgstr ""
+
+#: kdeui/kcolordialog.cpp:86
+msgid ""
+"_: palette name\n"
+"Forty Colors"
+msgstr ""
+
+#: kdeui/kcolordialog.cpp:87
+msgid ""
+"_: palette name\n"
+"Rainbow Colors"
+msgstr ""
+
+#: kdeui/kcolordialog.cpp:88
+msgid ""
+"_: palette name\n"
+"Royal Colors"
+msgstr ""
+
+#: kdeui/kcolordialog.cpp:89
+msgid ""
+"_: palette name\n"
+"Web Colors"
+msgstr ""
+
+#: kdeui/kcolordialog.cpp:563
+msgid "Named Colors"
+msgstr ""
+
+#: kdeui/kcolordialog.cpp:717
+msgid ""
+"Unable to read X11 RGB color strings. The following file location(s) were "
+"examined:\n"
+msgstr ""
+
+#: kdeui/kcolordialog.cpp:940
+msgid "Select Color"
+msgstr ""
+
+#: kdeui/kcolordialog.cpp:1005
+msgid "H:"
+msgstr ""
+
+#: kdeui/kcolordialog.cpp:1014
+msgid "S:"
+msgstr ""
+
+#: kdeui/kcolordialog.cpp:1023
+msgid "V:"
+msgstr ""
+
+#: kdeui/kcolordialog.cpp:1035
+msgid "R:"
+msgstr ""
+
+#: kdeui/kcolordialog.cpp:1044
+msgid "G:"
+msgstr ""
+
+#: kdeui/kcolordialog.cpp:1053
+msgid "B:"
+msgstr ""
+
+#: kdeui/kcolordialog.cpp:1108
+msgid "&Add to Custom Colors"
+msgstr ""
+
+#: kdeui/kcolordialog.cpp:1140
+msgid "HTML:"
+msgstr ""
+
+#: kdeui/kcolordialog.cpp:1219
+msgid "Default color"
+msgstr ""
+
+#: kdeui/kcolordialog.cpp:1247
+msgid "-default-"
+msgstr ""
+
+#: kdeui/kcolordialog.cpp:1463
+msgid "-unnamed-"
+msgstr ""
+
+#: kdeui/ktoolbarhandler.cpp:86
+msgid "Show Toolbar"
+msgstr ""
+
+#: kdeui/ktoolbarhandler.cpp:87
+msgid "Hide Toolbar"
+msgstr ""
+
+#: kdeui/ktoolbarhandler.cpp:91
+msgid "Toolbars"
+msgstr ""
+
+#: kdeui/kdockwidget.cpp:237
+msgid ""
+"_: Freeze the window geometry\n"
+"Freeze"
+msgstr ""
+
+#: kdeui/kdockwidget.cpp:244
+msgid ""
+"_: Dock this window\n"
+"Dock"
+msgstr ""
+
+#: kdeui/kdockwidget.cpp:251
+msgid "Detach"
+msgstr ""
+
+#: kdeui/keditlistbox.cpp:124
+msgid "&Add"
+msgstr ""
+
+#: kdeui/keditlistbox.cpp:148
+msgid "Move &Up"
+msgstr ""
+
+#: kdeui/keditlistbox.cpp:153
+msgid "Move &Down"
+msgstr ""
+
+#: kdeui/ktabbar.cpp:196
+msgid "Close this tab"
+msgstr ""
+
+#: kdeui/khelpmenu.cpp:128 kdeui/kstdaction_p.h:108
+msgid "%1 &Handbook"
+msgstr ""
+
+#: kdeui/khelpmenu.cpp:137
+msgid "What's &This"
+msgstr ""
+
+#: kdeui/khelpmenu.cpp:148 kdeui/kstdaction_p.h:111
+msgid "&Report Bug..."
+msgstr ""
+
+#: kdeui/khelpmenu.cpp:156 kdeui/kstdaction_p.h:114
+msgid "&Get Help Online"
+msgstr ""
+
+#: kdeui/khelpmenu.cpp:157
+msgid "&Translate this Application"
+msgstr ""
+
+#: kdeui/khelpmenu.cpp:163 kdeui/kstdaction_p.h:112
+#, c-format
+msgid "&About %1"
+msgstr ""
+
+#: kdeui/khelpmenu.cpp:169 kdeui/kstdaction_p.h:113
+msgid "About &KDE"
+msgstr ""
+
+#: kdeui/kaboutdialog.cpp:1535 kdeui/khelpmenu.cpp:220
+#: kdeui/kmessagebox.cpp:975
+#, c-format
+msgid "About %1"
+msgstr ""
+
+#: kdeui/kpixmapregionselectordialog.cpp:28
+msgid "Select Region of Image"
+msgstr ""
+
+#: kdeui/kpixmapregionselectordialog.cpp:31
+msgid "Please click and drag on the image to select the region of interest:"
+msgstr ""
+
+#: kdeui/kbugreport.cpp:70
+msgid "Submit Bug Report"
+msgstr ""
+
+#: kdeui/kbugreport.cpp:110
+msgid ""
+"Your email address. If incorrect, use the Configure Email button to change it"
+msgstr ""
+
+#: kdeui/kbugreport.cpp:111
+msgid "From:"
+msgstr ""
+
+#: kdeui/kbugreport.cpp:120
+msgid "Configure Email..."
+msgstr ""
+
+#: kdeui/kbugreport.cpp:127
+msgid "The email address this bug report is sent to."
+msgstr ""
+
+#: kdeui/kbugreport.cpp:128
+msgid "To:"
+msgstr ""
+
+#: kdeui/kbugreport.cpp:135
+msgid "&Send"
+msgstr ""
+
+#: kdeui/kbugreport.cpp:135
+msgid "Send bug report."
+msgstr ""
+
+#: kdeui/kbugreport.cpp:136
+#, c-format
+msgid "Send this bug report to %1."
+msgstr ""
+
+#: kdeui/kbugreport.cpp:147
+msgid ""
+"The application for which you wish to submit a bug report - if incorrect, "
+"please use the Report Bug menu item of the correct application"
+msgstr ""
+
+#: kdeui/kbugreport.cpp:148
+msgid "Application: "
+msgstr ""
+
+#: kdeui/kbugreport.cpp:173
+msgid ""
+"The version of this application - please make sure that no newer version is "
+"available before sending a bug report"
+msgstr ""
+
+#: kdeui/kbugreport.cpp:180
+msgid "no version set (programmer error!)"
+msgstr ""
+
+#: kdeui/kbugreport.cpp:190
+msgid "OS:"
+msgstr ""
+
+#: kdeui/kbugreport.cpp:202
+msgid "Compiler:"
+msgstr ""
+
+#: kdeui/kbugreport.cpp:210
+msgid "Se&verity"
+msgstr ""
+
+#: kdeui/kbugreport.cpp:212
+msgid "Critical"
+msgstr ""
+
+#: kdeui/kbugreport.cpp:212
+msgid "Grave"
+msgstr ""
+
+#: kdeui/kbugreport.cpp:212
+msgid ""
+"_: normal severity\n"
+"Normal"
+msgstr ""
+
+#: kdeui/kbugreport.cpp:212
+msgid "Wishlist"
+msgstr ""
+
+#: kdeui/kbugreport.cpp:212
+msgid "Translation"
+msgstr ""
+
+#: kdeui/kbugreport.cpp:225
+msgid "S&ubject: "
+msgstr ""
+
+#: kdeui/kbugreport.cpp:232
+msgid ""
+"Enter the text (in English if possible) that you wish to submit for the bug "
+"report.\n"
+"If you press \"Send\", a mail message will be sent to the maintainer of this "
+"program.\n"
+msgstr ""
+
+#: kdeui/kbugreport.cpp:252
+msgid ""
+"To submit a bug report, click on the button below.\n"
+"This will open a web browser window on http://bugs.kde.org where you will "
+"find a form to fill in.\n"
+"The information displayed above will be transferred to that server."
+msgstr ""
+
+#: kdeui/kbugreport.cpp:260
+msgid "&Launch Bug Report Wizard"
+msgstr ""
+
+#: kdeui/kbugreport.cpp:298
+msgid ""
+"_: unknown program name\n"
+"unknown"
+msgstr ""
+
+#: kdeui/kbugreport.cpp:376
+msgid ""
+"You must specify both a subject and a description before the report can be "
+"sent."
+msgstr ""
+
+#: kdeui/kbugreport.cpp:386
+msgid ""
+"<p>You chose the severity <b>Critical</b>. Please note that this severity is "
+"intended only for bugs that</p><ul><li>break unrelated software on the "
+"system (or the whole system)</li><li>cause serious data "
+"loss</li><li>introduce a security hole on the system where the affected "
+"package is installed</li></ul>\n"
+"<p>Does the bug you are reporting cause any of the above damage? If it does "
+"not, please select a lower severity. Thank you!</p>"
+msgstr ""
+
+#: kdeui/kbugreport.cpp:397
+msgid ""
+"<p>You chose the severity <b>Grave</b>. Please note that this severity is "
+"intended only for bugs that</p><ul><li>make the package in question unusable "
+"or mostly so</li><li>cause data loss</li><li>introduce a security hole "
+"allowing access to the accounts of users who use the affected "
+"package</li></ul>\n"
+"<p>Does the bug you are reporting cause any of the above damage? If it does "
+"not, please select a lower severity. Thank you!</p>"
+msgstr ""
+
+#: kdeui/kbugreport.cpp:409
+msgid ""
+"Unable to send the bug report.\n"
+"Please submit a bug report manually...\n"
+"See http://bugs.kde.org/ for instructions."
+msgstr ""
+
+#: kdeui/kbugreport.cpp:417
+msgid "Bug report sent, thank you for your input."
+msgstr ""
+
+#: kdeui/kbugreport.cpp:426
+msgid ""
+"Close and discard\n"
+"edited message?"
+msgstr ""
+
+#: kdeui/kbugreport.cpp:427
+msgid "Close Message"
+msgstr ""
+
+#: kdeui/kkeybutton.cpp:89 kdeui/kkeydialog.cpp:536 kdeui/klineedit.cpp:889
+#: obj-x86_64-linux-gnu/kio/kfile/kpropertiesdesktopadvbase.cpp:159
+msgid "None"
+msgstr ""
+
+#: kdeui/ktip.cpp:206
+msgid "Tip of the Day"
+msgstr ""
+
+#: kdeui/ktip.cpp:224
+msgid "Did you know...?\n"
+msgstr ""
+
+#: kdeui/ktip.cpp:287
+msgid "&Show tips on startup"
+msgstr ""
+
+#. i18n "??" is displayed as (pseudo-)version when no data is known about the application
+#: kdeui/kaboutapplication.cpp:63
+msgid "??"
+msgstr ""
+
+#: kdeui/kaboutapplication.cpp:67
+msgid ""
+"No information available.\n"
+"The supplied KAboutData object does not exist."
+msgstr ""
+
+#: kdeui/kaboutapplication.cpp:107
+msgid "A&uthor"
+msgstr ""
+
+#: kdeui/kaboutapplication.cpp:107
+msgid "A&uthors"
+msgstr ""
+
+#: kdeui/kaboutapplication.cpp:117
+msgid ""
+"Please use <a href=\"http://bugs.kde.org\">http://bugs.kde.org</a> to report "
+"bugs.\n"
+msgstr ""
+
+#: kdeui/kaboutapplication.cpp:121 kdeui/kaboutapplication.cpp:124
+msgid "Please report bugs to <a href=\"mailto:%1\">%2</a>.\n"
+msgstr ""
+
+#: kdeui/kaboutapplication.cpp:149
+msgid "&Thanks To"
+msgstr ""
+
+#: kdeui/kaboutapplication.cpp:176
+msgid "T&ranslation"
+msgstr ""
+
+#: kdeui/kaboutapplication.cpp:181
+msgid "&License Agreement"
+msgstr ""
+
+#: kdeui/kcombobox.cpp:584
+msgid "No further item in the history."
+msgstr ""
+
+#: kdeui/kaboutdialog.cpp:93
+msgid "Task"
+msgstr ""
+
+#: kdeui/kaboutdialog.cpp:704
+msgid "%1 %2 (Using KDE %3)"
+msgstr ""
+
+#: kdeui/kaboutdialog.cpp:706
+msgid "%1 %2, %3"
+msgstr ""
+
+#: kdeui/kaboutdialog.cpp:1326
+msgid "Other Contributors:"
+msgstr ""
+
+#: kdeui/kaboutdialog.cpp:1327
+msgid "(No logo available)"
+msgstr ""
+
+#: kdeui/kaboutdialog.cpp:1772
+msgid "Image missing"
+msgstr ""
+
+#: kdeui/kpassdlg.cpp:372
+msgid "&Password:"
+msgstr ""
+
+#: kdeui/kpassdlg.cpp:391
+msgid "&Keep password"
+msgstr ""
+
+#: kdeui/kpassdlg.cpp:403
+msgid "&Verify:"
+msgstr ""
+
+#: kdeui/kpassdlg.cpp:425
+msgid "Password strength meter:"
+msgstr ""
+
+#: kdeui/kpassdlg.cpp:429
+msgid ""
+"The password strength meter gives an indication of the security of the "
+"password you have entered.  To improve the strength of the password, try:\n"
+" - using a longer password;\n"
+" - using a mixture of upper- and lower-case letters;\n"
+" - using numbers or symbols, such as #, as well as letters."
+msgstr ""
+
+#: kdeui/kpassdlg.cpp:445 kdeui/kpassdlg.cpp:617
+msgid "Passwords do not match"
+msgstr ""
+
+#: kdeui/kpassdlg.cpp:515
+msgid "You entered two different passwords. Please try again."
+msgstr ""
+
+#: kdeui/kpassdlg.cpp:522
+msgid ""
+"The password you have entered has a low strength. To improve the strength of "
+"the password, try:\n"
+" - using a longer password;\n"
+" - using a mixture of upper- and lower-case letters;\n"
+" - using numbers or symbols as well as letters.\n"
+"\n"
+"Would you like to use this password anyway?"
+msgstr ""
+
+#: kdeui/kpassdlg.cpp:530
+msgid "Low Password Strength"
+msgstr ""
+
+#: kdeui/kpassdlg.cpp:611
+msgid "Password is empty"
+msgstr ""
+
+#: kdeui/kpassdlg.cpp:614
+#, c-format
+msgid ""
+"_n: Password must be at least 1 character long\n"
+"Password must be at least %n characters long"
+msgstr ""
+
+#: kdeui/kpassdlg.cpp:616
+msgid "Passwords match"
+msgstr ""
+
+#: kdeui/kmessagebox.cpp:428 kdeui/kmessagebox.cpp:479
+msgid "Question"
+msgstr ""
+
+#: kdeui/kmessagebox.cpp:442 kdeui/kmessagebox.cpp:494
+#: kdeui/kmessagebox.cpp:575 kdeui/kmessagebox.cpp:647
+#: kdeui/kmessagebox.cpp:723
+msgid "Do not ask again"
+msgstr ""
+
+#: kdeui/kxmlguibuilder.cpp:166 kdeui/kxmlguibuilder.cpp:365
+msgid "No text!"
+msgstr ""
+
+#: kdeui/kfontdialog.cpp:101
+msgid "Here you can choose the font to be used."
+msgstr ""
+
+#: kdeui/kfontdialog.cpp:113
+msgid "Requested Font"
+msgstr ""
+
+#: kdeui/kfontdialog.cpp:136
+msgid "Change font family?"
+msgstr ""
+
+#: kdeui/kfontdialog.cpp:138
+msgid "Enable this checkbox to change the font family settings."
+msgstr ""
+
+#: kdeui/kcharselect.cpp:383 kdeui/kfontdialog.cpp:144
+msgid "Font:"
+msgstr ""
+
+#: kdeui/kfontdialog.cpp:151
+msgid "Font style"
+msgstr ""
+
+#: kdeui/kfontdialog.cpp:155
+msgid "Change font style?"
+msgstr ""
+
+#: kdeui/kfontdialog.cpp:157
+msgid "Enable this checkbox to change the font style settings."
+msgstr ""
+
+#: kdeui/kfontdialog.cpp:163
+msgid "Font style:"
+msgstr ""
+
+#: kdeui/kfontdialog.cpp:171
+msgid "Size"
+msgstr ""
+
+#: kdeui/kfontdialog.cpp:175
+msgid "Change font size?"
+msgstr ""
+
+#: kdeui/kfontdialog.cpp:177
+msgid "Enable this checkbox to change the font size settings."
+msgstr ""
+
+#: kdeui/kfontdialog.cpp:183
+msgid "Size:"
+msgstr ""
+
+#: kdeui/kfontdialog.cpp:199
+msgid "Here you can choose the font family to be used."
+msgstr ""
+
+#: kdeui/kfontdialog.cpp:221
+msgid "Here you can choose the font style to be used."
+msgstr ""
+
+#: kdeui/kfontdialog.cpp:224 kdeui/kfontdialog.cpp:473
+#: kdeui/kfontdialog.cpp:475 kdeui/kfontdialog.cpp:484
+#: kdeui/kfontdialog.cpp:485
+msgid "Regular"
+msgstr ""
+
+#: kdeui/kfontdialog.cpp:226
+msgid "Bold"
+msgstr ""
+
+#: kdeui/kfontdialog.cpp:227
+msgid "Bold Italic"
+msgstr ""
+
+#: kdeui/kfontdialog.cpp:244
+msgid "Relative"
+msgstr ""
+
+#: kdeui/kfontdialog.cpp:246
+msgid "Font size<br><i>fixed</i> or <i>relative</i><br>to environment"
+msgstr ""
+
+#: kdeui/kfontdialog.cpp:248
+msgid ""
+"Here you can switch between fixed font size and font size to be calculated "
+"dynamically and adjusted to changing environment (e.g. widget dimensions, "
+"paper size)."
+msgstr ""
+
+#: kdeui/kfontdialog.cpp:272
+msgid "Here you can choose the font size to be used."
+msgstr ""
+
+#. i18n: This is a classical test phrase. (It contains all letters from A to Z.)
+#: kdeui/kfontdialog.cpp:296
+msgid "The Quick Brown Fox Jumps Over The Lazy Dog"
+msgstr ""
+
+#: kdeui/kfontdialog.cpp:301
+msgid ""
+"This sample text illustrates the current settings. You may edit it to test "
+"special characters."
+msgstr ""
+
+#: kdeui/kfontdialog.cpp:310 kdeui/kfontdialog.cpp:320
+msgid "Actual Font"
+msgstr ""
+
+#: kdeui/kjanuswidget.cpp:156
+msgid "Empty Page"
+msgstr ""
+
+#: kdeui/kkeydialog.cpp:321
+msgid "Clear Search"
+msgstr ""
+
+#: kdeui/kkeydialog.cpp:324
+msgid "&Search:"
+msgstr ""
+
+#: kdeui/kkeydialog.cpp:331
+msgid ""
+"Search interactively for shortcut names (e.g. Copy) or combination of keys "
+"(e.g. Ctrl+C) by typing them here."
+msgstr ""
+
+#: kdeui/kkeydialog.cpp:354
+msgid ""
+"Here you can see a list of key bindings, i.e. associations between actions "
+"(e.g. 'Copy') shown in the left column and keys or combination of keys (e.g. "
+"Ctrl+V) shown in the right column."
+msgstr ""
+
+#: kdeui/kkeydialog.cpp:363
+msgid "Action"
+msgstr ""
+
+#: kdeui/kkeydialog.cpp:364
+msgid "Shortcut"
+msgstr ""
+
+#: kdeui/kkeydialog.cpp:365
+msgid "Alternate"
+msgstr ""
+
+#: kdeui/kkeydialog.cpp:380
+msgid "Shortcut for Selected Action"
+msgstr ""
+
+#: kdeui/kkeydialog.cpp:393
+msgid ""
+"_: no key\n"
+"&None"
+msgstr ""
+
+#: kdeui/kkeydialog.cpp:398
+msgid "The selected action will not be associated with any key."
+msgstr ""
+
+#: kdeui/kkeydialog.cpp:401
+msgid ""
+"_: default key\n"
+"De&fault"
+msgstr ""
+
+#: kdeui/kkeydialog.cpp:406
+msgid ""
+"This will bind the default key to the selected action. Usually a reasonable "
+"choice."
+msgstr ""
+
+#: kdeui/kkeydialog.cpp:409
+msgid "C&ustom"
+msgstr ""
+
+#: kdeui/kkeydialog.cpp:414
+msgid ""
+"If this option is selected you can create a customized key binding for the "
+"selected action using the buttons below."
+msgstr ""
+
+#: kdeui/kkeydialog.cpp:428
+msgid ""
+"Use this button to choose a new shortcut key. Once you click it, you can "
+"press the key-combination which you would like to be assigned to the "
+"currently selected action."
+msgstr ""
+
+#: kdeui/kkeydialog.cpp:470
+msgid "Shortcuts"
+msgstr ""
+
+#: kdeui/kkeydialog.cpp:536
+msgid "Default key:"
+msgstr ""
+
+#: kdeui/kkeydialog.cpp:715
+msgid ""
+"In order to use the '%1' key as a shortcut, it must be combined with the "
+"Win, Alt, Ctrl, and/or Shift keys."
+msgstr ""
+
+#: kdeui/kkeydialog.cpp:718
+msgid "Invalid Shortcut Key"
+msgstr ""
+
+#: kdeui/kkeydialog.cpp:943
+msgid ""
+"The '%1' key combination has already been allocated to the \"%2\" action.\n"
+"Please choose a unique key combination."
+msgstr ""
+
+#: kdeui/kkeydialog.cpp:958
+msgid "Conflict with Standard Application Shortcut"
+msgstr ""
+
+#: kdeui/kkeydialog.cpp:959
+msgid ""
+"The '%1' key combination has already been allocated to the standard action "
+"\"%2\".\n"
+"Do you want to reassign it from that action to the current one?"
+msgstr ""
+
+#: kdeui/kkeydialog.cpp:964
+msgid "Conflict with Global Shortcut"
+msgstr ""
+
+#: kdeui/kkeydialog.cpp:965
+msgid ""
+"The '%1' key combination has already been allocated to the global action "
+"\"%2\".\n"
+"Do you want to reassign it from that action to the current one?"
+msgstr ""
+
+#: kdeui/kkeydialog.cpp:970
+msgid "Key Conflict"
+msgstr ""
+
+#: kdeui/kkeydialog.cpp:971
+msgid ""
+"The '%1' key combination has already been allocated to the \"%2\" action.\n"
+"Do you want to reassign it from that action to the current one?"
+msgstr ""
+
+#: kdeui/kkeydialog.cpp:977
+msgid "Reassign"
+msgstr ""
+
+#: kdeui/kkeydialog.cpp:1091 kdeui/kkeydialog.cpp:1103
+msgid "Configure Shortcuts"
+msgstr ""
+
+#: kdeui/ktextedit.cpp:231
+msgid "Check Spelling..."
+msgstr ""
+
+#: kdeui/ktextedit.cpp:237
+msgid "Auto Spell Check"
+msgstr ""
+
+#: kdeui/ktextedit.cpp:241
+msgid "Allow Tabulations"
+msgstr ""
+
+#: kdeui/kactionselector.cpp:69
+msgid "&Available:"
+msgstr ""
+
+#: kdeui/kactionselector.cpp:84
+msgid "&Selected:"
+msgstr ""
+
+#: kdeui/klineeditdlg.cpp:92
+#: obj-x86_64-linux-gnu/kio/kfile/kpropertiesdesktopbase.cpp:179
+msgid "&Browse..."
+msgstr ""
+
+#: kdeui/kstdaction.cpp:51 kdeui/kstdguiitem.cpp:188
+msgid ""
+"_: go back\n"
+"&Back"
+msgstr ""
+
+#: kdeui/kstdaction.cpp:56 kdeui/kstdguiitem.cpp:196
+msgid ""
+"_: go forward\n"
+"&Forward"
+msgstr ""
+
+#: kdeui/kstdaction.cpp:61
+msgid ""
+"_: beginning (of line)\n"
+"&Home"
+msgstr ""
+
+#: kdeui/kstdaction.cpp:62 kdeui/kstdguiitem.cpp:168
+msgid ""
+"_: show help\n"
+"&Help"
+msgstr ""
+
+#: kdeui/kstdaction.cpp:240
+msgid "Show Menubar<p>Shows the menubar again after it has been hidden"
+msgstr ""
+
+#: kdeui/kstdaction.cpp:242
+msgid "Hide &Menubar"
+msgstr ""
+
+#: kdeui/kstdaction.cpp:243
+msgid ""
+"Hide Menubar<p>Hide the menubar. You can usually get it back using the right "
+"mouse button inside the window itself."
+msgstr ""
+
+#: kdeui/kstdaction.cpp:274 kdeui/kstdaction_p.h:97
+msgid "Show St&atusbar"
+msgstr ""
+
+#: kdeui/kstdaction.cpp:276
+msgid ""
+"Show Statusbar<p>Shows the statusbar, which is the bar at the bottom of the "
+"window used for status information."
+msgstr ""
+
+#: kdeui/kstdaction.cpp:278
+msgid "Hide St&atusbar"
+msgstr ""
+
+#: kdeui/kstdaction.cpp:279
+msgid ""
+"Hide Statusbar<p>Hides the statusbar, which is the bar at the bottom of the "
+"window used for status information."
+msgstr ""
+
+#: kdeui/klistviewsearchline.cpp:243
+msgid "Search Columns"
+msgstr ""
+
+#: kdeui/klistviewsearchline.cpp:245
+msgid "All Visible Columns"
+msgstr ""
+
+#: kdeui/klistviewsearchline.cpp:260
+msgid ""
+"_: Column number %1\n"
+"Column No. %1"
+msgstr ""
+
+#: kdeui/klistviewsearchline.cpp:455
+msgid "S&earch:"
+msgstr ""
+
+#: kdeui/ktimezonewidget.cpp:45
+msgid "Area"
+msgstr ""
+
+#: kab/addressbook.cc:295 kdeui/ktimezonewidget.cpp:47
+msgid "Comment"
+msgstr ""
+
+#: kdeui/kwizard.cpp:48
+msgid "&Back"
+msgstr ""
+
+#: kdeui/kwizard.cpp:49
+msgid ""
+"_: Opposite to Back\n"
+"&Next"
+msgstr ""
+
+#: kdeui/kcommand.cpp:151 kdeui/kcommand.cpp:166 kdeui/kcommand.cpp:199
+#: kdeui/kcommand.cpp:241
+#, c-format
+msgid "&Undo: %1"
+msgstr ""
+
+#: kdeui/kcommand.cpp:192 kdeui/kcommand.cpp:247
+#, c-format
+msgid "&Redo: %1"
+msgstr ""
+
+#: kdeui/kcommand.cpp:322
+#, c-format
+msgid "Undo: %1"
+msgstr ""
+
+#: kdeui/kcommand.cpp:341 kdeui/kcommand.cpp:346
+#, c-format
+msgid "Redo: %1"
+msgstr ""
+
+#: kdeui/kactionclasses.cpp:2072
+msgid "Exit F&ull Screen Mode"
+msgstr ""
+
+#: kdeui/kactionclasses.cpp:2077 kdeui/kstdaction_p.h:98
+msgid "F&ull Screen Mode"
+msgstr ""
+
+#: kdeui/ksystemtray.cpp:190
+msgid "<qt>Are you sure you want to quit <b>%1</b>?</qt>"
+msgstr ""
+
+#: kdeui/ksystemtray.cpp:193
+msgid "Confirm Quit From System Tray"
+msgstr ""
+
+#: kdeui/kauthicon.cpp:99
+msgid "Editing disabled"
+msgstr ""
+
+#: kdeui/kauthicon.cpp:100
+msgid "Editing enabled"
+msgstr ""
+
+#: kdeui/kdialogbase.cpp:636
+msgid "&Try"
+msgstr ""
+
+#: kdeui/kdialogbase.cpp:904
+msgid ""
+"If you press the <b>OK</b> button, all changes\n"
+"you made will be used to proceed."
+msgstr ""
+
+#: kdeui/kdialogbase.cpp:911
+msgid "Accept settings"
+msgstr ""
+
+#: kdeui/kdialogbase.cpp:932
+msgid ""
+"When clicking <b>Apply</b>, the settings will be\n"
+"handed over to the program, but the dialog\n"
+"will not be closed. Use this to try different settings. "
+msgstr ""
+
+#: kdeui/kdialogbase.cpp:941
+msgid "Apply settings"
+msgstr ""
+
+#: kdeui/kdialogbase.cpp:1130
+msgid "&Details"
+msgstr ""
+
+#: kdeui/kdialogbase.cpp:1538
+msgid "Get help..."
+msgstr ""
+
+#: kdeui/kspell.cpp:1176
+msgid "You have to restart the dialog for changes to take effect"
+msgstr ""
+
+#: kdeui/kspell.cpp:1402
+msgid "Spell Checker"
+msgstr ""
+
+#: kdeui/kshortcutdialog.cpp:68
+msgid "Configure Shortcut"
+msgstr ""
+
+#: kdeui/kshortcutdialog.cpp:71
+msgid "Advanced"
+msgstr ""
+
+#: kdeui/keditcl2.cpp:105 kdeui/keditcl2.cpp:375 kdeui/keditcl2.cpp:454
+msgid ""
+"End of document reached.\n"
+"Continue from the beginning?"
+msgstr ""
+
+#: kdeui/keditcl2.cpp:118 kdeui/keditcl2.cpp:388 kdeui/keditcl2.cpp:467
+msgid ""
+"Beginning of document reached.\n"
+"Continue from the end?"
+msgstr ""
+
+#: kdeui/keditcl2.cpp:711 kdeui/keditcl2.cpp:844
+msgid "Find:"
+msgstr ""
+
+#: kdeui/keditcl2.cpp:728 kdeui/keditcl2.cpp:868
+msgid "Case &sensitive"
+msgstr ""
+
+#: kdeui/keditcl2.cpp:833
+msgid "Replace &All"
+msgstr ""
+
+#: kdeui/keditcl2.cpp:852
+msgid "Replace with:"
+msgstr ""
+
+#: kdecore/kstdaccel.cpp:81 kdeui/keditcl2.cpp:976
+msgid "Go to Line"
+msgstr ""
+
+#: kdeui/keditcl2.cpp:984
+msgid "Go to line:"
+msgstr ""
+
+#: kdeui/ksyntaxhighlighter.cpp:477 kdeui/ksyntaxhighlighter.cpp:586
+msgid "As-you-type spell checking enabled."
+msgstr ""
+
+#: kdeui/ksyntaxhighlighter.cpp:479
+msgid "As-you-type spell checking disabled."
+msgstr ""
+
+#: kdeui/ksyntaxhighlighter.cpp:528
+msgid "Incremental Spellcheck"
+msgstr ""
+
+#: kdeui/ksyntaxhighlighter.cpp:588
+msgid "Too many misspelled words. As-you-type spell checking disabled."
+msgstr ""
+
+#: kdeui/kaboutkde.cpp:34
+msgid ""
+"The <b>K Desktop Environment</b> is written and maintained by the KDE Team, "
+"a world-wide network of software engineers committed to <a "
+"href=\"http://www.gnu.org/philosophy/free-sw.html\">Free Software</a> "
+"development.<br><br>No single group, company or organization controls the "
+"KDE source code. Everyone is welcome to contribute to KDE.<br><br>Visit <A "
+"HREF=\"http://www.kde.org/\">http://www.kde.org</A> for more information on "
+"the KDE project. "
+msgstr ""
+
+#: kdeui/kaboutkde.cpp:43
+msgid ""
+"Software can always be improved, and the KDE Team is ready to do so. "
+"However, you - the user - must tell us when something does not work as "
+"expected or could be done better.<br><br>The K Desktop Environment has a bug "
+"tracking system. Visit <A "
+"HREF=\"http://bugs.kde.org/\">http://bugs.kde.org</A> or use the \"Report "
+"Bug...\" dialog from the \"Help\" menu to report bugs.<br><br>If you have a "
+"suggestion for improvement then you are welcome to use the bug tracking "
+"system to register your wish. Make sure you use the severity called "
+"\"Wishlist\"."
+msgstr ""
+
+#: kdeui/kaboutkde.cpp:54
+msgid ""
+"You do not have to be a software developer to be a member of the KDE team. "
+"You can join the national teams that translate program interfaces. You can "
+"provide graphics, themes, sounds, and improved documentation. You "
+"decide!<br><br>Visit <A "
+"HREF=\"http://www.kde.org/jobs/\">http://www.kde.org/jobs/</A> for "
+"information on some projects in which you can participate.<br><br>If you "
+"need more information or documentation, then a visit to <A "
+"HREF=\"http://developer.kde.org/\">http://developer.kde.org</A> will provide "
+"you with what you need."
+msgstr ""
+
+#: kdeui/kaboutkde.cpp:67
+msgid ""
+"KDE is available free of charge, but making it is not free.<br><br>Thus, the "
+"KDE team formed the KDE e.V., a non-profit organization legally founded in "
+"Tuebingen, Germany. The KDE e.V. represents the KDE project in legal and "
+"financial matters. See <a "
+"href=\"http://www.kde-ev.org/\">http://www.kde-ev.org</a> for information on "
+"the KDE e.V.<br><br>The KDE team does need financial support. Most of the "
+"money is used to reimburse members and others on expenses they experienced "
+"when contributing to KDE. You are encouraged to support KDE through a "
+"financial donation, using one of the ways described at <a "
+"href=\"http://www.kde.org/support/\">http://www.kde.org/support/</a>.<br><br>"
+"Thank you very much in advance for your support."
+msgstr ""
+
+#: kdeui/kaboutkde.cpp:81
+#, c-format
+msgid "K Desktop Environment. Release %1"
+msgstr ""
+
+#: kdeui/kaboutkde.cpp:83
+msgid ""
+"_: About KDE\n"
+"&About"
+msgstr ""
+
+#: kdeui/kaboutkde.cpp:84
+msgid "&Report Bugs or Wishes"
+msgstr ""
+
+#: kdeui/kaboutkde.cpp:85
+msgid "&Join the KDE Team"
+msgstr ""
+
+#: kdeui/kaboutkde.cpp:86
+msgid "&Support KDE"
+msgstr ""
+
+#: kdeui/kcharselect.cpp:366
+msgid ""
+"_: Character\n"
+"<qt><font size=\"+4\" face=\"%1\">%2</font><br>Unicode code point: "
+"U+%3<br>(In decimal: %4)<br>(Character: %5)</qt>"
+msgstr ""
+
+#: kdeui/kcharselect.cpp:394
+msgid "Table:"
+msgstr ""
+
+#: kdeui/kcharselect.cpp:404
+msgid "&Unicode code point:"
+msgstr ""
+
+#: kdeui/ktoolbar.cpp:2040
+msgid "Toolbar Menu"
+msgstr ""
+
+#: kdeui/ktoolbar.cpp:2043
+msgid ""
+"_: toolbar position string\n"
+"Top"
+msgstr ""
+
+#: kdeui/ktoolbar.cpp:2044
+msgid ""
+"_: toolbar position string\n"
+"Left"
+msgstr ""
+
+#: kdeui/ktoolbar.cpp:2045
+msgid ""
+"_: toolbar position string\n"
+"Right"
+msgstr ""
+
+#: kdeui/ktoolbar.cpp:2046
+msgid ""
+"_: toolbar position string\n"
+"Bottom"
+msgstr ""
+
+#: kdeui/ktoolbar.cpp:2048
+msgid ""
+"_: toolbar position string\n"
+"Floating"
+msgstr ""
+
+#: kdeui/ktoolbar.cpp:2049
+msgid ""
+"_: min toolbar\n"
+"Flat"
+msgstr ""
+
+#: kdeui/ktoolbar.cpp:2052
+msgid "Icons Only"
+msgstr ""
+
+#: kdeui/ktoolbar.cpp:2053
+msgid "Text Only"
+msgstr ""
+
+#: kdeui/ktoolbar.cpp:2054
+msgid "Text Alongside Icons"
+msgstr ""
+
+#: kdeui/ktoolbar.cpp:2055
+msgid "Text Under Icons"
+msgstr ""
+
+#: kdeui/ktoolbar.cpp:2080 kdeui/ktoolbar.cpp:2101
+msgid "Small (%1x%2)"
+msgstr ""
+
+#: kdeui/ktoolbar.cpp:2082 kdeui/ktoolbar.cpp:2103
+msgid "Medium (%1x%2)"
+msgstr ""
+
+#: kdeui/ktoolbar.cpp:2084 kdeui/ktoolbar.cpp:2105
+msgid "Large (%1x%2)"
+msgstr ""
+
+#: kdeui/ktoolbar.cpp:2086 kdeui/ktoolbar.cpp:2107
+msgid "Huge (%1x%2)"
+msgstr ""
+
+#: kdeui/ktoolbar.cpp:2118
+msgid "Text Position"
+msgstr ""
+
+#: kdeui/ktoolbar.cpp:2120
+msgid "Icon Size"
+msgstr ""
+
+#: kdecore/kstdaccel.cpp:99 kdecore/kstdaccel.cpp:100 kdeui/klineedit.cpp:886
+msgid "Text Completion"
+msgstr ""
+
+#: kdeui/klineedit.cpp:890
+msgid "Manual"
+msgstr ""
+
+#: kdeui/klineedit.cpp:891
+msgid "Automatic"
+msgstr ""
+
+#: kdeui/klineedit.cpp:892
+msgid "Dropdown List"
+msgstr ""
+
+#: kdeui/klineedit.cpp:893
+msgid "Short Automatic"
+msgstr ""
+
+#: kdeui/klineedit.cpp:894
+msgid "Dropdown List && Automatic"
+msgstr ""
+
+#: kdeui/kpixmapregionselectorwidget.cpp:141
+msgid "Image Operations"
+msgstr ""
+
+#: kdeui/kpixmapregionselectorwidget.cpp:143
+msgid "&Rotate Clockwise"
+msgstr ""
+
+#: kdeui/kpixmapregionselectorwidget.cpp:148
+msgid "Rotate &Counterclockwise"
+msgstr ""
+
+#: kdeui/kedittoolbar.cpp:49
+msgid "--- line separator ---"
+msgstr ""
+
+#: kdeui/kedittoolbar.cpp:50
+msgid "--- separator ---"
+msgstr ""
+
+#: kdeui/kedittoolbar.cpp:380 kdeui/kedittoolbar.cpp:392
+#: kdeui/kedittoolbar.cpp:402 kdeui/kedittoolbar.cpp:411
+msgid "Configure Toolbars"
+msgstr ""
+
+#: kdeui/kedittoolbar.cpp:447
+msgid ""
+"Do you really want to reset all toolbars of this application to their "
+"default? The changes will be applied immediately."
+msgstr ""
+
+#: kdeui/kedittoolbar.cpp:447
+msgid "Reset Toolbars"
+msgstr ""
+
+#: kdeui/kedittoolbar.cpp:761
+msgid "&Toolbar:"
+msgstr ""
+
+#: kdeui/kedittoolbar.cpp:777
+msgid "A&vailable actions:"
+msgstr ""
+
+#: kdeui/kedittoolbar.cpp:795
+msgid "Curr&ent actions:"
+msgstr ""
+
+#: kdeui/kedittoolbar.cpp:818
+msgid "Change &Icon..."
+msgstr ""
+
+#: kdeui/kedittoolbar.cpp:991
+msgid ""
+"This element will be replaced with all the elements of an embedded component."
+msgstr ""
+
+#: kdeui/kedittoolbar.cpp:993
+msgid "<Merge>"
+msgstr ""
+
+#: kdeui/kedittoolbar.cpp:995
+msgid "<Merge %1>"
+msgstr ""
+
+#: kdeui/kedittoolbar.cpp:1001
+msgid ""
+"This is a dynamic list of actions. You can move it, but if you remove it you "
+"won't be able to re-add it."
+msgstr ""
+
+#: kdeui/kedittoolbar.cpp:1002
+#, c-format
+msgid "ActionList: %1"
+msgstr ""
+
+#: kdeui/kstdguiitem.cpp:120
+msgid "Discard changes"
+msgstr ""
+
+#: kdeui/kstdguiitem.cpp:121
+msgid ""
+"Pressing this button will discard all recent changes made in this dialog"
+msgstr ""
+
+#: kdeui/kstdguiitem.cpp:127
+msgid "Save data"
+msgstr ""
+
+#: kdeui/kstdguiitem.cpp:132
+msgid "&Do Not Save"
+msgstr ""
+
+#: kdeui/kstdguiitem.cpp:133
+msgid "Don't save data"
+msgstr ""
+
+#: kdeui/kstdaction_p.h:44 kdeui/kstdguiitem.cpp:138
+msgid "Save &As..."
+msgstr ""
+
+#: kdeui/kstdguiitem.cpp:139
+msgid "Save file with another name"
+msgstr ""
+
+#: kdeui/kstdguiitem.cpp:144
+msgid "Apply changes"
+msgstr ""
+
+#: kdeui/kstdguiitem.cpp:145
+msgid ""
+"When clicking <b>Apply</b>, the settings will be handed over to the program, "
+"but the dialog will not be closed.\n"
+"Use this to try different settings."
+msgstr ""
+
+#: kdeui/kstdguiitem.cpp:153
+msgid "Administrator &Mode..."
+msgstr ""
+
+#: kdeui/kstdguiitem.cpp:153
+msgid "Enter Administrator Mode"
+msgstr ""
+
+#: kdeui/kstdguiitem.cpp:154
+msgid ""
+"When clicking <b>Administrator Mode</b> you will be prompted for the "
+"administrator (root) password in order to make changes which require root "
+"privileges."
+msgstr ""
+
+#: kdeui/kstdguiitem.cpp:162
+msgid "Clear input"
+msgstr ""
+
+#: kdeui/kstdguiitem.cpp:163
+msgid "Clear the input in the edit field"
+msgstr ""
+
+#: kdeui/kstdguiitem.cpp:169
+msgid "Show help"
+msgstr ""
+
+#: kdeui/kstdguiitem.cpp:175
+msgid "Close the current window or document"
+msgstr ""
+
+#: kdeui/kstdguiitem.cpp:181
+msgid "Reset all items to their default values"
+msgstr ""
+
+#: kdeui/kstdguiitem.cpp:189
+msgid "Go back one step"
+msgstr ""
+
+#: kdeui/kstdguiitem.cpp:197
+msgid "Go forward one step"
+msgstr ""
+
+#: kdeui/kstdguiitem.cpp:208
+msgid "Opens the print dialog to print the current document"
+msgstr ""
+
+#: kdeui/kstdguiitem.cpp:214
+msgid "C&ontinue"
+msgstr ""
+
+#: kdeui/kstdguiitem.cpp:215
+msgid "Continue operation"
+msgstr ""
+
+#: kdeui/kstdguiitem.cpp:221
+msgid "Delete item(s)"
+msgstr ""
+
+#: kdeui/kstdguiitem.cpp:227
+msgid "Open file"
+msgstr ""
+
+#: kdeui/kstdguiitem.cpp:233
+msgid "Quit application"
+msgstr ""
+
+#: kdeui/kstdguiitem.cpp:238
+msgid "&Reset"
+msgstr ""
+
+#: kdeui/kstdguiitem.cpp:239
+msgid "Reset configuration"
+msgstr ""
+
+#: kdeui/kstdguiitem.cpp:244
+msgid ""
+"_: Verb\n"
+"&Insert"
+msgstr ""
+
+#: kdeui/kstdguiitem.cpp:249
+msgid "Confi&gure..."
+msgstr ""
+
+#: kdeui/kstdguiitem.cpp:274
+msgid "Test"
+msgstr ""
+
+#: kdeui/kstdguiitem.cpp:284
+msgid "&Overwrite"
+msgstr ""
+
+#: kdeui/ksconfig.cpp:102
+msgid "Create &root/affix combinations not in dictionary"
+msgstr ""
+
+#: kdeui/ksconfig.cpp:107
+msgid "Consider run-together &words as spelling errors"
+msgstr ""
+
+#: kdeui/ksconfig.cpp:118
+msgid "&Dictionary:"
+msgstr ""
+
+#: kdeui/ksconfig.cpp:143
+msgid "&Encoding:"
+msgstr ""
+
+#: kdeui/ksconfig.cpp:148
+msgid "International Ispell"
+msgstr ""
+
+#: kdeui/ksconfig.cpp:149
+msgid "Aspell"
+msgstr ""
+
+#: kdeui/ksconfig.cpp:150
+msgid "Hspell"
+msgstr ""
+
+#: kdeui/ksconfig.cpp:151
+msgid "Zemberek"
+msgstr ""
+
+#: kdeui/ksconfig.cpp:156
+msgid "&Client:"
+msgstr ""
+
+#: kdeui/ksconfig.cpp:297
+msgid "Spanish"
+msgstr ""
+
+#: kdeui/ksconfig.cpp:300
+msgid "Danish"
+msgstr ""
+
+#: kdeui/ksconfig.cpp:303
+msgid "German"
+msgstr ""
+
+#: kdeui/ksconfig.cpp:306
+msgid "German (new spelling)"
+msgstr ""
+
+#: kdeui/ksconfig.cpp:309
+msgid "Brazilian Portuguese"
+msgstr ""
+
+#: kdeui/ksconfig.cpp:312
+msgid "Portuguese"
+msgstr ""
+
+#: kdeui/ksconfig.cpp:315
+msgid "Esperanto"
+msgstr ""
+
+#: kdeui/ksconfig.cpp:318
+msgid "Norwegian"
+msgstr ""
+
+#: kdeui/ksconfig.cpp:321
+msgid "Polish"
+msgstr ""
+
+#: kdeui/ksconfig.cpp:327
+msgid "Slovenian"
+msgstr ""
+
+#: kdeui/ksconfig.cpp:330
+msgid "Slovak"
+msgstr ""
+
+#: kdeui/ksconfig.cpp:333
+msgid "Czech"
+msgstr ""
+
+#: kdeui/ksconfig.cpp:336
+msgid "Swedish"
+msgstr ""
+
+#: kdeui/ksconfig.cpp:339
+msgid "Swiss German"
+msgstr ""
+
+#: kdeui/ksconfig.cpp:345
+msgid "Lithuanian"
+msgstr ""
+
+#: kdeui/ksconfig.cpp:348
+msgid "French"
+msgstr ""
+
+#: kdeui/ksconfig.cpp:351
+msgid "Belarusian"
+msgstr ""
+
+#: kdeui/ksconfig.cpp:354
+msgid "Hungarian"
+msgstr ""
+
+#: kdeui/ksconfig.cpp:358
+msgid ""
+"_: Unknown ispell dictionary\n"
+"Unknown"
+msgstr ""
+
+#: kdeui/ksconfig.cpp:440 kdeui/ksconfig.cpp:590
+msgid "ISpell Default"
+msgstr ""
+
+#: kdeui/ksconfig.cpp:486 kdeui/ksconfig.cpp:636
+msgid ""
+"_: default spelling dictionary\n"
+"Default - %1 [%2]"
+msgstr ""
+
+#: kdeui/ksconfig.cpp:506 kdeui/ksconfig.cpp:662
+msgid "ASpell Default"
+msgstr ""
+
+#: kdeui/ksconfig.cpp:569 kdeui/ksconfig.cpp:725
+#, c-format
+msgid ""
+"_: default spelling dictionary\n"
+"Default - %1"
+msgstr ""
+
+#: kunittest/modrunner.cpp:36
+msgid "A command-line application that can be used to run KUnitTest modules."
+msgstr ""
+
+#: kunittest/modrunner.cpp:42
+msgid "Only run modules whose filenames match the regexp."
+msgstr ""
+
+#: kunittest/modrunner.cpp:43
+msgid ""
+"Only run tests modules which are found in the folder. Use the query option "
+"to select modules."
+msgstr ""
+
+#: kunittest/modrunner.cpp:44
+msgid ""
+"Disables debug capturing. You typically use this option when you use the GUI."
+msgstr ""
+
+#: kunittest/modrunner.cpp:53
+msgid "KUnitTest ModRunner"
+msgstr ""
+
+#: kconf_update/kconf_update.cpp:43
+msgid "Keep output results from scripts"
+msgstr ""
+
+#: kconf_update/kconf_update.cpp:44
+msgid "Check whether config file itself requires updating"
+msgstr ""
+
+#: kconf_update/kconf_update.cpp:45
+msgid "File to read update instructions from"
+msgstr ""
+
+#: kconf_update/kconf_update.cpp:142
+msgid "Only local files are supported."
+msgstr ""
+
+#: kconf_update/kconf_update.cpp:943
+msgid "KConf Update"
+msgstr ""
+
+#: kconf_update/kconf_update.cpp:945
+msgid "KDE Tool for updating user configuration files"
+msgstr ""
+
+#: kdecore/kaboutdata.cpp:388
+msgid ""
+"_: replace this with information about your translation team\n"
+"<p>KDE is translated into many languages thanks to the work of the "
+"translation teams all over the world.</p><p>For more information on KDE "
+"internationalization visit <a "
+"href=\"http://l10n.kde.org\">http://l10n.kde.org</a></p>"
+msgstr ""
+
+#: kdecore/kaboutdata.cpp:392
+msgid ""
+"<p>Kubuntu includes additions and alterations to the KDE translation from <a "
+"href=\"https://translations.launchpad.net/\">Launchpad</a>.</p>"
+msgstr ""
+
+#: kdecore/kaboutdata.cpp:444
+msgid ""
+"No licensing terms for this program have been specified.\n"
+"Please check the documentation or the source for any\n"
+"licensing terms.\n"
+msgstr ""
+
+#: kdecore/kaboutdata.cpp:451
+#, c-format
+msgid "This program is distributed under the terms of the %1."
+msgstr ""
+
+#: kdecore/klibloader.cpp:157
+msgid "The library %1 does not offer an %2 function."
+msgstr ""
+
+#: kdecore/klibloader.cpp:168
+msgid "The library %1 does not offer a KDE compatible factory."
+msgstr ""
+
+#: kdecore/klibloader.cpp:425
+msgid "Library files for \"%1\" not found in paths."
+msgstr ""
+
+#: kdecore/netsupp.cpp:890 kdecore/network/kresolver.cpp:557
+msgid "no error"
+msgstr ""
+
+#: kdecore/netsupp.cpp:891
+msgid "address family for nodename not supported"
+msgstr ""
+
+#: kdecore/netsupp.cpp:892 kdecore/network/kresolver.cpp:559
+msgid "temporary failure in name resolution"
+msgstr ""
+
+#: kdecore/netsupp.cpp:893
+msgid "invalid value for 'ai_flags'"
+msgstr ""
+
+#: kdecore/netsupp.cpp:894 kdecore/network/kresolver.cpp:560
+msgid "non-recoverable failure in name resolution"
+msgstr ""
+
+#: kdecore/netsupp.cpp:895
+msgid "'ai_family' not supported"
+msgstr ""
+
+#: kdecore/netsupp.cpp:896 kdecore/network/kresolver.cpp:562
+msgid "memory allocation failure"
+msgstr ""
+
+#: kdecore/netsupp.cpp:897
+msgid "no address associated with nodename"
+msgstr ""
+
+#: kdecore/netsupp.cpp:898 kdecore/network/kresolver.cpp:563
+msgid "name or service not known"
+msgstr ""
+
+#: kdecore/netsupp.cpp:899
+msgid "servname not supported for ai_socktype"
+msgstr ""
+
+#: kdecore/netsupp.cpp:900
+msgid "'ai_socktype' not supported"
+msgstr ""
+
+#: kdecore/netsupp.cpp:901
+msgid "system error"
+msgstr ""
+
+#: kdecore/kcheckaccelerators.cpp:148
+msgid "Dr. Klash' Accelerator Diagnosis"
+msgstr ""
+
+#: kdecore/kcheckaccelerators.cpp:155
+msgid "&Disable automatic checking"
+msgstr ""
+
+#: kdecore/kcheckaccelerators.cpp:193
+msgid "<h2>Accelerators changed</h2>"
+msgstr ""
+
+#: kdecore/kcheckaccelerators.cpp:199
+msgid "<h2>Accelerators removed</h2>"
+msgstr ""
+
+#: kdecore/kcheckaccelerators.cpp:204
+msgid "<h2>Accelerators added (just for your info)</h2>"
+msgstr ""
+
+#: kdecore/klocale.cpp:225
+msgid ""
+"_: Dear translator, please do not translate this string in any form, but "
+"pick the _right_ value out of NoPlural/TwoForms/French... If not sure what "
+"to do mail thd@kde.org and coolo@kde.org, they will tell you. Better leave "
+"that out if unsure, the programs will crash!!\n"
+"Definition of PluralForm - to be set by the translator of kdelibs.po"
+msgstr ""
+
+#: kdecore/kcalendarsystemgregorian.cpp:91 kdecore/klocale.cpp:561
+msgid ""
+"_: January\n"
+"Jan"
+msgstr ""
+
+#: kdecore/kcalendarsystemgregorian.cpp:93 kdecore/klocale.cpp:562
+msgid ""
+"_: February\n"
+"Feb"
+msgstr ""
+
+#: kdecore/kcalendarsystemgregorian.cpp:95 kdecore/klocale.cpp:563
+msgid ""
+"_: March\n"
+"Mar"
+msgstr ""
+
+#: kdecore/kcalendarsystemgregorian.cpp:97 kdecore/klocale.cpp:564
+msgid ""
+"_: April\n"
+"Apr"
+msgstr ""
+
+#: kdecore/kcalendarsystemgregorian.cpp:99 kdecore/klocale.cpp:565
+msgid ""
+"_: May short\n"
+"May"
+msgstr ""
+
+#: kdecore/kcalendarsystemgregorian.cpp:101 kdecore/klocale.cpp:566
+msgid ""
+"_: June\n"
+"Jun"
+msgstr ""
+
+#: kdecore/kcalendarsystemgregorian.cpp:103 kdecore/klocale.cpp:567
+msgid ""
+"_: July\n"
+"Jul"
+msgstr ""
+
+#: kdecore/kcalendarsystemgregorian.cpp:105 kdecore/klocale.cpp:568
+msgid ""
+"_: August\n"
+"Aug"
+msgstr ""
+
+#: kdecore/kcalendarsystemgregorian.cpp:107 kdecore/klocale.cpp:569
+msgid ""
+"_: September\n"
+"Sep"
+msgstr ""
+
+#: kdecore/kcalendarsystemgregorian.cpp:109 kdecore/klocale.cpp:570
+msgid ""
+"_: October\n"
+"Oct"
+msgstr ""
+
+#: kdecore/kcalendarsystemgregorian.cpp:111 kdecore/klocale.cpp:571
+msgid ""
+"_: November\n"
+"Nov"
+msgstr ""
+
+#: kdecore/kcalendarsystemgregorian.cpp:113 kdecore/klocale.cpp:572
+msgid ""
+"_: December\n"
+"Dec"
+msgstr ""
+
+#: kdecore/kcalendarsystemgregorian.cpp:119 kdecore/klocale.cpp:577
+msgid "January"
+msgstr ""
+
+#: kdecore/kcalendarsystemgregorian.cpp:121 kdecore/klocale.cpp:578
+msgid "February"
+msgstr ""
+
+#: kdecore/kcalendarsystemgregorian.cpp:123 kdecore/klocale.cpp:579
+msgid "March"
+msgstr ""
+
+#: kdecore/kcalendarsystemgregorian.cpp:125 kdecore/klocale.cpp:580
+msgid "April"
+msgstr ""
+
+#: kdecore/kcalendarsystemgregorian.cpp:127 kdecore/klocale.cpp:581
+msgid ""
+"_: May long\n"
+"May"
+msgstr ""
+
+#: kdecore/kcalendarsystemgregorian.cpp:129 kdecore/klocale.cpp:582
+msgid "June"
+msgstr ""
+
+#: kdecore/kcalendarsystemgregorian.cpp:131 kdecore/klocale.cpp:583
+msgid "July"
+msgstr ""
+
+#: kdecore/kcalendarsystemgregorian.cpp:133 kdecore/klocale.cpp:584
+msgid "August"
+msgstr ""
+
+#: kdecore/kcalendarsystemgregorian.cpp:135 kdecore/klocale.cpp:585
+msgid "September"
+msgstr ""
+
+#: kdecore/kcalendarsystemgregorian.cpp:137 kdecore/klocale.cpp:586
+msgid "October"
+msgstr ""
+
+#: kdecore/kcalendarsystemgregorian.cpp:139 kdecore/klocale.cpp:587
+msgid "November"
+msgstr ""
+
+#: kdecore/kcalendarsystemgregorian.cpp:141 kdecore/klocale.cpp:588
+msgid "December"
+msgstr ""
+
+#: kdecore/kcalendarsystemgregorian.cpp:156 kdecore/klocale.cpp:599
+msgid ""
+"_: of January\n"
+"of Jan"
+msgstr ""
+
+#: kdecore/kcalendarsystemgregorian.cpp:158 kdecore/klocale.cpp:600
+msgid ""
+"_: of February\n"
+"of Feb"
+msgstr ""
+
+#: kdecore/kcalendarsystemgregorian.cpp:160 kdecore/klocale.cpp:601
+msgid ""
+"_: of March\n"
+"of Mar"
+msgstr ""
+
+#: kdecore/kcalendarsystemgregorian.cpp:162 kdecore/klocale.cpp:602
+msgid ""
+"_: of April\n"
+"of Apr"
+msgstr ""
+
+#: kdecore/kcalendarsystemgregorian.cpp:164 kdecore/klocale.cpp:603
+msgid ""
+"_: of May short\n"
+"of May"
+msgstr ""
+
+#: kdecore/kcalendarsystemgregorian.cpp:166 kdecore/klocale.cpp:604
+msgid ""
+"_: of June\n"
+"of Jun"
+msgstr ""
+
+#: kdecore/kcalendarsystemgregorian.cpp:168 kdecore/klocale.cpp:605
+msgid ""
+"_: of July\n"
+"of Jul"
+msgstr ""
+
+#: kdecore/kcalendarsystemgregorian.cpp:170 kdecore/klocale.cpp:606
+msgid ""
+"_: of August\n"
+"of Aug"
+msgstr ""
+
+#: kdecore/kcalendarsystemgregorian.cpp:172 kdecore/klocale.cpp:607
+msgid ""
+"_: of September\n"
+"of Sep"
+msgstr ""
+
+#: kdecore/kcalendarsystemgregorian.cpp:174 kdecore/klocale.cpp:608
+msgid ""
+"_: of October\n"
+"of Oct"
+msgstr ""
+
+#: kdecore/kcalendarsystemgregorian.cpp:176 kdecore/klocale.cpp:609
+msgid ""
+"_: of November\n"
+"of Nov"
+msgstr ""
+
+#: kdecore/kcalendarsystemgregorian.cpp:178 kdecore/klocale.cpp:610
+msgid ""
+"_: of December\n"
+"of Dec"
+msgstr ""
+
+#: kdecore/kcalendarsystemgregorian.cpp:184 kdecore/klocale.cpp:615
+msgid "of January"
+msgstr ""
+
+#: kdecore/kcalendarsystemgregorian.cpp:186 kdecore/klocale.cpp:616
+msgid "of February"
+msgstr ""
+
+#: kdecore/kcalendarsystemgregorian.cpp:188 kdecore/klocale.cpp:617
+msgid "of March"
+msgstr ""
+
+#: kdecore/kcalendarsystemgregorian.cpp:190 kdecore/klocale.cpp:618
+msgid "of April"
+msgstr ""
+
+#: kdecore/kcalendarsystemgregorian.cpp:192 kdecore/klocale.cpp:619
+msgid ""
+"_: of May long\n"
+"of May"
+msgstr ""
+
+#: kdecore/kcalendarsystemgregorian.cpp:194 kdecore/klocale.cpp:620
+msgid "of June"
+msgstr ""
+
+#: kdecore/kcalendarsystemgregorian.cpp:196 kdecore/klocale.cpp:621
+msgid "of July"
+msgstr ""
+
+#: kdecore/kcalendarsystemgregorian.cpp:198 kdecore/klocale.cpp:622
+msgid "of August"
+msgstr ""
+
+#: kdecore/kcalendarsystemgregorian.cpp:200 kdecore/klocale.cpp:623
+msgid "of September"
+msgstr ""
+
+#: kdecore/kcalendarsystemgregorian.cpp:202 kdecore/klocale.cpp:624
+msgid "of October"
+msgstr ""
+
+#: kdecore/kcalendarsystemgregorian.cpp:204 kdecore/klocale.cpp:625
+msgid "of November"
+msgstr ""
+
+#: kdecore/kcalendarsystemgregorian.cpp:206 kdecore/klocale.cpp:626
+msgid "of December"
+msgstr ""
+
+#: kdecore/klocale.cpp:1781 kdecore/klocale.cpp:1921
+msgid "pm"
+msgstr ""
+
+#: kdecore/klocale.cpp:1790 kdecore/klocale.cpp:1923
+msgid "am"
+msgstr ""
+
+#: kdecore/klocale.cpp:1964
+msgid ""
+"_: concatenation of dates and time\n"
+"%1 %2"
+msgstr ""
+
+#: kdecore/klocale.cpp:2455
+msgid "&Next"
+msgstr ""
+
+#: kdecore/kconfigbackend.cpp:1158 kdecore/kconfigbackend.cpp:1167
+msgid "Will not save configuration.\n"
+msgstr ""
+
+#: kdecore/kconfigbackend.cpp:1160 kdecore/kconfigbackend.cpp:1168
+msgid "Configuration file \"%1\" not writable.\n"
+msgstr ""
+
+#: kdecore/kconfigbackend.cpp:1175
+msgid "Please contact your system administrator."
+msgstr ""
+
+#: kdecore/ksocks.cpp:135
+msgid "NEC SOCKS client"
+msgstr ""
+
+#: kdecore/ksocks.cpp:170
+msgid "Dante SOCKS client"
+msgstr ""
+
+#: kdecore/kstdaccel.cpp:54
+msgid "New"
+msgstr ""
+
+#: kdecore/kstdaccel.cpp:65
+msgid "Paste Selection"
+msgstr ""
+
+#: kdecore/kstdaccel.cpp:67
+msgid "Deselect"
+msgstr ""
+
+#: kdecore/kstdaccel.cpp:68
+msgid "Delete Word Backwards"
+msgstr ""
+
+#: kdecore/kstdaccel.cpp:69
+msgid "Delete Word Forward"
+msgstr ""
+
+#: kdecore/kstdaccel.cpp:72
+msgid "Find Prev"
+msgstr ""
+
+#: kdecore/kstdaccel.cpp:74
+msgid "Navigation"
+msgstr ""
+
+#: kdecore/kstdaccel.cpp:75
+msgid ""
+"_: Opposite to End\n"
+"Home"
+msgstr ""
+
+#: kdecore/kstdaccel.cpp:76
+msgid "End"
+msgstr ""
+
+#: kdecore/kstdaccel.cpp:77
+msgid "Beginning of Line"
+msgstr ""
+
+#: kdecore/kstdaccel.cpp:79
+msgid "Prior"
+msgstr ""
+
+#: kdecore/kstdaccel.cpp:80
+msgid ""
+"_: Opposite to Prior\n"
+"Next"
+msgstr ""
+
+#: kdecore/kstdaccel.cpp:82
+msgid "Add Bookmark"
+msgstr ""
+
+#: kdecore/kstdaccel.cpp:83
+msgid "Zoom In"
+msgstr ""
+
+#: kdecore/kstdaccel.cpp:84
+msgid "Zoom Out"
+msgstr ""
+
+#: kdecore/kstdaccel.cpp:85
+msgid "Up"
+msgstr ""
+
+#: kdecore/kstdaccel.cpp:87
+msgid "Forward"
+msgstr ""
+
+#: kdecore/kstdaccel.cpp:89
+msgid "Popup Menu Context"
+msgstr ""
+
+#: kdecore/kstdaccel.cpp:90
+msgid "Show Menu Bar"
+msgstr ""
+
+#: kdecore/kstdaccel.cpp:91
+msgid "Backward Word"
+msgstr ""
+
+#: kdecore/kstdaccel.cpp:92
+msgid "Forward Word"
+msgstr ""
+
+#: kdecore/kstdaccel.cpp:93
+msgid "Activate Next Tab"
+msgstr ""
+
+#: kdecore/kstdaccel.cpp:94
+msgid "Activate Previous Tab"
+msgstr ""
+
+#: kdecore/kstdaccel.cpp:95
+msgid "Full Screen Mode"
+msgstr ""
+
+#: kdecore/kstdaccel.cpp:98
+msgid "What's This"
+msgstr ""
+
+#: kdecore/kstdaccel.cpp:101
+msgid "Previous Completion Match"
+msgstr ""
+
+#: kdecore/kstdaccel.cpp:102
+msgid "Next Completion Match"
+msgstr ""
+
+#: kdecore/kstdaccel.cpp:103
+msgid "Substring Completion"
+msgstr ""
+
+#: kdecore/kstdaccel.cpp:104
+msgid "Previous Item in List"
+msgstr ""
+
+#: kdecore/kstdaccel.cpp:105
+msgid "Next Item in List"
+msgstr ""
+
+#: kdecore/kcmdlineargs.cpp:498 kdecore/kcmdlineargs.cpp:514
+msgid "Unknown option '%1'."
+msgstr ""
+
+#: kdecore/kcmdlineargs.cpp:522
+msgid "'%1' missing."
+msgstr ""
+
+#: kdecore/kcmdlineargs.cpp:617
+msgid ""
+"_: the 2nd argument is a list of name+address, one on each line\n"
+"%1 was written by\n"
+"%2"
+msgstr ""
+
+#: kdecore/kcmdlineargs.cpp:620
+msgid "This application was written by somebody who wants to remain anonymous."
+msgstr ""
+
+#: kdecore/kcmdlineargs.cpp:627
+msgid "Please use http://bugs.kde.org to report bugs.\n"
+msgstr ""
+
+#: kdecore/kcmdlineargs.cpp:630 kdecore/kcmdlineargs.cpp:632
+msgid "Please report bugs to %1.\n"
+msgstr ""
+
+#: kdecore/kcmdlineargs.cpp:658
+msgid "Unexpected argument '%1'."
+msgstr ""
+
+#: kdecore/kcmdlineargs.cpp:763
+msgid "Use --help to get a list of available command line options."
+msgstr ""
+
+#: kdecore/kcmdlineargs.cpp:778
+msgid ""
+"\n"
+"%1:\n"
+msgstr ""
+
+#: kdecore/kcmdlineargs.cpp:787
+msgid "[options] "
+msgstr ""
+
+#: kdecore/kcmdlineargs.cpp:794
+msgid "[%1-options]"
+msgstr ""
+
+#: kdecore/kcmdlineargs.cpp:814
+msgid "Usage: %1 %2\n"
+msgstr ""
+
+#: kdecore/kcmdlineargs.cpp:817
+msgid "Generic options"
+msgstr ""
+
+#: kdecore/kcmdlineargs.cpp:818
+msgid "Show help about options"
+msgstr ""
+
+#: kdecore/kcmdlineargs.cpp:826
+msgid "Show %1 specific options"
+msgstr ""
+
+#: kdecore/kcmdlineargs.cpp:833
+msgid "Show all options"
+msgstr ""
+
+#: kdecore/kcmdlineargs.cpp:834
+msgid "Show author information"
+msgstr ""
+
+#: kdecore/kcmdlineargs.cpp:835
+msgid "Show version information"
+msgstr ""
+
+#: kdecore/kcmdlineargs.cpp:836
+msgid "Show license information"
+msgstr ""
+
+#: kdecore/kcmdlineargs.cpp:837
+msgid "End of options"
+msgstr ""
+
+#: kdecore/kcmdlineargs.cpp:859
+msgid "%1 options"
+msgstr ""
+
+#: kdecore/kcmdlineargs.cpp:861
+msgid ""
+"\n"
+"Options:\n"
+msgstr ""
+
+#: kdecore/kcmdlineargs.cpp:918
+msgid ""
+"\n"
+"Arguments:\n"
+msgstr ""
+
+#: kdecore/kcmdlineargs.cpp:1279
+msgid "The files/URLs opened by the application will be deleted after use"
+msgstr ""
+
+#: kdecore/ksockaddr.cpp:112
+msgid "<unknown socket>"
+msgstr ""
+
+#: kdecore/ksockaddr.cpp:568 kdecore/ksockaddr.cpp:587
+msgid "<empty>"
+msgstr ""
+
+#: kdecore/ksockaddr.cpp:571
+msgid ""
+"_: 1: hostname, 2: port number\n"
+"%1 port %2"
+msgstr ""
+
+#: kdecore/ksockaddr.cpp:853
+msgid "<empty UNIX socket>"
+msgstr ""
+
+#: kdecore/kglobalsettings.cpp:494
+msgid "Trash"
+msgstr ""
+
+#: kdecore/kcalendarsystemhebrew.cpp:402
+msgid "Tishrey"
+msgstr ""
+
+#: kdecore/kcalendarsystemhebrew.cpp:404
+msgid "Heshvan"
+msgstr ""
+
+#: kdecore/kcalendarsystemhebrew.cpp:406
+msgid "Kislev"
+msgstr ""
+
+#: kdecore/kcalendarsystemhebrew.cpp:408
+msgid "Tevet"
+msgstr ""
+
+#: kdecore/kcalendarsystemhebrew.cpp:410
+msgid "Shvat"
+msgstr ""
+
+#: kdecore/kcalendarsystemhebrew.cpp:412
+msgid "Adar"
+msgstr ""
+
+#: kdecore/kcalendarsystemhebrew.cpp:414
+msgid "Nisan"
+msgstr ""
+
+#: kdecore/kcalendarsystemhebrew.cpp:416
+msgid "Iyar"
+msgstr ""
+
+#: kdecore/kcalendarsystemhebrew.cpp:418
+msgid "Sivan"
+msgstr ""
+
+#: kdecore/kcalendarsystemhebrew.cpp:420
+msgid "Tamuz"
+msgstr ""
+
+#: kdecore/kcalendarsystemhebrew.cpp:422
+msgid "Av"
+msgstr ""
+
+#: kdecore/kcalendarsystemhebrew.cpp:424
+msgid "Elul"
+msgstr ""
+
+#: kdecore/kcalendarsystemhebrew.cpp:426
+msgid "Adar I"
+msgstr ""
+
+#: kdecore/kcalendarsystemhebrew.cpp:428
+msgid "Adar II"
+msgstr ""
+
+#: kdecore/kkeyserver_x11.cpp:113
+msgid "Win"
+msgstr ""
+
+#: kdecore/kkeyserver_x11.cpp:119
+msgid "Backspace"
+msgstr ""
+
+#: kdecore/kkeyserver_x11.cpp:120
+msgid "SysReq"
+msgstr ""
+
+#: kdecore/kkeyserver_x11.cpp:121
+msgid "CapsLock"
+msgstr ""
+
+#: kdecore/kkeyserver_x11.cpp:122
+msgid "NumLock"
+msgstr ""
+
+#: kdecore/kkeyserver_x11.cpp:123
+msgid "ScrollLock"
+msgstr ""
+
+#: kdecore/kkeyserver_x11.cpp:124
+msgid "PageUp"
+msgstr ""
+
+#: kdecore/kkeyserver_x11.cpp:125
+msgid "PageDown"
+msgstr ""
+
+#: kdecore/kkeyserver_x11.cpp:128
+msgid "Again"
+msgstr ""
+
+#: kdecore/kkeyserver_x11.cpp:129
+msgid "Props"
+msgstr ""
+
+#: kdecore/kkeyserver_x11.cpp:131
+msgid "Front"
+msgstr ""
+
+#: kdecore/kcompletion.cpp:632
+msgid ""
+"You reached the end of the list\n"
+"of matching items.\n"
+msgstr ""
+
+#: kdecore/kcompletion.cpp:638
+msgid ""
+"The completion is ambiguous, more than one\n"
+"match is available.\n"
+msgstr ""
+
+#: kdecore/kcompletion.cpp:644
+msgid "There is no matching item available.\n"
+msgstr ""
+
+#: kdecore/kcharsets.cpp:47
+msgid "Chinese Simplified"
+msgstr ""
+
+#: kdecore/kcharsets.cpp:48
+msgid "Chinese Traditional"
+msgstr ""
+
+#: kdecore/kcharsets.cpp:49
+msgid "Cyrillic"
+msgstr ""
+
+#: kdecore/kcharsets.cpp:53
+msgid "Korean"
+msgstr ""
+
+#: kdecore/kcharsets.cpp:54
+msgid "Thai"
+msgstr ""
+
+#: kdecore/kcharsets.cpp:57
+msgid "Tamil"
+msgstr ""
+
+#: kdecore/kcharsets.cpp:58
+msgid "Unicode"
+msgstr ""
+
+#: kdecore/kcharsets.cpp:59
+msgid "Northern Saami"
+msgstr ""
+
+#: kdecore/kcharsets.cpp:60
+msgid "Vietnamese"
+msgstr ""
+
+#: kdecore/kcharsets.cpp:61
+msgid "South-Eastern Europe"
+msgstr ""
+
+#: kdecore/kcharsets.cpp:516
+msgid ""
+"_: Descriptive Encoding Name\n"
+"%1 ( %2 )"
+msgstr ""
+
+#: kdecore/kcalendarsystemjalali.cpp:392
+msgid "Far"
+msgstr ""
+
+#: kdecore/kcalendarsystemjalali.cpp:394
+msgid "Ord"
+msgstr ""
+
+#: kdecore/kcalendarsystemjalali.cpp:396
+msgid "Kho"
+msgstr ""
+
+#: kdecore/kcalendarsystemjalali.cpp:398 kdecore/kcalendarsystemjalali.cpp:426
+msgid "Tir"
+msgstr ""
+
+#: kdecore/kcalendarsystemjalali.cpp:400
+msgid "Mor"
+msgstr ""
+
+#: kdecore/kcalendarsystemjalali.cpp:402
+msgid "Sha"
+msgstr ""
+
+#: kdecore/kcalendarsystemjalali.cpp:404
+msgid "Meh"
+msgstr ""
+
+#: kdecore/kcalendarsystemjalali.cpp:406
+msgid "Aba"
+msgstr ""
+
+#: kdecore/kcalendarsystemjalali.cpp:408
+msgid "Aza"
+msgstr ""
+
+#: kdecore/kcalendarsystemjalali.cpp:410 kdecore/kcalendarsystemjalali.cpp:438
+msgid "Dei"
+msgstr ""
+
+#: kdecore/kcalendarsystemjalali.cpp:412
+msgid "Bah"
+msgstr ""
+
+#: kdecore/kcalendarsystemjalali.cpp:414
+msgid "Esf"
+msgstr ""
+
+#: kdecore/kcalendarsystemjalali.cpp:420
+msgid "Farvardin"
+msgstr ""
+
+#: kdecore/kcalendarsystemjalali.cpp:422
+msgid "Ordibehesht"
+msgstr ""
+
+#: kdecore/kcalendarsystemjalali.cpp:424
+msgid "Khordad"
+msgstr ""
+
+#: kdecore/kcalendarsystemjalali.cpp:428
+msgid "Mordad"
+msgstr ""
+
+#: kdecore/kcalendarsystemjalali.cpp:430
+msgid "Shahrivar"
+msgstr ""
+
+#: kdecore/kcalendarsystemjalali.cpp:432
+msgid "Mehr"
+msgstr ""
+
+#: kdecore/kcalendarsystemjalali.cpp:434
+msgid "Aban"
+msgstr ""
+
+#: kdecore/kcalendarsystemjalali.cpp:436
+msgid "Azar"
+msgstr ""
+
+#: kdecore/kcalendarsystemjalali.cpp:440
+msgid "Bahman"
+msgstr ""
+
+#: kdecore/kcalendarsystemjalali.cpp:442
+msgid "Esfand"
+msgstr ""
+
+#: kdecore/kcalendarsystemjalali.cpp:476
+msgid "2sh"
+msgstr ""
+
+#: kdecore/kcalendarsystemjalali.cpp:478
+msgid "3sh"
+msgstr ""
+
+#: kdecore/kcalendarsystemjalali.cpp:480
+msgid "4sh"
+msgstr ""
+
+#: kdecore/kcalendarsystemjalali.cpp:482
+msgid "5sh"
+msgstr ""
+
+#: kdecore/kcalendarsystemjalali.cpp:484
+msgid "Jom"
+msgstr ""
+
+#: kdecore/kcalendarsystemjalali.cpp:486
+msgid "shn"
+msgstr ""
+
+#: kdecore/kcalendarsystemjalali.cpp:488
+msgid "1sh"
+msgstr ""
+
+#: kdecore/kcalendarsystemjalali.cpp:494
+msgid "Do shanbe"
+msgstr ""
+
+#: kdecore/kcalendarsystemjalali.cpp:496
+msgid "Se shanbe"
+msgstr ""
+
+#: kdecore/kcalendarsystemjalali.cpp:498
+msgid "Chahar shanbe"
+msgstr ""
+
+#: kdecore/kcalendarsystemjalali.cpp:500
+msgid "Panj shanbe"
+msgstr ""
+
+#: kdecore/kcalendarsystemjalali.cpp:502
+msgid "Jumee"
+msgstr ""
+
+#: kdecore/kcalendarsystemjalali.cpp:504
+msgid "Shanbe"
+msgstr ""
+
+#: kdecore/kcalendarsystemjalali.cpp:506
+msgid "Yek-shanbe"
+msgstr ""
+
+#: kdecore/kcalendarsystemhijri.cpp:298 kdecore/kcalendarsystemhijri.cpp:326
+msgid "Muharram"
+msgstr ""
+
+#: kdecore/kcalendarsystemhijri.cpp:300 kdecore/kcalendarsystemhijri.cpp:328
+msgid "Safar"
+msgstr ""
+
+#: kdecore/kcalendarsystemhijri.cpp:302
+msgid "R. Awal"
+msgstr ""
+
+#: kdecore/kcalendarsystemhijri.cpp:304
+msgid "R. Thaani"
+msgstr ""
+
+#: kdecore/kcalendarsystemhijri.cpp:306
+msgid "J. Awal"
+msgstr ""
+
+#: kdecore/kcalendarsystemhijri.cpp:308
+msgid "J. Thaani"
+msgstr ""
+
+#: kdecore/kcalendarsystemhijri.cpp:310 kdecore/kcalendarsystemhijri.cpp:338
+msgid "Rajab"
+msgstr ""
+
+#: kdecore/kcalendarsystemhijri.cpp:312 kdecore/kcalendarsystemhijri.cpp:340
+msgid "Sha`ban"
+msgstr ""
+
+#: kdecore/kcalendarsystemhijri.cpp:314 kdecore/kcalendarsystemhijri.cpp:342
+msgid "Ramadan"
+msgstr ""
+
+#: kdecore/kcalendarsystemhijri.cpp:316 kdecore/kcalendarsystemhijri.cpp:344
+msgid "Shawwal"
+msgstr ""
+
+#: kdecore/kcalendarsystemhijri.cpp:318
+msgid "Qi`dah"
+msgstr ""
+
+#: kdecore/kcalendarsystemhijri.cpp:320
+msgid "Hijjah"
+msgstr ""
+
+#: kdecore/kcalendarsystemhijri.cpp:330
+msgid "Rabi` al-Awal"
+msgstr ""
+
+#: kdecore/kcalendarsystemhijri.cpp:332
+msgid "Rabi` al-Thaani"
+msgstr ""
+
+#: kdecore/kcalendarsystemhijri.cpp:334
+msgid "Jumaada al-Awal"
+msgstr ""
+
+#: kdecore/kcalendarsystemhijri.cpp:336
+msgid "Jumaada al-Thaani"
+msgstr ""
+
+#: kdecore/kcalendarsystemhijri.cpp:346
+msgid "Thu al-Qi`dah"
+msgstr ""
+
+#: kdecore/kcalendarsystemhijri.cpp:348
+msgid "Thu al-Hijjah"
+msgstr ""
+
+#: kdecore/kcalendarsystemhijri.cpp:363 kdecore/kcalendarsystemhijri.cpp:391
+msgid "of Muharram"
+msgstr ""
+
+#: kdecore/kcalendarsystemhijri.cpp:365 kdecore/kcalendarsystemhijri.cpp:393
+msgid "of Safar"
+msgstr ""
+
+#: kdecore/kcalendarsystemhijri.cpp:367
+msgid "of R. Awal"
+msgstr ""
+
+#: kdecore/kcalendarsystemhijri.cpp:369
+msgid "of R. Thaani"
+msgstr ""
+
+#: kdecore/kcalendarsystemhijri.cpp:371
+msgid "of J. Awal"
+msgstr ""
+
+#: kdecore/kcalendarsystemhijri.cpp:373
+msgid "of J. Thaani"
+msgstr ""
+
+#: kdecore/kcalendarsystemhijri.cpp:375 kdecore/kcalendarsystemhijri.cpp:403
+msgid "of Rajab"
+msgstr ""
+
+#: kdecore/kcalendarsystemhijri.cpp:377 kdecore/kcalendarsystemhijri.cpp:405
+msgid "of Sha`ban"
+msgstr ""
+
+#: kdecore/kcalendarsystemhijri.cpp:379 kdecore/kcalendarsystemhijri.cpp:407
+msgid "of Ramadan"
+msgstr ""
+
+#: kdecore/kcalendarsystemhijri.cpp:381 kdecore/kcalendarsystemhijri.cpp:409
+msgid "of Shawwal"
+msgstr ""
+
+#: kdecore/kcalendarsystemhijri.cpp:383
+msgid "of Qi`dah"
+msgstr ""
+
+#: kdecore/kcalendarsystemhijri.cpp:385
+msgid "of Hijjah"
+msgstr ""
+
+#: kdecore/kcalendarsystemhijri.cpp:395
+msgid "of Rabi` al-Awal"
+msgstr ""
+
+#: kdecore/kcalendarsystemhijri.cpp:397
+msgid "of Rabi` al-Thaani"
+msgstr ""
+
+#: kdecore/kcalendarsystemhijri.cpp:399
+msgid "of Jumaada al-Awal"
+msgstr ""
+
+#: kdecore/kcalendarsystemhijri.cpp:401
+msgid "of Jumaada al-Thaani"
+msgstr ""
+
+#: kdecore/kcalendarsystemhijri.cpp:411
+msgid "of Thu al-Qi`dah"
+msgstr ""
+
+#: kdecore/kcalendarsystemhijri.cpp:413
+msgid "of Thu al-Hijjah"
+msgstr ""
+
+#: kdecore/kcalendarsystemhijri.cpp:445
+msgid "Ith"
+msgstr ""
+
+#: kdecore/kcalendarsystemhijri.cpp:447
+msgid "Thl"
+msgstr ""
+
+#: kdecore/kcalendarsystemhijri.cpp:449
+msgid "Arb"
+msgstr ""
+
+#: kdecore/kcalendarsystemhijri.cpp:451
+msgid "Kha"
+msgstr ""
+
+#: kdecore/kcalendarsystemhijri.cpp:453
+msgid "Jum"
+msgstr ""
+
+#: kdecore/kcalendarsystemhijri.cpp:455
+msgid "Sab"
+msgstr ""
+
+#: kdecore/kcalendarsystemhijri.cpp:457
+msgid "Ahd"
+msgstr ""
+
+#: kdecore/kcalendarsystemhijri.cpp:463
+msgid "Yaum al-Ithnain"
+msgstr ""
+
+#: kdecore/kcalendarsystemhijri.cpp:465
+msgid "Yau al-Thulatha"
+msgstr ""
+
+#: kdecore/kcalendarsystemhijri.cpp:467
+msgid "Yaum al-Arbi'a"
+msgstr ""
+
+#: kdecore/kcalendarsystemhijri.cpp:469
+msgid "Yaum al-Khamees"
+msgstr ""
+
+#: kdecore/kcalendarsystemhijri.cpp:471
+msgid "Yaum al-Jumma"
+msgstr ""
+
+#: kdecore/kcalendarsystemhijri.cpp:473
+msgid "Yaum al-Sabt"
+msgstr ""
+
+#: kdecore/kcalendarsystemhijri.cpp:475
+msgid "Yaum al-Ahad"
+msgstr ""
+
+#: kdecore/kcalendarsystem.cpp:124
+msgid ""
+"_: Monday\n"
+"Mon"
+msgstr ""
+
+#: kdecore/kcalendarsystem.cpp:125
+msgid ""
+"_: Tuesday\n"
+"Tue"
+msgstr ""
+
+#: kdecore/kcalendarsystem.cpp:126
+msgid ""
+"_: Wednesday\n"
+"Wed"
+msgstr ""
+
+#: kdecore/kcalendarsystem.cpp:127
+msgid ""
+"_: Thursday\n"
+"Thu"
+msgstr ""
+
+#: kdecore/kcalendarsystem.cpp:128
+msgid ""
+"_: Friday\n"
+"Fri"
+msgstr ""
+
+#: kdecore/kcalendarsystem.cpp:129
+msgid ""
+"_: Saturday\n"
+"Sat"
+msgstr ""
+
+#: kdecore/kcalendarsystem.cpp:130
+msgid ""
+"_: Sunday\n"
+"Sun"
+msgstr ""
+
+#: kdecore/kapplication.cpp:939
+msgid ""
+"_: Dear Translator! Translate this string to the string 'LTR' in "
+"left-to-right languages (as english) or to 'RTL' in right-to-left languages "
+"(such as Hebrew and Arabic) to get proper widget layout."
+msgstr ""
+
+#: kdecore/kapplication.cpp:1374
+msgid ""
+"There was an error setting up inter-process communications for KDE. The "
+"message returned by the system was:\n"
+"\n"
+msgstr ""
+
+#: kdecore/kapplication.cpp:1378
+msgid ""
+"\n"
+"\n"
+"Please check that the \"dcopserver\" program is running!"
+msgstr ""
+
+#: kdecore/kapplication.cpp:1385
+msgid "DCOP communications error (%1)"
+msgstr ""
+
+#: kdecore/kapplication.cpp:1403
+msgid "Use the X-server display 'displayname'"
+msgstr ""
+
+#: kdecore/kapplication.cpp:1405
+msgid "Use the QWS display 'displayname'"
+msgstr ""
+
+#: kdecore/kapplication.cpp:1407
+msgid "Restore the application for the given 'sessionId'"
+msgstr ""
+
+#: kdecore/kapplication.cpp:1408
+msgid ""
+"Causes the application to install a private color\n"
+"map on an 8-bit display"
+msgstr ""
+
+#: kdecore/kapplication.cpp:1409
+msgid ""
+"Limits the number of colors allocated in the color\n"
+"cube on an 8-bit display, if the application is\n"
+"using the QApplication::ManyColor color\n"
+"specification"
+msgstr ""
+
+#: kdecore/kapplication.cpp:1410
+msgid "tells Qt to never grab the mouse or the keyboard"
+msgstr ""
+
+#: kdecore/kapplication.cpp:1411
+msgid ""
+"running under a debugger can cause an implicit\n"
+"-nograb, use -dograb to override"
+msgstr ""
+
+#: kdecore/kapplication.cpp:1412
+msgid "switches to synchronous mode for debugging"
+msgstr ""
+
+#: kdecore/kapplication.cpp:1414
+msgid "defines the application font"
+msgstr ""
+
+#: kdecore/kapplication.cpp:1416
+msgid ""
+"sets the default background color and an\n"
+"application palette (light and dark shades are\n"
+"calculated)"
+msgstr ""
+
+#: kdecore/kapplication.cpp:1418
+msgid "sets the default foreground color"
+msgstr ""
+
+#: kdecore/kapplication.cpp:1420
+msgid "sets the default button color"
+msgstr ""
+
+#: kdecore/kapplication.cpp:1421
+msgid "sets the application name"
+msgstr ""
+
+#: kdecore/kapplication.cpp:1422
+msgid "sets the application title (caption)"
+msgstr ""
+
+#: kdecore/kapplication.cpp:1424
+msgid ""
+"forces the application to use a TrueColor visual on\n"
+"an 8-bit display"
+msgstr ""
+
+#: kdecore/kapplication.cpp:1425
+msgid ""
+"sets XIM (X Input Method) input style. Possible\n"
+"values are onthespot, overthespot, offthespot and\n"
+"root"
+msgstr ""
+
+#: kdecore/kapplication.cpp:1426
+msgid "set XIM server"
+msgstr ""
+
+#: kdecore/kapplication.cpp:1427
+msgid "disable XIM"
+msgstr ""
+
+#: kdecore/kapplication.cpp:1430
+msgid "forces the application to run as QWS Server"
+msgstr ""
+
+#: kdecore/kapplication.cpp:1432
+msgid "mirrors the whole layout of widgets"
+msgstr ""
+
+#: kdecore/kapplication.cpp:1438
+msgid "Use 'caption' as name in the titlebar"
+msgstr ""
+
+#: kdecore/kapplication.cpp:1439
+msgid "Use 'icon' as the application icon"
+msgstr ""
+
+#: kdecore/kapplication.cpp:1440
+msgid "Use 'icon' as the icon in the titlebar"
+msgstr ""
+
+#: kdecore/kapplication.cpp:1441
+msgid "Use alternative configuration file"
+msgstr ""
+
+#: kdecore/kapplication.cpp:1442
+msgid "Use the DCOP Server specified by 'server'"
+msgstr ""
+
+#: kdecore/kapplication.cpp:1443
+msgid "Disable crash handler, to get core dumps"
+msgstr ""
+
+#: kdecore/kapplication.cpp:1444
+msgid "Waits for a WM_NET compatible windowmanager"
+msgstr ""
+
+#: kdecore/kapplication.cpp:1445
+msgid "sets the application GUI style"
+msgstr ""
+
+#: kdecore/kapplication.cpp:1446
+msgid ""
+"sets the client geometry of the main widget - see man X for the argument "
+"format"
+msgstr ""
+
+#: kdecore/kapplication.cpp:1486
+msgid "The style %1 was not found\n"
+msgstr ""
+
+#: kdecore/kapplication.cpp:2214 kdecore/kapplication.cpp:2249
+msgid "Could not Launch Help Center"
+msgstr ""
+
+#: kdecore/kapplication.cpp:2215 kdecore/kapplication.cpp:2250
+#, c-format
+msgid ""
+"Could not launch the KDE Help Center:\n"
+"\n"
+"%1"
+msgstr ""
+
+#: kdecore/kapplication.cpp:2520
+msgid "Could not Launch Mail Client"
+msgstr ""
+
+#: kdecore/kapplication.cpp:2521
+#, c-format
+msgid ""
+"Could not launch the mail client:\n"
+"\n"
+"%1"
+msgstr ""
+
+#: kdecore/kapplication.cpp:2542
+msgid "Could not Launch Browser"
+msgstr ""
+
+#: kdecore/kapplication.cpp:2543
+#, c-format
+msgid ""
+"Could not launch the browser:\n"
+"\n"
+"%1"
+msgstr ""
+
+#: kdecore/kapplication.cpp:2607
+msgid "Could not register with DCOP.\n"
+msgstr ""
+
+#: kdecore/kapplication.cpp:2639
+msgid "KLauncher could not be reached via DCOP.\n"
+msgstr ""
+
+#: kdecore/kwinmodule.cpp:456
+#, c-format
+msgid "Desktop %1"
+msgstr ""
+
+#: kdecore/kconfig_compiler/kconfig_compiler.cpp:45
+msgid "Directory to generate files in"
+msgstr ""
+
+#: kdecore/kconfig_compiler/kconfig_compiler.cpp:46
+msgid "Input kcfg XML file"
+msgstr ""
+
+#: kdecore/kconfig_compiler/kconfig_compiler.cpp:47
+msgid "Code generation options file"
+msgstr ""
+
+#: kdecore/kconfig_compiler/kconfig_compiler.cpp:955
+msgid "KDE .kcfg compiler"
+msgstr ""
+
+#: kdecore/kconfig_compiler/kconfig_compiler.cpp:956
+msgid "KConfig Compiler"
+msgstr ""
+
+#: kdecore/network/kresolver.cpp:558
+msgid "requested family not supported for this host name"
+msgstr ""
+
+#: kdecore/network/kresolver.cpp:561
+msgid "invalid flags"
+msgstr ""
+
+#: kdecore/network/kresolver.cpp:564
+msgid "requested family not supported"
+msgstr ""
+
+#: kdecore/network/kresolver.cpp:565
+msgid "requested service not supported for this socket type"
+msgstr ""
+
+#: kdecore/network/kresolver.cpp:566
+msgid "requested socket type not supported"
+msgstr ""
+
+#: kdecore/network/kresolver.cpp:567
+msgid "unknown error"
+msgstr ""
+
+#: kdecore/network/kresolver.cpp:569
+#, c-format
+msgid ""
+"_: 1: the i18n'ed system error code, from errno\n"
+"system error: %1"
+msgstr ""
+
+#: kdecore/network/kresolver.cpp:574
+msgid "request was canceled"
+msgstr ""
+
+#: kdecore/network/ksocketbase.cpp:172
+msgid ""
+"_: Socket error code NoError\n"
+"no error"
+msgstr ""
+
+#: kdecore/network/ksocketbase.cpp:177
+msgid ""
+"_: Socket error code LookupFailure\n"
+"name lookup has failed"
+msgstr ""
+
+#: kdecore/network/ksocketbase.cpp:182
+msgid ""
+"_: Socket error code AddressInUse\n"
+"address already in use"
+msgstr ""
+
+#: kdecore/network/ksocketbase.cpp:187
+msgid ""
+"_: Socket error code AlreadyBound\n"
+"socket is already bound"
+msgstr ""
+
+#: kdecore/network/ksocketbase.cpp:192
+msgid ""
+"_: Socket error code AlreadyCreated\n"
+"socket is already created"
+msgstr ""
+
+#: kdecore/network/ksocketbase.cpp:197
+msgid ""
+"_: Socket error code NotBound\n"
+"socket is not bound"
+msgstr ""
+
+#: kdecore/network/ksocketbase.cpp:202
+msgid ""
+"_: Socket error code NotCreated\n"
+"socket has not been created"
+msgstr ""
+
+#: kdecore/network/ksocketbase.cpp:207
+msgid ""
+"_: Socket error code WouldBlock\n"
+"operation would block"
+msgstr ""
+
+#: kdecore/network/ksocketbase.cpp:212
+msgid ""
+"_: Socket error code ConnectionRefused\n"
+"connection actively refused"
+msgstr ""
+
+#: kdecore/network/ksocketbase.cpp:217
+msgid ""
+"_: Socket error code ConnectionTimedOut\n"
+"connection timed out"
+msgstr ""
+
+#: kdecore/network/ksocketbase.cpp:222
+msgid ""
+"_: Socket error code InProgress\n"
+"operation is already in progress"
+msgstr ""
+
+#: kdecore/network/ksocketbase.cpp:227
+msgid ""
+"_: Socket error code NetFailure\n"
+"network failure occurred"
+msgstr ""
+
+#: kdecore/network/ksocketbase.cpp:232
+msgid ""
+"_: Socket error code NotSupported\n"
+"operation is not supported"
+msgstr ""
+
+#: kdecore/network/ksocketbase.cpp:237
+msgid ""
+"_: Socket error code Timeout\n"
+"timed operation timed out"
+msgstr ""
+
+#: kdecore/network/ksocketbase.cpp:242
+msgid ""
+"_: Socket error code UnknownError\n"
+"an unknown/unexpected error has happened"
+msgstr ""
+
+#: kdecore/network/ksocketbase.cpp:247
+msgid ""
+"_: Socket error code RemotelyDisconnected\n"
+"remote host closed connection"
+msgstr ""
+
+#: kdecore/network/ksocketaddress.cpp:625
+#, c-format
+msgid ""
+"_: 1: the unknown socket address family number\n"
+"Unknown family %1"
+msgstr ""
+
+#: kdecore/kde-config.cpp.in:14 obj-x86_64-linux-gnu/kdecore/kde-config.cpp:14
+msgid "A little program to output installation paths"
+msgstr ""
+
+#: kdecore/kde-config.cpp.in:18 obj-x86_64-linux-gnu/kdecore/kde-config.cpp:18
+msgid "expand ${prefix} and ${exec_prefix} in output"
+msgstr ""
+
+#: kdecore/kde-config.cpp.in:19 obj-x86_64-linux-gnu/kdecore/kde-config.cpp:19
+msgid "Compiled in prefix for KDE libraries"
+msgstr ""
+
+#: kdecore/kde-config.cpp.in:20 obj-x86_64-linux-gnu/kdecore/kde-config.cpp:20
+msgid "Compiled in exec_prefix for KDE libraries"
+msgstr ""
+
+#: kdecore/kde-config.cpp.in:21 obj-x86_64-linux-gnu/kdecore/kde-config.cpp:21
+msgid "Compiled in library path suffix"
+msgstr ""
+
+#: kdecore/kde-config.cpp.in:22 obj-x86_64-linux-gnu/kdecore/kde-config.cpp:22
+msgid "Prefix in $HOME used to write files"
+msgstr ""
+
+#: kdecore/kde-config.cpp.in:23 obj-x86_64-linux-gnu/kdecore/kde-config.cpp:23
+msgid "Compiled in version string for KDE libraries"
+msgstr ""
+
+#: kdecore/kde-config.cpp.in:24 obj-x86_64-linux-gnu/kdecore/kde-config.cpp:24
+msgid "Available KDE resource types"
+msgstr ""
+
+#: kdecore/kde-config.cpp.in:25 obj-x86_64-linux-gnu/kdecore/kde-config.cpp:25
+msgid "Search path for resource type"
+msgstr ""
+
+#: kdecore/kde-config.cpp.in:26 obj-x86_64-linux-gnu/kdecore/kde-config.cpp:26
+msgid "User path: desktop|autostart|trash|document"
+msgstr ""
+
+#: kdecore/kde-config.cpp.in:27 obj-x86_64-linux-gnu/kdecore/kde-config.cpp:27
+msgid "Prefix to install resource files to"
+msgstr ""
+
+#: kdecore/kde-config.cpp.in:168
+#: obj-x86_64-linux-gnu/kdecore/kde-config.cpp:168
+msgid "Applications menu (.desktop files)"
+msgstr ""
+
+#: kdecore/kde-config.cpp.in:169
+#: obj-x86_64-linux-gnu/kdecore/kde-config.cpp:169
+msgid "CGIs to run from kdehelp"
+msgstr ""
+
+#: kdecore/kde-config.cpp.in:170
+#: obj-x86_64-linux-gnu/kdecore/kde-config.cpp:170
+msgid "Configuration files"
+msgstr ""
+
+#: kdecore/kde-config.cpp.in:171
+#: obj-x86_64-linux-gnu/kdecore/kde-config.cpp:171
+msgid "Where applications store data"
+msgstr ""
+
+#: kdecore/kde-config.cpp.in:172
+#: obj-x86_64-linux-gnu/kdecore/kde-config.cpp:172
+msgid "Executables in $prefix/bin"
+msgstr ""
+
+#: kdecore/kde-config.cpp.in:173
+#: obj-x86_64-linux-gnu/kdecore/kde-config.cpp:173
+msgid "HTML documentation"
+msgstr ""
+
+#: kdecore/kde-config.cpp.in:174
+#: obj-x86_64-linux-gnu/kdecore/kde-config.cpp:174
+msgid "Icons"
+msgstr ""
+
+#: kdecore/kde-config.cpp.in:175
+#: obj-x86_64-linux-gnu/kdecore/kde-config.cpp:175
+msgid "Configuration description files"
+msgstr ""
+
+#: kdecore/kde-config.cpp.in:176
+#: obj-x86_64-linux-gnu/kdecore/kde-config.cpp:176
+msgid "Libraries"
+msgstr ""
+
+#: kdecore/kde-config.cpp.in:177
+#: obj-x86_64-linux-gnu/kdecore/kde-config.cpp:177
+msgid "Includes/Headers"
+msgstr ""
+
+#: kdecore/kde-config.cpp.in:178
+#: obj-x86_64-linux-gnu/kdecore/kde-config.cpp:178
+msgid "Translation files for KLocale"
+msgstr ""
+
+#: kdecore/kde-config.cpp.in:179
+#: obj-x86_64-linux-gnu/kdecore/kde-config.cpp:179
+msgid "Mime types"
+msgstr ""
+
+#: kdecore/kde-config.cpp.in:180
+#: obj-x86_64-linux-gnu/kdecore/kde-config.cpp:180
+msgid "Loadable modules"
+msgstr ""
+
+#: kdecore/kde-config.cpp.in:181
+#: obj-x86_64-linux-gnu/kdecore/kde-config.cpp:181
+msgid "Qt plugins"
+msgstr ""
+
+#: kdecore/kde-config.cpp.in:182
+#: obj-x86_64-linux-gnu/kdecore/kde-config.cpp:182
+msgid "Services"
+msgstr ""
+
+#: kdecore/kde-config.cpp.in:183
+#: obj-x86_64-linux-gnu/kdecore/kde-config.cpp:183
+msgid "Service types"
+msgstr ""
+
+#: kdecore/kde-config.cpp.in:184
+#: obj-x86_64-linux-gnu/kdecore/kde-config.cpp:184
+msgid "Application sounds"
+msgstr ""
+
+#: kdecore/kde-config.cpp.in:185
+#: obj-x86_64-linux-gnu/kdecore/kde-config.cpp:185
+msgid "Templates"
+msgstr ""
+
+#: kdecore/kde-config.cpp.in:186
+#: obj-x86_64-linux-gnu/kdecore/kde-config.cpp:186
+msgid "Wallpapers"
+msgstr ""
+
+#: kdecore/kde-config.cpp.in:187
+#: obj-x86_64-linux-gnu/kdecore/kde-config.cpp:187
+msgid "XDG Application menu (.desktop files)"
+msgstr ""
+
+#: kdecore/kde-config.cpp.in:188
+#: obj-x86_64-linux-gnu/kdecore/kde-config.cpp:188
+msgid "XDG Menu descriptions (.directory files)"
+msgstr ""
+
+#: kdecore/kde-config.cpp.in:189
+#: obj-x86_64-linux-gnu/kdecore/kde-config.cpp:189
+msgid "XDG Menu layout (.menu files)"
+msgstr ""
+
+#: kdecore/kde-config.cpp.in:190
+#: obj-x86_64-linux-gnu/kdecore/kde-config.cpp:190
+msgid "Temporary files (specific for both current host and current user)"
+msgstr ""
+
+#: kdecore/kde-config.cpp.in:191
+#: obj-x86_64-linux-gnu/kdecore/kde-config.cpp:191
+msgid "UNIX Sockets (specific for both current host and current user)"
+msgstr ""
+
+#: kdecore/kde-config.cpp.in:203
+#: obj-x86_64-linux-gnu/kdecore/kde-config.cpp:203
+msgid "%1 - unknown type\n"
+msgstr ""
+
+#: kdecore/kde-config.cpp.in:228
+#: obj-x86_64-linux-gnu/kdecore/kde-config.cpp:228
+msgid "%1 - unknown type of userpath\n"
+msgstr ""
+
+#: obj-x86_64-linux-gnu/kdoctools/xslt_pure.cpp:55
+msgid "Parsing stylesheet"
+msgstr ""
+
+#: obj-x86_64-linux-gnu/kdoctools/xslt_pure.cpp:69
+msgid "Parsing document"
+msgstr ""
+
+#: obj-x86_64-linux-gnu/kdoctools/xslt_pure.cpp:78
+msgid "Applying stylesheet"
+msgstr ""
+
+#: obj-x86_64-linux-gnu/kdoctools/xslt_pure.cpp:86
+msgid "Writing document"
+msgstr ""
+
+#: obj-x86_64-linux-gnu/kio/kfile/knotifywidgetbase.cpp:53
+#: obj-x86_64-linux-gnu/kio/kfile/knotifywidgetbase.cpp:214
+msgid "Events"
+msgstr ""
+
+#: obj-x86_64-linux-gnu/kio/kfile/knotifywidgetbase.cpp:215
+msgid "Quick Controls"
+msgstr ""
+
+#: obj-x86_64-linux-gnu/kio/kfile/knotifywidgetbase.cpp:216
+msgid "Apply to &all applications"
+msgstr ""
+
+#: obj-x86_64-linux-gnu/kio/kfile/knotifywidgetbase.cpp:217
+msgid "Turn O&ff All"
+msgstr ""
+
+#: obj-x86_64-linux-gnu/kio/kfile/knotifywidgetbase.cpp:218
+#: obj-x86_64-linux-gnu/kio/kfile/knotifywidgetbase.cpp:220
+msgid "Allows you to change the behavior for all events at once"
+msgstr ""
+
+#: obj-x86_64-linux-gnu/kio/kfile/knotifywidgetbase.cpp:219
+msgid "Turn O&n All"
+msgstr ""
+
+#: obj-x86_64-linux-gnu/kio/kfile/knotifywidgetbase.cpp:221
+msgid "Actions"
+msgstr ""
+
+#: obj-x86_64-linux-gnu/kio/kfile/knotifywidgetbase.cpp:222
+msgid "Print a message to standard &error output"
+msgstr ""
+
+#: obj-x86_64-linux-gnu/kio/kfile/knotifywidgetbase.cpp:223
+msgid "Show a &message in a pop-up window"
+msgstr ""
+
+#: obj-x86_64-linux-gnu/kio/kfile/knotifywidgetbase.cpp:224
+msgid "E&xecute a program:"
+msgstr ""
+
+#: obj-x86_64-linux-gnu/kio/kfile/knotifywidgetbase.cpp:225
+msgid "Play a &sound:"
+msgstr ""
+
+#: obj-x86_64-linux-gnu/kio/kfile/knotifywidgetbase.cpp:227
+msgid "Test the Sound"
+msgstr ""
+
+#: obj-x86_64-linux-gnu/kio/kfile/knotifywidgetbase.cpp:228
+msgid "Mark &taskbar entry"
+msgstr ""
+
+#: obj-x86_64-linux-gnu/kio/kfile/knotifywidgetbase.cpp:229
+msgid "&Log to a file:"
+msgstr ""
+
+#: obj-x86_64-linux-gnu/kio/kfile/knotifywidgetbase.cpp:230
+msgid "&Use a passive window that does not interrupt other work"
+msgstr ""
+
+#: obj-x86_64-linux-gnu/kio/kfile/knotifywidgetbase.cpp:231
+msgid "Less Options"
+msgstr ""
+
+#: obj-x86_64-linux-gnu/kio/kfile/knotifywidgetbase.cpp:232
+msgid "Player Settings"
+msgstr ""
+
+#: obj-x86_64-linux-gnu/kio/kfile/kpropertiesdesktopbase.cpp:43
+#: obj-x86_64-linux-gnu/kio/kfile/kpropertiesdesktopbase.cpp:140
+#: obj-x86_64-linux-gnu/kio/kfile/kpropertiesmimetypebase.cpp:37
+#: obj-x86_64-linux-gnu/kio/kfile/kpropertiesmimetypebase.cpp:63
+msgid "Mimetype"
+msgstr ""
+
+#: obj-x86_64-linux-gnu/kio/kfile/kpropertiesdesktopbase.cpp:44
+#: obj-x86_64-linux-gnu/kio/kfile/kpropertiesdesktopbase.cpp:141
+#: obj-x86_64-linux-gnu/kio/kfile/kpropertiesmimetypebase.cpp:38
+#: obj-x86_64-linux-gnu/kio/kfile/kpropertiesmimetypebase.cpp:64
+msgid "Description"
+msgstr ""
+
+#: obj-x86_64-linux-gnu/kio/kfile/kpropertiesdesktopbase.cpp:136
+msgid "&Supported file types:"
+msgstr ""
+
+#: obj-x86_64-linux-gnu/kio/kfile/kpropertiesdesktopbase.cpp:137
+#: obj-x86_64-linux-gnu/kio/kfile/kpropertiesdesktopbase.cpp:142
+msgid ""
+"<qt><p>This list should show the types of file that your application can "
+"handle. This list is organized by <u>mimetypes</u>.</p>\n"
+"<p>MIME, Multipurpose Internet (e)Mail Extension, is a standard protocol for "
+"identifying the type of data based on filename extensions and correspondent "
+"<u>mimetypes</u>. Example: the \"bmp\" part that comes after the dot in "
+"flower.bmp indicates that it is a specific kind of image, "
+"<u>image/x-bmp</u>. To know which application should open each type of file, "
+"the system should be informed about the abilities of each application to "
+"handle these extensions and mimetypes.</p>\n"
+"<p>If you want to associate this application with one or more mimetypes that "
+"are not in this list, click on the button <b>Add</b> below. If there are one "
+"or more filetypes that this application cannot handle, you may want to "
+"remove them from the list clicking on the button <b>Remove</b> "
+"below.</p></qt>"
+msgstr ""
+
+#: obj-x86_64-linux-gnu/kio/kfile/kpropertiesdesktopbase.cpp:145
+msgid "&Name:"
+msgstr ""
+
+#: obj-x86_64-linux-gnu/kio/kfile/kpropertiesdesktopbase.cpp:146
+#: obj-x86_64-linux-gnu/kio/kfile/kpropertiesdesktopbase.cpp:147
+msgid ""
+"Type the name you want to give to this application here. This application "
+"will appear under this name in the applications menu and in the panel."
+msgstr ""
+
+#: obj-x86_64-linux-gnu/kio/kfile/kpropertiesdesktopbase.cpp:148
+msgid "&Description:"
+msgstr ""
+
+#: obj-x86_64-linux-gnu/kio/kfile/kpropertiesdesktopbase.cpp:149
+#: obj-x86_64-linux-gnu/kio/kfile/kpropertiesdesktopbase.cpp:150
+msgid ""
+"Type the description of this application, based on its use, here. Examples: "
+"a dial up application (KPPP) would be \"Dial up tool\"."
+msgstr ""
+
+#: obj-x86_64-linux-gnu/kio/kfile/kpropertiesdesktopbase.cpp:151
+msgid "Comm&ent:"
+msgstr ""
+
+#: obj-x86_64-linux-gnu/kio/kfile/kpropertiesdesktopbase.cpp:152
+#: obj-x86_64-linux-gnu/kio/kfile/kpropertiesdesktopbase.cpp:153
+msgid "Type any comment you think is useful here."
+msgstr ""
+
+#: obj-x86_64-linux-gnu/kio/kfile/kpropertiesdesktopbase.cpp:154
+msgid "Co&mmand:"
+msgstr ""
+
+#: obj-x86_64-linux-gnu/kio/kfile/kpropertiesdesktopbase.cpp:155
+#: obj-x86_64-linux-gnu/kio/kfile/kpropertiesdesktopbase.cpp:167
+msgid ""
+"Type the command to start this application here.\n"
+"\n"
+"Following the command, you can have several place holders which will be "
+"replaced with the actual values when the actual program is run:\n"
+"%f - a single file name\n"
+"%F - a list of files; use for applications that can open several local files "
+"at once\n"
+"%u - a single URL\n"
+"%U - a list of URLs\n"
+"%d - the directory of the file to open\n"
+"%D - a list of directories\n"
+"%i - the icon\n"
+"%m - the mini-icon\n"
+"%c - the caption"
+msgstr ""
+
+#: obj-x86_64-linux-gnu/kio/kfile/kpropertiesdesktopbase.cpp:180
+msgid ""
+"Click here to browse your file system in order to find the desired "
+"executable."
+msgstr ""
+
+#: obj-x86_64-linux-gnu/kio/kfile/kpropertiesdesktopbase.cpp:181
+msgid "&Work path:"
+msgstr ""
+
+#: obj-x86_64-linux-gnu/kio/kfile/kpropertiesdesktopbase.cpp:182
+#: obj-x86_64-linux-gnu/kio/kfile/kpropertiesdesktopbase.cpp:183
+msgid "Sets the working directory for your application."
+msgstr ""
+
+#: obj-x86_64-linux-gnu/kio/kfile/kpropertiesdesktopbase.cpp:184
+msgid "Add..."
+msgstr ""
+
+#: obj-x86_64-linux-gnu/kio/kfile/kpropertiesdesktopbase.cpp:185
+msgid ""
+"Click on this button if you want to add a type of file (mimetype) that your "
+"application can handle."
+msgstr ""
+
+#: obj-x86_64-linux-gnu/kio/kfile/kpropertiesdesktopbase.cpp:187
+msgid ""
+"If you want to remove a type of file (mimetype) that your application cannot "
+"handle, select the mimetype in the list above and click on this button."
+msgstr ""
+
+#: obj-x86_64-linux-gnu/kio/kfile/kpropertiesdesktopbase.cpp:188
+msgid "Ad&vanced Options"
+msgstr ""
+
+#: obj-x86_64-linux-gnu/kio/kfile/kpropertiesdesktopbase.cpp:189
+msgid ""
+"Click here to modify the way this application will run, launch feedback, "
+"DCOP options or to run it as a different user."
+msgstr ""
+
+#: obj-x86_64-linux-gnu/kio/kfile/kpropertiesdesktopadvbase.cpp:140
+msgid "Terminal"
+msgstr ""
+
+#: obj-x86_64-linux-gnu/kio/kfile/kpropertiesdesktopadvbase.cpp:141
+msgid "&Run in terminal"
+msgstr ""
+
+#: obj-x86_64-linux-gnu/kio/kfile/kpropertiesdesktopadvbase.cpp:142
+msgid ""
+"Check this option if the application you want to run is a text mode "
+"application or if you want the information that is provided by the terminal "
+"emulator window."
+msgstr ""
+
+#: obj-x86_64-linux-gnu/kio/kfile/kpropertiesdesktopadvbase.cpp:143
+msgid "&Terminal options:"
+msgstr ""
+
+#: obj-x86_64-linux-gnu/kio/kfile/kpropertiesdesktopadvbase.cpp:144
+msgid "Do not &close when command exits"
+msgstr ""
+
+#: obj-x86_64-linux-gnu/kio/kfile/kpropertiesdesktopadvbase.cpp:145
+msgid ""
+"Check this option if the text mode application offers relevant information "
+"on exit. Keeping the terminal emulator open allows you to retrieve this "
+"information."
+msgstr ""
+
+#: obj-x86_64-linux-gnu/kio/kfile/kpropertiesdesktopadvbase.cpp:146
+msgid "User"
+msgstr ""
+
+#: obj-x86_64-linux-gnu/kio/kfile/kpropertiesdesktopadvbase.cpp:147
+msgid "Ru&n as a different user"
+msgstr ""
+
+#: obj-x86_64-linux-gnu/kio/kfile/kpropertiesdesktopadvbase.cpp:148
+msgid ""
+"Check this option if you want to run this application with a different user "
+"id. Every process has a different user id associated with it. This id code "
+"determines file access and other permissions. The password of the user is "
+"required to use this option."
+msgstr ""
+
+#: obj-x86_64-linux-gnu/kio/kfile/kpropertiesdesktopadvbase.cpp:149
+msgid "&Username:"
+msgstr ""
+
+#: obj-x86_64-linux-gnu/kio/kfile/kpropertiesdesktopadvbase.cpp:150
+msgid "Enter the user name you want to run the application as."
+msgstr ""
+
+#: obj-x86_64-linux-gnu/kio/kfile/kpropertiesdesktopadvbase.cpp:151
+msgid "Enter the user name you want to run the application as here."
+msgstr ""
+
+#: obj-x86_64-linux-gnu/kio/kfile/kpropertiesdesktopadvbase.cpp:152
+msgid "Startup"
+msgstr ""
+
+#: obj-x86_64-linux-gnu/kio/kfile/kpropertiesdesktopadvbase.cpp:153
+msgid "Enable &launch feedback"
+msgstr ""
+
+#: obj-x86_64-linux-gnu/kio/kfile/kpropertiesdesktopadvbase.cpp:154
+msgid ""
+"Check this option if you want to make clear that your application has "
+"started. This visual feedback may appear as a busy cursor or in the taskbar."
+msgstr ""
+
+#: obj-x86_64-linux-gnu/kio/kfile/kpropertiesdesktopadvbase.cpp:155
+msgid "&Place in system tray"
+msgstr ""
+
+#: obj-x86_64-linux-gnu/kio/kfile/kpropertiesdesktopadvbase.cpp:156
+msgid ""
+"Check this option if you want to have a system tray handle for your "
+"application."
+msgstr ""
+
+#: obj-x86_64-linux-gnu/kio/kfile/kpropertiesdesktopadvbase.cpp:157
+msgid "&DCOP registration:"
+msgstr ""
+
+#: obj-x86_64-linux-gnu/kio/kfile/kpropertiesdesktopadvbase.cpp:160
+msgid "Multiple Instances"
+msgstr ""
+
+#: obj-x86_64-linux-gnu/kio/kfile/kpropertiesdesktopadvbase.cpp:161
+msgid "Single Instance"
+msgstr ""
+
+#: obj-x86_64-linux-gnu/kio/kfile/kpropertiesdesktopadvbase.cpp:162
+msgid "Run Until Finished"
+msgstr ""
+
+#: obj-x86_64-linux-gnu/kio/kfile/kpropertiesmimetypebase.cpp:62
+msgid "Select one or more file types to add:"
+msgstr ""
+
+#: obj-x86_64-linux-gnu/kio/kfile/kpropertiesmimetypebase.cpp:65
+msgid ""
+"<qt><p>Select one or more types of file that your application can handle "
+"here. This list is organized by <u>mimetypes</u>.</p>\n"
+"<p>MIME, Multipurpose Internet (e)Mail Extension, is a standard protocol for "
+"identifying the type of data based on filename extensions and correspondent "
+"<u>mimetypes</u>. Example: the \"bmp\" part that comes after the dot in "
+"flower.bmp indicates that it is a specific kind of image, "
+"<u>image/x-bmp</u>. To know which application should open each type of file, "
+"the system should be informed about the abilities of each application to "
+"handle these extensions and mimetypes.</p>"
+msgstr ""
+
+#: obj-x86_64-linux-gnu/kio/misc/kwalletd/kwalletwizard.cpp:216
+msgid "KDE Wallet Wizard"
+msgstr ""
+
+#: obj-x86_64-linux-gnu/kio/misc/kwalletd/kwalletwizard.cpp:217
+msgid "<u>KWallet</u> - The KDE Wallet System"
+msgstr ""
+
+#: obj-x86_64-linux-gnu/kio/misc/kwalletd/kwalletwizard.cpp:218
+msgid ""
+"Welcome to KWallet, the KDE Wallet System.  KWallet allows you to store your "
+"passwords and other personal information on disk in an encrypted file, "
+"preventing others from viewing the information.  This wizard will tell you "
+"about KWallet and help you configure it for the first time."
+msgstr ""
+
+#: obj-x86_64-linux-gnu/kio/misc/kwalletd/kwalletwizard.cpp:220
+msgid "&Basic setup (recommended)"
+msgstr ""
+
+#: obj-x86_64-linux-gnu/kio/misc/kwalletd/kwalletwizard.cpp:221
+msgid "&Advanced setup"
+msgstr ""
+
+#: obj-x86_64-linux-gnu/kio/misc/kwalletd/kwalletwizard.cpp:222
+msgid "Introduction"
+msgstr ""
+
+#: obj-x86_64-linux-gnu/kio/misc/kwalletd/kwalletwizard.cpp:223
+msgid ""
+"The KDE Wallet system stores your data in a <i>wallet</i> file on your local "
+"hard disk.  The data is only written in encrypted form, presently using the "
+"blowfish algorithm with your password as the key.  When a wallet is opened, "
+"the wallet manager application will launch and display an icon in the system "
+"tray.  You can use this application to manage your wallets.  It even permits "
+"you to drag wallets and wallet contents, allowing you to easily copy a "
+"wallet to a remote system."
+msgstr ""
+
+#: obj-x86_64-linux-gnu/kio/misc/kwalletd/kwalletwizard.cpp:225
+msgid ""
+"Various applications may attempt to use the KDE wallet to store passwords or "
+"other information such as web form data and cookies.  If you would like "
+"these applications to use the wallet, you must enable it now and choose a "
+"password.  The password you choose <i>cannot</i> be recovered if it is lost, "
+"and will allow anyone who knows it to obtain all the information contained "
+"in the wallet."
+msgstr ""
+
+#: obj-x86_64-linux-gnu/kio/misc/kwalletd/kwalletwizard.cpp:226
+msgid "Enter a new password:"
+msgstr ""
+
+#: obj-x86_64-linux-gnu/kio/misc/kwalletd/kwalletwizard.cpp:227
+msgid "Verify password:"
+msgstr ""
+
+#: obj-x86_64-linux-gnu/kio/misc/kwalletd/kwalletwizard.cpp:228
+msgid "Yes, I wish to use the KDE wallet to store my personal information."
+msgstr ""
+
+#: obj-x86_64-linux-gnu/kio/misc/kwalletd/kwalletwizard.cpp:230
+msgid "Password Selection"
+msgstr ""
+
+#: obj-x86_64-linux-gnu/kio/misc/kwalletd/kwalletwizard.cpp:231
+msgid ""
+"The KDE Wallet system allows you to control the level of security of your "
+"personal data.  Some of these settings do impact usability.  While the "
+"default settings are generally acceptable for most users, you may wish to "
+"change some of them.  You may further tune these settings from the KWallet "
+"control module."
+msgstr ""
+
+#: obj-x86_64-linux-gnu/kio/misc/kwalletd/kwalletwizard.cpp:232
+msgid "Store network passwords and local passwords in separate wallet files"
+msgstr ""
+
+#: obj-x86_64-linux-gnu/kio/misc/kwalletd/kwalletwizard.cpp:233
+msgid "Automatically close idle wallets"
+msgstr ""
+
+#: obj-x86_64-linux-gnu/kio/misc/kwalletd/kwalletwizard.cpp:234
+msgid "Security Level"
+msgstr ""
+
+#: obj-x86_64-linux-gnu/kio/misc/kwalletd/kbetterthankdialogbase.cpp:87
+msgid "Allow &Once"
+msgstr ""
+
+#: obj-x86_64-linux-gnu/kio/misc/kwalletd/kbetterthankdialogbase.cpp:88
+msgid "Allow &Always"
+msgstr ""
+
+#: obj-x86_64-linux-gnu/kio/misc/kwalletd/kbetterthankdialogbase.cpp:89
+msgid "&Deny"
+msgstr ""
+
+#: obj-x86_64-linux-gnu/kio/misc/kwalletd/kbetterthankdialogbase.cpp:90
+msgid "Deny &Forever"
+msgstr ""
+
+#: kwallet/backend/kwalletbackend.cc:252
+msgid "Already open."
+msgstr ""
+
+#: kwallet/backend/kwalletbackend.cc:254
+msgid "Error opening file."
+msgstr ""
+
+#: kwallet/backend/kwalletbackend.cc:256
+msgid "Not a wallet file."
+msgstr ""
+
+#: kwallet/backend/kwalletbackend.cc:258
+msgid "Unsupported file format revision."
+msgstr ""
+
+#: kwallet/backend/kwalletbackend.cc:260
+msgid "Unknown encryption scheme."
+msgstr ""
+
+#: kwallet/backend/kwalletbackend.cc:262
+msgid "Corrupt file?"
+msgstr ""
+
+#: kwallet/backend/kwalletbackend.cc:264
+msgid "Error validating wallet integrity. Possibly corrupted."
+msgstr ""
+
+#: kwallet/backend/kwalletbackend.cc:268
+msgid "Read error - possibly incorrect password."
+msgstr ""
+
+#: kwallet/backend/kwalletbackend.cc:270
+msgid "Decryption error."
+msgstr ""
+
+#: kab/addressbook.cc:168
+msgid "Headline"
+msgstr ""
+
+#: kab/addressbook.cc:172
+msgid "Position"
+msgstr ""
+
+#: kab/addressbook.cc:180
+msgid "Department"
+msgstr ""
+
+#: kab/addressbook.cc:184
+msgid "Sub-Department"
+msgstr ""
+
+#: kab/addressbook.cc:196
+msgid "Zipcode"
+msgstr ""
+
+#: kab/addressbook.cc:200
+msgid "City"
+msgstr ""
+
+#: kab/addressbook.cc:208
+msgid ""
+"_: As in addresses\n"
+"State"
+msgstr ""
+
+#: kab/addressbook.cc:267
+msgid "Rank"
+msgstr ""
+
+#: kab/addressbook.cc:275
+msgid "Name Prefix"
+msgstr ""
+
+#: kab/addressbook.cc:279
+msgid "First Name"
+msgstr ""
+
+#: kab/addressbook.cc:283
+msgid "Middle Name"
+msgstr ""
+
+#: kab/addressbook.cc:287
+msgid "Last Name"
+msgstr ""
+
+#: kab/addressbook.cc:299
+msgid "Talk Addresses"
+msgstr ""
+
+#: kab/addressbook.cc:307
+msgid "Keywords"
+msgstr ""
+
+#: kab/addressbook.cc:311
+msgid "Telephone Number"
+msgstr ""
+
+#: kab/addressbook.cc:315
+msgid "URLs"
+msgstr ""
+
+#: kab/addressbook.cc:319
+msgid "User Field 1"
+msgstr ""
+
+#: kab/addressbook.cc:323
+msgid "User Field 2"
+msgstr ""
+
+#: kab/addressbook.cc:327
+msgid "User Field 3"
+msgstr ""
+
+#: kab/addressbook.cc:331
+msgid "User Field 4"
+msgstr ""
+
+#: kab/addressbook.cc:339
+msgid "Categories"
+msgstr ""
+
+#: kab/addressbook.cc:419 kab/addressbook.cc:1067
+msgid "Cannot initialize local variables."
+msgstr ""
+
+#: kab/addressbook.cc:420 kab/addressbook.cc:1068
+msgid "Out of Memory"
+msgstr ""
+
+#: kab/addressbook.cc:437
+msgid ""
+"Your local kab configuration file \"%1\" could not be created. kab will "
+"probably not work correctly without it.\n"
+"Make sure you have not removed write permission from your local KDE "
+"directory (usually ~/.kde)."
+msgstr ""
+
+#: kab/addressbook.cc:461
+msgid ""
+"Your standard kab database file \"%1\" could not be created. kab will "
+"probably not work correctly without it.\n"
+"Make sure you have not removed write permission from your local KDE "
+"directory (usually ~/.kde)."
+msgstr ""
+
+#: kab/addressbook.cc:471
+msgid ""
+"kab has created your standard addressbook in\n"
+"\"%1\""
+msgstr ""
+
+#: kab/addressbook.cc:492
+msgid "Cannot create backup file (permission denied)."
+msgstr ""
+
+#: kab/addressbook.cc:493 kab/addressbook.cc:500 kab/addressbook.cc:509
+#: kab/addressbook.cc:579 kab/addressbook.cc:587 kab/addressbook.cc:614
+#: kab/addressbook.cc:826 kab/addressbook.cc:1225 kab/addressbook.cc:1601
+#: kab/addressbook.cc:1619 kab/addressbook.cc:1628 kab/addressbook.cc:1653
+#: kab/addressbook.cc:1662 kab/addressbook.cc:1671 kab/addressbook.cc:1680
+#: kab/addressbook.cc:1703 kab/addressbook.cc:1710
+msgid "File Error"
+msgstr ""
+
+#: kab/addressbook.cc:498
+msgid "Cannot open backup file for writing (permission denied)."
+msgstr ""
+
+#: kab/addressbook.cc:507
+msgid ""
+"Critical error:\n"
+"Permissions changed in local directory!"
+msgstr ""
+
+#: kab/addressbook.cc:566
+msgid "File reloaded."
+msgstr ""
+
+#: kab/addressbook.cc:572
+msgid ""
+"The currently loaded file \"%1\" cannot be reloaded. kab may close or save "
+"it.\n"
+"Save it if you accidentally deleted your data file.\n"
+"Close it if you intended to do so.\n"
+"Your file will be closed by default."
+msgstr ""
+
+#: kab/addressbook.cc:583
+msgid "(Safety copy on file error)"
+msgstr ""
+
+#: kab/addressbook.cc:586
+msgid "Cannot save the file; will close it now."
+msgstr ""
+
+#: kab/addressbook.cc:609
+msgid "File opened."
+msgstr ""
+
+#: kab/addressbook.cc:613
+msgid "Could not load the file."
+msgstr ""
+
+#: kab/addressbook.cc:616
+msgid "No such file."
+msgstr ""
+
+#: kab/addressbook.cc:622
+msgid "The file \"%1\" cannot be found. Create a new one?"
+msgstr ""
+
+#: kab/addressbook.cc:624
+msgid "No Such File"
+msgstr ""
+
+#: kab/addressbook.cc:625
+msgid "Create"
+msgstr ""
+
+#: kab/addressbook.cc:629
+msgid "New file."
+msgstr ""
+
+#: kab/addressbook.cc:631
+msgid "Canceled."
+msgstr ""
+
+#: kab/addressbook.cc:665
+msgid "(Internal error in kab)"
+msgstr ""
+
+#: kab/addressbook.cc:670 kab/addressbook.cc:1314
+msgid "(empty entry)"
+msgstr ""
+
+#: kab/addressbook.cc:825
+msgid "Cannot reload configuration file!"
+msgstr ""
+
+#: kab/addressbook.cc:830
+msgid "Configuration file reloaded."
+msgstr ""
+
+#: kab/addressbook.cc:858
+msgid "File saved."
+msgstr ""
+
+#: kab/addressbook.cc:898
+msgid "Permission denied."
+msgstr ""
+
+#: kab/addressbook.cc:904
+msgid "File closed."
+msgstr ""
+
+#: kab/addressbook.cc:1223
+msgid ""
+"The file you wanted to change could not be locked.\n"
+"It is probably in use by another application or read-only."
+msgstr ""
+
+#: kab/addressbook.cc:1599
+msgid ""
+"Cannot find kab's template file.\n"
+"You cannot create new files."
+msgstr ""
+
+#: kab/addressbook.cc:1607
+msgid ""
+"Cannot read kab's template file.\n"
+"You cannot create new files."
+msgstr ""
+
+#: kab/addressbook.cc:1609
+msgid "Format Error"
+msgstr ""
+
+#: kab/addressbook.cc:1616 kab/addressbook.cc:1668
+msgid ""
+"Cannot create the file\n"
+"\""
+msgstr ""
+
+#: kab/addressbook.cc:1618 kab/addressbook.cc:1627
+msgid "Could not create the new file."
+msgstr ""
+
+#: kab/addressbook.cc:1625 kab/addressbook.cc:1677
+msgid ""
+"Cannot save the file\n"
+"\""
+msgstr ""
+
+#: kab/addressbook.cc:1651
+msgid ""
+"Cannot find kab's configuration template file.\n"
+"kab cannot be configured."
+msgstr ""
+
+#: kab/addressbook.cc:1660
+msgid ""
+"Cannot read kab's configuration template file.\n"
+"kab cannot be configured."
+msgstr ""
+
+#: kab/addressbook.cc:1670 kab/addressbook.cc:1679
+msgid "Could not create the new configuration file."
+msgstr ""
+
+#: kab/addressbook.cc:1700
+msgid ""
+"Cannot load kab's local configuration file.\n"
+"There may be a formatting error.\n"
+"kab cannot be configured."
+msgstr ""
+
+#: kab/addressbook.cc:1708
+msgid ""
+"Cannot find kab's local configuration file.\n"
+"kab cannot be configured."
+msgstr ""
+
+#: kab/addressbook.cc:1744
+msgid "fixed"
+msgstr ""
+
+#: kab/addressbook.cc:1745
+msgid "mobile"
+msgstr ""
+
+#: kab/addressbook.cc:1746
+msgid "fax"
+msgstr ""
+
+#: kab/addressbook.cc:1747
+msgid "modem"
+msgstr ""
+
+#: kab/addressbook.cc:1748
+msgid "general"
+msgstr ""
+
+#: kab/addressbook.cc:1949
+msgid "Business"
+msgstr ""
+
+#: kab/addressbook.cc:1951
+msgid "Dates"
+msgstr ""
+
+#: kab/kabapi.cc:134
+msgid "Your new entry could not be added."
+msgstr ""
+
+#: kcert/kcertpart.cc:90 kcert/kcertpart.cc:113
+msgid "Invalid certificate!"
+msgstr ""
+
+#: kcert/kcertpart.cc:160
+msgid "Certificates"
+msgstr ""
+
+#: kcert/kcertpart.cc:161
+msgid "Signers"
+msgstr ""
+
+#: kcert/kcertpart.cc:164
+msgid "Client"
+msgstr ""
+
+#: kcert/kcertpart.cc:170
+msgid "Import &All"
+msgstr ""
+
+#: kcert/kcertpart.cc:183 kcert/kcertpart.cc:274 kcert/kcertpart.cc:359
+msgid "KDE Secure Certificate Import"
+msgstr ""
+
+#: kcert/kcertpart.cc:184
+msgid "Chain:"
+msgstr ""
+
+#: kcert/kcertpart.cc:189 kcert/kcertpart.cc:276
+msgid "Subject:"
+msgstr ""
+
+#: kcert/kcertpart.cc:190 kcert/kcertpart.cc:277
+msgid "Issued by:"
+msgstr ""
+
+#: kcert/kcertpart.cc:196 kcert/kcertpart.cc:283
+msgid "File:"
+msgstr ""
+
+#: kcert/kcertpart.cc:199 kcert/kcertpart.cc:286
+msgid "File format:"
+msgstr ""
+
+#: kcert/kcertpart.cc:212 kcert/kcertpart.cc:299
+msgid "State:"
+msgstr ""
+
+#: kcert/kcertpart.cc:216 kcert/kcertpart.cc:303
+msgid "Valid from:"
+msgstr ""
+
+#: kcert/kcertpart.cc:220 kcert/kcertpart.cc:307
+msgid "Valid until:"
+msgstr ""
+
+#: kcert/kcertpart.cc:224 kcert/kcertpart.cc:311
+msgid "Serial number:"
+msgstr ""
+
+#: kcert/kcertpart.cc:227 kcert/kcertpart.cc:314
+msgid "State"
+msgstr ""
+
+#: kcert/kcertpart.cc:236 kcert/kcertpart.cc:323
+msgid "MD5 digest:"
+msgstr ""
+
+#: kcert/kcertpart.cc:239 kcert/kcertpart.cc:326
+msgid "Signature:"
+msgstr ""
+
+#: kcert/kcertpart.cc:244 kcert/kcertpart.cc:331
+msgid "Signature"
+msgstr ""
+
+#: kcert/kcertpart.cc:253 kcert/kcertpart.cc:340
+msgid "Public key:"
+msgstr ""
+
+#: kcert/kcertpart.cc:259 kcert/kcertpart.cc:346
+msgid "Public Key"
+msgstr ""
+
+#: kcert/kcertpart.cc:368
+msgid "&Crypto Manager..."
+msgstr ""
+
+#: kcert/kcertpart.cc:369
+msgid "&Import"
+msgstr ""
+
+#: kcert/kcertpart.cc:370
+msgid "&Save..."
+msgstr ""
+
+#: kcert/kcertpart.cc:371
+msgid "&Done"
+msgstr ""
+
+#: kcert/kcertpart.cc:418 kcert/kcertpart.cc:440
+msgid "Save failed."
+msgstr ""
+
+#: kcert/kcertpart.cc:418 kcert/kcertpart.cc:440 kcert/kcertpart.cc:455
+#: kcert/kcertpart.cc:460 kcert/kcertpart.cc:496 kcert/kcertpart.cc:532
+#: kcert/kcertpart.cc:566 kcert/kcertpart.cc:600 kcert/kcertpart.cc:730
+#: kcert/kcertpart.cc:741 kcert/kcertpart.cc:746 kcert/kcertpart.cc:759
+#: kcert/kcertpart.cc:873
+msgid "Certificate Import"
+msgstr ""
+
+#: kcert/kcertpart.cc:455
+msgid "You do not seem to have compiled KDE with SSL support."
+msgstr ""
+
+#: kcert/kcertpart.cc:460
+msgid "Certificate file is empty."
+msgstr ""
+
+#: kcert/kcertpart.cc:490
+msgid "Certificate Password"
+msgstr ""
+
+#: kcert/kcertpart.cc:496
+msgid "The certificate file could not be loaded. Try a different password?"
+msgstr ""
+
+#: kcert/kcertpart.cc:496
+msgid "Try Different"
+msgstr ""
+
+#: kcert/kcertpart.cc:532 kcert/kcertpart.cc:566
+msgid "This file cannot be opened."
+msgstr ""
+
+#: kcert/kcertpart.cc:599
+msgid "I do not know how to handle this type of file."
+msgstr ""
+
+#: kcert/kcertpart.cc:619
+msgid "0 - Site Certificate"
+msgstr ""
+
+#: kcert/kcertpart.cc:729 kcert/kcertpart.cc:745
+msgid ""
+"A certificate with that name already exists. Are you sure that you wish to "
+"replace it?"
+msgstr ""
+
+#: kcert/kcertpart.cc:741 kcert/kcertpart.cc:759
+msgid ""
+"Certificate has been successfully imported into KDE.\n"
+"You can manage your certificate settings from the KDE Control Center."
+msgstr ""
+
+#: kcert/kcertpart.cc:873
+msgid ""
+"Certificates have been successfully imported into KDE.\n"
+"You can manage your certificate settings from the KDE Control Center."
+msgstr ""
+
+#: kcert/kcertpart.cc:879
+msgid "KDE Certificate Part"
+msgstr ""
+
+#: khtml/khtml_settings.cc:152
+msgid "Accept"
+msgstr ""
+
+#: khtml/khtml_settings.cc:153
+msgid "Reject"
+msgstr ""
+
+#: khtml/khtml_settings.cc:779
+msgid "Filter error"
+msgstr ""
+
+#: arts/message/artsmessage.cc:45
+msgid "Display error message (default)"
+msgstr ""
+
+#: arts/message/artsmessage.cc:47
+msgid "Display warning message"
+msgstr ""
+
+#: arts/message/artsmessage.cc:49
+msgid "Display informational message"
+msgstr ""
+
+#: arts/message/artsmessage.cc:50
+msgid "Message string to be displayed"
+msgstr ""
+
+#: arts/message/artsmessage.cc:54
+msgid "artsmessage"
+msgstr ""
+
+#: arts/message/artsmessage.cc:55
+msgid "Utility to display aRts error messages"
+msgstr ""
+
+#: arts/message/artsmessage.cc:87
+msgid "Informational"
+msgstr ""
+
+#: arts/kde/kconverttest.cc:23 arts/kde/kiotest.cc:17
+#: arts/kde/kiotestslow.cc:83
+msgid "URL to open"
+msgstr ""
+
+#: arts/kde/kconverttest.cc:58
+msgid "KConvertTest"
+msgstr ""
+
+#: arts/kde/kconverttest.cc:58 arts/kde/kiotest.cc:23
+#: arts/kde/kiotestslow.cc:91
+msgid "0.1"
+msgstr ""
+
+#: arts/kde/kiotest.cc:23 arts/kde/kiotestslow.cc:91
+msgid "KIOTest"
+msgstr ""
+
+#: obj-x86_64-linux-gnu/kio/kssl/keygenwizard.cc:57
+msgid ""
+"You have indicated that you wish to obtain or purchase a secure certificate. "
+"This wizard is intended to guide you through the procedure. You may cancel "
+"at any time, and this will abort the transaction."
+msgstr ""
+
+#: obj-x86_64-linux-gnu/kio/kssl/keygenwizard2.cc:78
+msgid ""
+"You must now provide a password for the certificate request. Please choose a "
+"very secure password as this will be used to encrypt your private key."
+msgstr ""
+
+#: obj-x86_64-linux-gnu/kio/kssl/keygenwizard2.cc:79
+msgid "&Repeat password:"
+msgstr ""
+
+#: obj-x86_64-linux-gnu/kio/kssl/keygenwizard2.cc:80
+msgid "&Choose password:"
+msgstr ""
+
+#: kdeui/kstdaction_p.h:40
+msgid "&New"
+msgstr ""
+
+#: kdeui/kstdaction_p.h:45
+msgid "Re&vert"
+msgstr ""
+
+#: kdeui/kstdaction_p.h:48
+msgid "Print Previe&w..."
+msgstr ""
+
+#: kdeui/kstdaction_p.h:49
+msgid "&Mail..."
+msgstr ""
+
+#: kdeui/kstdaction_p.h:53
+msgid "Re&do"
+msgstr ""
+
+#: kdeui/kstdaction_p.h:59
+msgid "Select &All"
+msgstr ""
+
+#: kdeui/kstdaction_p.h:60
+msgid "Dese&lect"
+msgstr ""
+
+#: kdeui/kstdaction_p.h:64
+msgid "Find Pre&vious"
+msgstr ""
+
+#: kdeui/kstdaction_p.h:67
+msgid "&Actual Size"
+msgstr ""
+
+#: kdeui/kstdaction_p.h:68
+msgid "&Fit to Page"
+msgstr ""
+
+#: kdeui/kstdaction_p.h:69
+msgid "Fit to Page &Width"
+msgstr ""
+
+#: kdeui/kstdaction_p.h:70
+msgid "Fit to Page &Height"
+msgstr ""
+
+#: kdeui/kstdaction_p.h:71
+msgid "Zoom &In"
+msgstr ""
+
+#: kdeui/kstdaction_p.h:72
+msgid "Zoom &Out"
+msgstr ""
+
+#: kdeui/kstdaction_p.h:73
+msgid "&Zoom..."
+msgstr ""
+
+#: kdeui/kstdaction_p.h:75
+msgid "&Redisplay"
+msgstr ""
+
+#: kdeui/kstdaction_p.h:77
+msgid "&Up"
+msgstr ""
+
+#: kdeui/kstdaction_p.h:82
+msgid "&Previous Page"
+msgstr ""
+
+#: kdeui/kstdaction_p.h:83
+msgid "&Next Page"
+msgstr ""
+
+#: kdeui/kstdaction_p.h:84
+msgid "&Go To..."
+msgstr ""
+
+#: kdeui/kstdaction_p.h:85
+msgid "&Go to Page..."
+msgstr ""
+
+#: kdeui/kstdaction_p.h:86
+msgid "&Go to Line..."
+msgstr ""
+
+#: kdeui/kstdaction_p.h:87
+msgid "&First Page"
+msgstr ""
+
+#: kdeui/kstdaction_p.h:88
+msgid "&Last Page"
+msgstr ""
+
+#: kdeui/kstdaction_p.h:91
+msgid "&Edit Bookmarks"
+msgstr ""
+
+#: kdeui/kstdaction_p.h:99
+msgid "&Save Settings"
+msgstr ""
+
+#: kdeui/kstdaction_p.h:100
+msgid "Configure S&hortcuts..."
+msgstr ""
+
+#: kdeui/kstdaction_p.h:101
+msgid "&Configure %1..."
+msgstr ""
+
+#: kdeui/kstdaction_p.h:102
+msgid "Configure Tool&bars..."
+msgstr ""
+
+#: kdeui/kstdaction_p.h:103
+msgid "Configure &Notifications..."
+msgstr ""
+
+#: kdeui/kstdaction_p.h:109
+msgid "What's &This?"
+msgstr ""
+
+#: kdeui/kstdaction_p.h:110
+msgid "Tip of the &Day"
+msgstr ""
+
+#: kdeui/kstdaction_p.h:115
+msgid "&Translate This Application"
+msgstr ""
--- kdelibs-3.5.7.orig/debian/patches/common/03_libtool_update.diff
+++ kdelibs-3.5.7/debian/patches/common/03_libtool_update.diff
@@ -0,0 +1,7857 @@
+diff -Nrua a/admin/libtool.m4.in b/admin/libtool.m4.in
+--- a/admin/libtool.m4.in	2007-05-14 12:58:18.000000000 +0200
++++ b/admin/libtool.m4.in	2007-05-14 23:36:38.000000000 +0200
+@@ -1,28 +1,13 @@
+ # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
+-## Copyright 1996, 1997, 1998, 1999, 2000, 2001
++## Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005
+ ## Free Software Foundation, Inc.
+ ## Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
+ ##
+-## This program is free software; you can redistribute it and/or modify
+-## it under the terms of the GNU General Public License as published by
+-## the Free Software Foundation; either version 2 of the License, or
+-## (at your option) any later version.
+-##
+-## This program is distributed in the hope that it will be useful, but
+-## WITHOUT ANY WARRANTY; without even the implied warranty of
+-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+-## General Public License for more details.
+-##
+-## You should have received a copy of the GNU General Public License
+-## along with this program; if not, write to the Free Software
+-## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+-##
+-## As a special exception to the GNU General Public License, if you
+-## distribute this file as part of a program that contains a
+-## configuration script generated by Autoconf, you may include it under
+-## the same distribution terms that you use for the rest of that program.
++## This file is free software; the Free Software Foundation gives
++## unlimited permission to copy and/or distribute it, with or without
++## modifications, as long as this notice is preserved.
+ 
+-# serial 47 AC_PROG_LIBTOOL
++# serial 48 Debian 1.5.22-4 AC_PROG_LIBTOOL
+ 
+ 
+ # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
+@@ -82,7 +67,7 @@
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
+ 
+ # Always use our own libtool.
+-LIBTOOL='$(SHELL) $(top_builddir)/libtool --silent'
++LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+ AC_SUBST(LIBTOOL)dnl
+ 
+ # Prevent multiple expansion
+@@ -132,7 +117,7 @@
+ 
+ # Sed substitution that helps us do robust quoting.  It backslashifies
+ # metacharacters that are still active within double-quoted strings.
+-Xsed='sed -e s/^X//'
++Xsed='sed -e 1s/^X//'
+ [sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
+ 
+ # Same as above, but do not quote variable references.
+@@ -152,7 +137,7 @@
+ default_ofile=libtool
+ can_build_shared=yes
+ 
+-# All known linkers require a `.a' archive for static linking (except M$VC,
++# All known linkers require a `.a' archive for static linking (except MSVC,
+ # which needs '.lib').
+ libext=a
+ ltmain="$ac_aux_dir/ltmain.sh"
+@@ -172,6 +157,7 @@
+ test -z "$AS" && AS=as
+ test -z "$CC" && CC=cc
+ test -z "$LTCC" && LTCC=$CC
++test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
+ test -z "$DLLTOOL" && DLLTOOL=dlltool
+ test -z "$LD" && LD=ld
+ test -z "$LN_S" && LN_S="ln -s"
+@@ -191,15 +177,17 @@
+ if test -n "$RANLIB"; then
+   case $host_os in
+   openbsd*)
+-    old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
++    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
+     ;;
+   *)
+-    old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
++    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
+     ;;
+   esac
+   old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+ fi
+ 
++_LT_CC_BASENAME([$compiler])
++
+ # Only perform the check for file, if the check method requires it
+ case $deplibs_check_method in
+ file_magic*)
+@@ -240,11 +228,56 @@
+ # If no C compiler was specified, use CC.
+ LTCC=${LTCC-"$CC"}
+ 
++# If no C compiler flags were specified, use CFLAGS.
++LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
++
+ # Allow CC to be a program name with arguments.
+ compiler=$CC
+ ])# _LT_AC_SYS_COMPILER
+ 
+ 
++# _LT_CC_BASENAME(CC)
++# -------------------
++# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
++AC_DEFUN([_LT_CC_BASENAME],
++[for cc_temp in $1""; do
++  case $cc_temp in
++    compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
++    distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
++    \-*) ;;
++    *) break;;
++  esac
++done
++cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
++])
++
++
++# _LT_COMPILER_BOILERPLATE
++# ------------------------
++# Check for compiler boilerplate output or warnings with
++# the simple compiler test code.
++AC_DEFUN([_LT_COMPILER_BOILERPLATE],
++[ac_outfile=conftest.$ac_objext
++printf "$lt_simple_compile_test_code" >conftest.$ac_ext
++eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
++_lt_compiler_boilerplate=`cat conftest.err`
++$rm conftest*
++])# _LT_COMPILER_BOILERPLATE
++
++
++# _LT_LINKER_BOILERPLATE
++# ----------------------
++# Check for linker boilerplate output or warnings with
++# the simple link test code.
++AC_DEFUN([_LT_LINKER_BOILERPLATE],
++[ac_outfile=conftest.$ac_objext
++printf "$lt_simple_link_test_code" >conftest.$ac_ext
++eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
++_lt_linker_boilerplate=`cat conftest.err`
++$rm conftest*
++])# _LT_LINKER_BOILERPLATE
++
++
+ # _LT_AC_SYS_LIBPATH_AIX
+ # ----------------------
+ # Links a minimal program and checks the executable
+@@ -317,15 +350,15 @@
+ 
+ # The HP-UX ksh and POSIX shell print the target directory to stdout
+ # if CDPATH is set.
+-if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+ 
+ if test -z "$ECHO"; then
+ if test "X${echo_test_string+set}" != Xset; then
+ # find a string as large as possible, as long as the shell can cope with it
+   for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
+     # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
+-    if (echo_test_string="`eval $cmd`") 2>/dev/null &&
+-       echo_test_string="`eval $cmd`" &&
++    if (echo_test_string=`eval $cmd`) 2>/dev/null &&
++       echo_test_string=`eval $cmd` &&
+        (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
+     then
+       break
+@@ -494,14 +527,13 @@
+   # Find out which ABI we are using.
+   echo 'int i;' > conftest.$ac_ext
+   if AC_TRY_EVAL(ac_compile); then
+-    case "`/usr/bin/file conftest.o`" in
++    case `/usr/bin/file conftest.o` in
+     *32-bit*)
+-      LINUX_64_MODE="32"
+       case $host in
+         x86_64-*linux*)
+           LD="${LD-ld} -m elf_i386"
+           ;;
+-        ppc64-*linux*)
++        ppc64-*linux*|powerpc64-*linux*)
+           LD="${LD-ld} -m elf32ppclinux"
+           ;;
+         s390x-*linux*)
+@@ -513,7 +545,6 @@
+       esac
+       ;;
+     *64-bit*)
+-      LINUX_64_MODE="64"
+       case $host in
+         x86_64-*linux*)
+           LD="${LD-ld} -m elf_x86_64"
+@@ -547,6 +578,22 @@
+     CFLAGS="$SAVE_CFLAGS"
+   fi
+   ;;
++sparc*-*solaris*)
++  # Find out which ABI we are using.
++  echo 'int i;' > conftest.$ac_ext
++  if AC_TRY_EVAL(ac_compile); then
++    case `/usr/bin/file conftest.o` in
++    *64-bit*)
++      case $lt_cv_prog_gnu_ld in
++      yes*) LD="${LD-ld} -m elf64_sparc" ;;
++      *)    LD="${LD-ld} -64" ;;
++      esac
++      ;;
++    esac
++  fi
++  rm -rf conftest*
++  ;;
++
+ AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
+ [*-*-cygwin* | *-*-mingw* | *-*-pw32*)
+   AC_CHECK_TOOL(DLLTOOL, dlltool, false)
+@@ -578,7 +625,7 @@
+    # with a dollar sign (not a hyphen), so the echo should work correctly.
+    # The option is referenced via a variable to avoid confusing sed.
+    lt_compile=`echo "$ac_compile" | $SED \
+-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
++   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+    (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+@@ -588,8 +635,10 @@
+    echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+    if (exit $ac_status) && test -s "$ac_outfile"; then
+      # The compiler can only warn and ignore the option if not recognized
+-     # So say no if there are warnings
+-     if test ! -s conftest.err; then
++     # So say no if there are warnings other than the usual output.
++     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
++     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
++     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+        $2=yes
+      fi
+    fi
+@@ -615,11 +664,16 @@
+    LDFLAGS="$LDFLAGS $3"
+    printf "$lt_simple_link_test_code" > conftest.$ac_ext
+    if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+-     # The compiler can only warn and ignore the option if not recognized
++     # The linker can only warn and ignore the option if not recognized
+      # So say no if there are warnings
+      if test -s conftest.err; then
+        # Append any errors to the config.log.
+        cat conftest.err 1>&AS_MESSAGE_LOG_FD
++       $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
++       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
++       if diff conftest.exp conftest.er2 >/dev/null; then
++         $2=yes
++       fi
+      else
+        $2=yes
+      fi
+@@ -643,7 +697,7 @@
+ AC_MSG_CHECKING([the maximum length of command line arguments])
+ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
+   i=0
+-  testring="ABCD"
++  teststring="ABCD"
+ 
+   case $build_os in
+   msdosdjgpp*)
+@@ -672,20 +726,70 @@
+     lt_cv_sys_max_cmd_len=8192;
+     ;;
+ 
+- *)
++  amigaos*)
++    # On AmigaOS with pdksh, this test takes hours, literally.
++    # So we just punt and use a minimum line length of 8192.
++    lt_cv_sys_max_cmd_len=8192;
++    ;;
++
++  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
++    # This has been around since 386BSD, at least.  Likely further.
++    if test -x /sbin/sysctl; then
++      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
++    elif test -x /usr/sbin/sysctl; then
++      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
++    else
++      lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
++    fi
++    # And add a safety zone
++    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
++    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
++    ;;
++
++  interix*)
++    # We know the value 262144 and hardcode it with a safety zone (like BSD)
++    lt_cv_sys_max_cmd_len=196608
++    ;;
++
++  osf*)
++    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
++    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
++    # nice to cause kernel panics so lets avoid the loop below.
++    # First set a reasonable default.
++    lt_cv_sys_max_cmd_len=16384
++    #
++    if test -x /sbin/sysconfig; then
++      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
++        *1*) lt_cv_sys_max_cmd_len=-1 ;;
++      esac
++    fi
++    ;;
++  sco3.2v5*)
++    lt_cv_sys_max_cmd_len=102400
++    ;;
++  sysv5* | sco5v6* | sysv4.2uw2*)
++    kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
++    if test -n "$kargmax"; then
++      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ 	]]//'`
++    else
++      lt_cv_sys_max_cmd_len=32768
++    fi
++    ;;
++  *)
+     # If test is not a shell built-in, we'll probably end up computing a
+     # maximum length that is only half of the actual maximum length, but
+     # we can't tell.
+-    while (test "X"`$CONFIG_SHELL [$]0 --fallback-echo "X$testring" 2>/dev/null` \
+-	       = "XX$testring") >/dev/null 2>&1 &&
+-	    new_result=`expr "X$testring" : ".*" 2>&1` &&
++    SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
++    while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \
++	       = "XX$teststring") >/dev/null 2>&1 &&
++	    new_result=`expr "X$teststring" : ".*" 2>&1` &&
+ 	    lt_cv_sys_max_cmd_len=$new_result &&
+ 	    test $i != 17 # 1/2 MB should be enough
+     do
+       i=`expr $i + 1`
+-      testring=$testring$testring
++      teststring=$teststring$teststring
+     done
+-    testring=
++    teststring=
+     # Add a significant safety factor because C++ compilers can tack on massive
+     # amounts of additional arguments before passing them to the linker.
+     # It appears as though 1/2 is a usable value.
+@@ -702,7 +806,7 @@
+ 
+ 
+ # _LT_AC_CHECK_DLFCN
+-# --------------------
++# ------------------
+ AC_DEFUN([_LT_AC_CHECK_DLFCN],
+ [AC_CHECK_HEADERS(dlfcn.h)dnl
+ ])# _LT_AC_CHECK_DLFCN
+@@ -710,7 +814,7 @@
+ 
+ # _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
+ #                           ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
+-# ------------------------------------------------------------------
++# ---------------------------------------------------------------------
+ AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF],
+ [AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
+ if test "$cross_compiling" = yes; then :
+@@ -776,17 +880,19 @@
+       else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+       /* dlclose (self); */
+     }
++  else
++    puts (dlerror ());
+ 
+     exit (status);
+ }]
+ EOF
+   if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
+-    (./conftest; exit; ) 2>/dev/null
++    (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null
+     lt_status=$?
+     case x$lt_status in
+       x$lt_dlno_uscore) $1 ;;
+       x$lt_dlneed_uscore) $2 ;;
+-      x$lt_unknown|x*) $3 ;;
++      x$lt_dlunknown|x*) $3 ;;
+     esac
+   else :
+     # compilation failed
+@@ -798,7 +904,7 @@
+ 
+ 
+ # AC_LIBTOOL_DLOPEN_SELF
+-# -------------------
++# ----------------------
+ AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF],
+ [AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
+ if test "x$enable_dlopen" != xyes; then
+@@ -835,7 +941,7 @@
+     lt_cv_dlopen_self=yes
+     ])
+    ;;
+-    
++
+   *)
+     AC_CHECK_FUNC([shl_load],
+ 	  [lt_cv_dlopen="shl_load"],
+@@ -869,7 +975,7 @@
+     test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
+ 
+     save_LDFLAGS="$LDFLAGS"
+-    eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
++    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
+ 
+     save_LIBS="$LIBS"
+     LIBS="$lt_cv_dlopen_libs $LIBS"
+@@ -882,7 +988,7 @@
+     ])
+ 
+     if test "x$lt_cv_dlopen_self" = xyes; then
+-      LDFLAGS="$LDFLAGS $link_static_flag"
++      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
+       AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
+     	  lt_cv_dlopen_self_static, [dnl
+ 	  _LT_AC_TRY_DLOPEN_SELF(
+@@ -924,20 +1030,13 @@
+    mkdir out
+    printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+ 
+-   # According to Tom Tromey, Ian Lance Taylor reported there are C compilers
+-   # that will create temporary files in the current directory regardless of
+-   # the output directory.  Thus, making CWD read-only will cause this test
+-   # to fail, enabling locking or at least warning the user not to do parallel
+-   # builds.
+-   chmod -w .
+-
+    lt_compiler_flag="-o out/conftest2.$ac_objext"
+    # Insert the option either (1) after the last *FLAGS variable, or
+    # (2) before a word containing "conftest.", or (3) at the end.
+    # Note that $ac_compile itself does not contain backslashes and begins
+    # with a dollar sign (not a hyphen), so the echo should work correctly.
+    lt_compile=`echo "$ac_compile" | $SED \
+-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
++   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+    (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+@@ -949,13 +1048,18 @@
+    then
+      # The compiler can only warn and ignore the option if not recognized
+      # So say no if there are warnings
+-     if test ! -s out/conftest.err; then
++     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
++     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
++     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+        _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
+      fi
+    fi
+-   chmod u+w .
+-   $rm conftest* out/*
+-   rmdir out
++   chmod u+w . 2>&AS_MESSAGE_LOG_FD
++   $rm conftest*
++   # SGI C++ compiler will create directory out/ii_files/ for
++   # template instantiation
++   test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
++   $rm out/* && rmdir out
+    cd ..
+    rmdir conftest
+    $rm conftest*
+@@ -1014,8 +1118,8 @@
+ [AC_MSG_CHECKING([how to hardcode library paths into programs])
+ _LT_AC_TAGVAR(hardcode_action, $1)=
+ if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \
+-   test -n "$_LT_AC_TAGVAR(runpath_var $1)" || \
+-   test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)"="Xyes" ; then
++   test -n "$_LT_AC_TAGVAR(runpath_var, $1)" || \
++   test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
+ 
+   # We can hardcode non-existant directories.
+   if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no &&
+@@ -1072,7 +1176,7 @@
+    *)
+   AC_MSG_RESULT([no])
+     ;;
+-  esac  
++  esac
+ fi
+ ])# AC_LIBTOOL_SYS_LIB_STRIP
+ 
+@@ -1085,7 +1189,7 @@
+ library_names_spec=
+ libname_spec='lib$name'
+ soname_spec=
+-shrext=".so"
++shrext_cmds=".so"
+ postinstall_cmds=
+ postuninstall_cmds=
+ finish_cmds=
+@@ -1095,7 +1199,20 @@
+ version_type=none
+ dynamic_linker="$host_os ld.so"
+ sys_lib_dlsearch_path_spec="/lib /usr/lib"
+-sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
++if test "$GCC" = yes; then
++  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
++  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
++    # if the path contains ";" then we assume it to be the separator
++    # otherwise default to the standard path separator (i.e. ":") - it is
++    # assumed that no part of a normal pathname contains ";" but that should
++    # okay in the real world where ";" in dirpaths is itself problematic.
++    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
++  else
++    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
++  fi
++else
++  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
++fi
+ need_lib_prefix=unknown
+ hardcode_into_libs=no
+ 
+@@ -1160,7 +1277,7 @@
+ amigaos*)
+   library_names_spec='$libname.ixlibrary $libname.a'
+   # Create ${libname}_ixlibrary.a entries in /sys/libs.
+-  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done'
++  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+   ;;
+ 
+ beos*)
+@@ -1169,7 +1286,7 @@
+   shlibpath_var=LIBRARY_PATH
+   ;;
+ 
+-bsdi4*)
++bsdi[[45]]*)
+   version_type=linux
+   need_version=no
+   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+@@ -1185,7 +1302,7 @@
+ 
+ cygwin* | mingw* | pw32*)
+   version_type=windows
+-  shrext=".dll"
++  shrext_cmds=".dll"
+   need_version=no
+   need_lib_prefix=no
+ 
+@@ -1197,7 +1314,8 @@
+       dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
+       dldir=$destdir/`dirname \$dlpath`~
+       test -d \$dldir || mkdir -p \$dldir~
+-      $install_prog $dir/$dlname \$dldir/$dlname'
++      $install_prog $dir/$dlname \$dldir/$dlname~
++      chmod a+x \$dldir/$dlname'
+     postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+       dlpath=$dir/\$dldll~
+        $rm \$dlpath'
+@@ -1227,7 +1345,7 @@
+       ;;
+     pw32*)
+       # pw32 DLLs use 'pw' prefix rather than 'lib'
+-      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
++      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+       ;;
+     esac
+     ;;
+@@ -1250,7 +1368,7 @@
+   soname_spec='${libname}${release}${major}$shared_ext'
+   shlibpath_overrides_runpath=yes
+   shlibpath_var=DYLD_LIBRARY_PATH
+-  shrext='$(test .$module = .yes && echo .so || echo .dylib)'
++  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
+   # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
+   if test "$GCC" = yes; then
+     sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
+@@ -1273,20 +1391,17 @@
+   dynamic_linker=no
+   ;;
+ 
+-kfreebsd*-gnu*)
+-  version_type=linux
+-  need_lib_prefix=no
+-  need_version=no
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  shlibpath_overrides_runpath=no
+-  hardcode_into_libs=yes
+-  dynamic_linker='GNU ld.so'
+-  ;;
+-
+-freebsd*)
+-  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
++freebsd* | dragonfly*)
++  # DragonFly does not have aout.  When/if they implement a new
++  # versioning mechanism, adjust this.
++  if test -x /usr/bin/objformat; then
++    objformat=`/usr/bin/objformat`
++  else
++    case $host_os in
++    freebsd[[123]]*) objformat=aout ;;
++    *) objformat=elf ;;
++    esac
++  fi
+   version_type=freebsd-$objformat
+   case $version_type in
+     freebsd-elf*)
+@@ -1304,14 +1419,19 @@
+   freebsd2*)
+     shlibpath_overrides_runpath=yes
+     ;;
+-  freebsd3.[01]* | freebsdelf3.[01]*)
++  freebsd3.[[01]]* | freebsdelf3.[[01]]*)
+     shlibpath_overrides_runpath=yes
+     hardcode_into_libs=yes
+     ;;
+-  *) # from 3.2 on
++  freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \
++  freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1)
+     shlibpath_overrides_runpath=no
+     hardcode_into_libs=yes
+     ;;
++  freebsd*) # from 4.6 on
++    shlibpath_overrides_runpath=yes
++    hardcode_into_libs=yes
++    ;;
+   esac
+   ;;
+ 
+@@ -1331,9 +1451,9 @@
+   version_type=sunos
+   need_lib_prefix=no
+   need_version=no
+-  case "$host_cpu" in
++  case $host_cpu in
+   ia64*)
+-    shrext='.so'
++    shrext_cmds='.so'
+     hardcode_into_libs=yes
+     dynamic_linker="$host_os dld.so"
+     shlibpath_var=LD_LIBRARY_PATH
+@@ -1348,7 +1468,7 @@
+     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+     ;;
+    hppa*64*)
+-     shrext='.sl'
++     shrext_cmds='.sl'
+      hardcode_into_libs=yes
+      dynamic_linker="$host_os dld.sl"
+      shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
+@@ -1359,7 +1479,7 @@
+      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+      ;;
+    *)
+-    shrext='.sl'
++    shrext_cmds='.sl'
+     dynamic_linker="$host_os dld.sl"
+     shlibpath_var=SHLIB_PATH
+     shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
+@@ -1371,6 +1491,18 @@
+   postinstall_cmds='chmod 555 $lib'
+   ;;
+ 
++interix3*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  hardcode_into_libs=yes
++  ;;
++
+ irix5* | irix6* | nonstopux*)
+   case $host_os in
+     nonstopux*) version_type=nonstopux ;;
+@@ -1414,29 +1546,26 @@
+   ;;
+ 
+ # This must be Linux ELF.
+-linux*)
++linux* | k*bsd*-gnu)
+   version_type=linux
+   need_lib_prefix=no
+   need_version=no
+   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+   soname_spec='${libname}${release}${shared_ext}$major'
+   finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
+-  libsuff=
+-  if test "x$LINUX_64_MODE" = x64; then
+-    # Some platforms are per default 64-bit, so there's no /lib64
+-    if test -d /lib64 -a ! -h /lib64; then
+-      libsuff=64
+-    fi
+-  fi
+   shlibpath_var=LD_LIBRARY_PATH
+   shlibpath_overrides_runpath=no
+-  sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}"
+-  sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
+   # This implies no fast_install, which is unacceptable.
+   # Some rework will be needed to allow for fast_install
+   # before this can be enabled.
+   hardcode_into_libs=yes
+ 
++  # Append ld.so.conf contents to the search path
++  if test -f /etc/ld.so.conf; then
++    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
++    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
++  fi
++
+   # We used to test for /lib/ld.so.1 and disable shared libraries on
+   # powerpc, because MkLinux only supported shared libraries with the
+   # GNU dynamic linker.  Since this was broken with cross compilers,
+@@ -1446,6 +1575,18 @@
+   dynamic_linker='GNU/Linux ld.so'
+   ;;
+ 
++netbsdelf*-gnu)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  hardcode_into_libs=yes
++  dynamic_linker='NetBSD ld.elf_so'
++  ;;
++
+ netbsd*)
+   version_type=sunos
+   need_lib_prefix=no
+@@ -1455,7 +1596,7 @@
+     finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+     dynamic_linker='NetBSD (a.out) ld.so'
+   else
+-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} ${libname}${shared_ext}'
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+     soname_spec='${libname}${release}${shared_ext}$major'
+     dynamic_linker='NetBSD ld.elf_so'
+   fi
+@@ -1483,8 +1624,13 @@
+ 
+ openbsd*)
+   version_type=sunos
++  sys_lib_dlsearch_path_spec="/usr/lib"
+   need_lib_prefix=no
+-  need_version=no
++  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
++  case $host_os in
++    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
++    *)                         need_version=no  ;;
++  esac
+   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+   finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+   shlibpath_var=LD_LIBRARY_PATH
+@@ -1504,7 +1650,7 @@
+ 
+ os2*)
+   libname_spec='$name'
+-  shrext=".dll"
++  shrext_cmds=".dll"
+   need_lib_prefix=no
+   library_names_spec='$libname${shared_ext} $libname.a'
+   dynamic_linker='OS/2 ld.exe'
+@@ -1522,13 +1668,6 @@
+   sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+   ;;
+ 
+-sco3.2v5*)
+-  version_type=osf
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  ;;
+-
+ solaris*)
+   version_type=linux
+   need_lib_prefix=no
+@@ -1554,7 +1693,7 @@
+   need_version=yes
+   ;;
+ 
+-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
++sysv4 | sysv4.3*)
+   version_type=linux
+   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+   soname_spec='${libname}${release}${shared_ext}$major'
+@@ -1587,6 +1726,29 @@
+   fi
+   ;;
+ 
++sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
++  version_type=freebsd-elf
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  hardcode_into_libs=yes
++  if test "$with_gnu_ld" = yes; then
++    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
++    shlibpath_overrides_runpath=no
++  else
++    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
++    shlibpath_overrides_runpath=yes
++    case $host_os in
++      sco3.2v5*)
++        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
++	;;
++    esac
++  fi
++  sys_lib_dlsearch_path_spec='/usr/lib'
++  ;;
++
+ uts4*)
+   version_type=linux
+   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+@@ -1600,6 +1762,11 @@
+ esac
+ AC_MSG_RESULT([$dynamic_linker])
+ test "$dynamic_linker" = no && can_build_shared=no
++
++variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
++if test "$GCC" = yes; then
++  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
++fi
+ ])# AC_LIBTOOL_SYS_DYNAMIC_LINKER
+ 
+ 
+@@ -1624,6 +1791,9 @@
+       AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile'])
+     fi
+   fi
++  if test -z "$LTCFLAGS"; then
++    eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`"
++  fi
+ 
+   # Extract list of available tagged configurations in $ofile.
+   # Note that this assumes the entire list is on one line.
+@@ -1650,7 +1820,9 @@
+ 
+       case $tagname in
+       CXX)
+-	if test -n "$CXX" && test "X$CXX" != "Xno"; then
++	if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
++	    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
++	    (test "X$CXX" != "Xg++"))) ; then
+ 	  AC_LIBTOOL_LANG_CXX_CONFIG
+ 	else
+ 	  tagname=""
+@@ -1712,7 +1884,7 @@
+ 
+ # AC_LIBTOOL_WIN32_DLL
+ # --------------------
+-# declare package support for building win32 dll's
++# declare package support for building win32 DLLs
+ AC_DEFUN([AC_LIBTOOL_WIN32_DLL],
+ [AC_BEFORE([$0], [AC_LIBTOOL_SETUP])
+ ])# AC_LIBTOOL_WIN32_DLL
+@@ -1750,7 +1922,7 @@
+ 
+ # AC_DISABLE_SHARED
+ # -----------------
+-#- set the default shared flag to --disable-shared
++# set the default shared flag to --disable-shared
+ AC_DEFUN([AC_DISABLE_SHARED],
+ [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+ AC_ENABLE_SHARED(no)
+@@ -1886,7 +2058,7 @@
+       if test -n "$file_magic_test_file"; then
+ 	case $deplibs_check_method in
+ 	"file_magic "*)
+-	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
++	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
+ 	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+ 	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
+ 	    $EGREP "$file_magic_regex" > /dev/null; then
+@@ -1996,7 +2168,7 @@
+     if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+       lt_cv_path_LD="$ac_dir/$ac_prog"
+       # Check to see if the program is GNU ld.  I'd rather use --version,
+-      # but apparently some GNU ld's only accept -v.
++      # but apparently some variants of GNU ld only accept -v.
+       # Break only if it was the GNU/non-GNU ld that we prefer.
+       case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
+       *GNU* | *'with BFD'*)
+@@ -2028,7 +2200,7 @@
+ AC_DEFUN([AC_PROG_LD_GNU],
+ [AC_REQUIRE([AC_PROG_EGREP])dnl
+ AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
+-[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
++[# I'd rather use --version here, but apparently some GNU lds only accept -v.
+ case `$LD -v 2>&1 </dev/null` in
+ *GNU* | *'with BFD'*)
+   lt_cv_prog_gnu_ld=yes
+@@ -2055,6 +2227,15 @@
+ *) reload_flag=" $reload_flag" ;;
+ esac
+ reload_cmds='$LD$reload_flag -o $output$reload_objs'
++case $host_os in
++  darwin*)
++    if test "$GCC" = yes; then
++      reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
++    else
++      reload_cmds='$LD$reload_flag -o $output$reload_objs'
++    fi
++    ;;
++esac
+ ])# AC_PROG_LD_RELOAD_FLAG
+ 
+ 
+@@ -2088,44 +2269,36 @@
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+-bsdi4*)
++bsdi[[45]]*)
+   lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
+   lt_cv_file_magic_cmd='/usr/bin/file -L'
+   lt_cv_file_magic_test_file=/shlib/libc.so
+   ;;
+ 
+ cygwin*)
+-  lt_cv_deplibs_check_method=pass_all
++  # func_win32_libid is a shell function defined in ltmain.sh
++  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
++  lt_cv_file_magic_cmd='func_win32_libid'
+   ;;
+-  
++
+ mingw* | pw32*)
+-  # win32_libid is a shell function defined in ltmain.sh
+-  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+-  lt_cv_file_magic_cmd='win32_libid'
++  # Base MSYS/MinGW do not provide the 'file' command needed by
++  # func_win32_libid shell function, so use a weaker test based on 'objdump'.
++  lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
++  lt_cv_file_magic_cmd='$OBJDUMP -f'
+   ;;
+ 
+ darwin* | rhapsody*)
+-  # this will be overwritten by pass_all, but leave it in just in case
+-  lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library'
+-  lt_cv_file_magic_cmd='/usr/bin/file -L'
+-  case "$host_os" in
+-  rhapsody* | darwin1.[[012]])
+-    lt_cv_file_magic_test_file=`/System/Library/Frameworks/System.framework/System`
+-    ;;
+-  *) # Darwin 1.3 on
+-    lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib'
+-    ;;
+-  esac
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+-freebsd* | kfreebsd*-gnu)
++freebsd* | dragonfly*)
+   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
+     case $host_cpu in
+     i*86 )
+       # Not sure whether the presence of OpenBSD here was a mistake.
+       # Let's accept both of them until this is cleared up.
+-      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[[3-9]]86 (compact )?demand paged shared library'
++      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library'
+       lt_cv_file_magic_cmd=/usr/bin/file
+       lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+       ;;
+@@ -2141,7 +2314,7 @@
+ 
+ hpux10.20* | hpux11*)
+   lt_cv_file_magic_cmd=/usr/bin/file
+-  case "$host_cpu" in
++  case $host_cpu in
+   ia64*)
+     lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
+     lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
+@@ -2157,43 +2330,27 @@
+   esac
+   ;;
+ 
++interix3*)
++  # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
++  lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
++  ;;
++
+ irix5* | irix6* | nonstopux*)
+-  case $host_os in
+-  irix5* | nonstopux*)
+-    # this will be overridden with pass_all, but let us keep it just in case
+-    lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1"
+-    ;;
+-  *)
+-    case $LD in
+-    *-32|*"-32 ") libmagic=32-bit;;
+-    *-n32|*"-n32 ") libmagic=N32;;
+-    *-64|*"-64 ") libmagic=64-bit;;
+-    *) libmagic=never-match;;
+-    esac
+-    # this will be overridden with pass_all, but let us keep it just in case
+-    lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[[1234]] dynamic lib MIPS - version 1"
+-    ;;
++  case $LD in
++  *-32|*"-32 ") libmagic=32-bit;;
++  *-n32|*"-n32 ") libmagic=N32;;
++  *-64|*"-64 ") libmagic=64-bit;;
++  *) libmagic=never-match;;
+   esac
+-  lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*`
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+ # This must be Linux ELF.
+-linux*)
+-  case $host_cpu in
+-  alpha* | hppa* | i*86 | ia64* | m68* | mips* | powerpc* | sparc* | s390* | sh* | x86_64* )
+-    lt_cv_deplibs_check_method=pass_all ;;
+-  # the debian people say, arm and glibc 2.3.1 works for them with pass_all
+-  arm* )
+-    lt_cv_deplibs_check_method=pass_all ;;
+-  *)
+-    # glibc up to 2.1.1 does not perform some relocations on ARM
+-    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' ;;
+-  esac
+-  lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
++linux* | k*bsd*-gnu)
++  lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+-netbsd*)
++netbsd* | netbsdelf*-gnu)
+   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
+     lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
+   else
+@@ -2212,32 +2369,22 @@
+   ;;
+ 
+ openbsd*)
+-  lt_cv_file_magic_cmd=/usr/bin/file
+-  lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+   if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+-    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB shared object'
++    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
+   else
+-    lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library'
++    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
+   fi
+   ;;
+ 
+ osf3* | osf4* | osf5*)
+-  # this will be overridden with pass_all, but let us keep it just in case
+-  lt_cv_deplibs_check_method='file_magic COFF format alpha shared library'
+-  lt_cv_file_magic_test_file=/shlib/libc.so
+-  lt_cv_deplibs_check_method=pass_all
+-  ;;
+-
+-sco3.2v5*)
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+ solaris*)
+   lt_cv_deplibs_check_method=pass_all
+-  lt_cv_file_magic_test_file=/lib/libc.so
+   ;;
+ 
+-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
++sysv4 | sysv4.3*)
+   case $host_vendor in
+   motorola)
+     lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
+@@ -2258,10 +2405,13 @@
+   siemens)
+     lt_cv_deplibs_check_method=pass_all
+     ;;
++  pc)
++    lt_cv_deplibs_check_method=pass_all
++    ;;
+   esac
+   ;;
+ 
+-sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7* | sysv4*uw2*)
++sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ esac
+@@ -2281,36 +2431,43 @@
+   # Let the user override the test.
+   lt_cv_path_NM="$NM"
+ else
+-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+-  for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
+-    IFS="$lt_save_ifs"
+-    test -z "$ac_dir" && ac_dir=.
+-    tmp_nm="$ac_dir/${ac_tool_prefix}nm"
+-    if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
+-      # Check to see if the nm accepts a BSD-compat flag.
+-      # Adding the `sed 1q' prevents false positives on HP-UX, which says:
+-      #   nm: unknown option "B" ignored
+-      # Tru64's nm complains that /dev/null is an invalid object file
+-      case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
+-      */dev/null* | *'Invalid file or object type'*)
+-	lt_cv_path_NM="$tmp_nm -B"
+-	break
+-        ;;
+-      *)
+-	case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
+-	*/dev/null*)
+-	  lt_cv_path_NM="$tmp_nm -p"
++  lt_nm_to_check="${ac_tool_prefix}nm"
++  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then 
++    lt_nm_to_check="$lt_nm_to_check nm"
++  fi
++  for lt_tmp_nm in $lt_nm_to_check; do
++    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
++    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
++      IFS="$lt_save_ifs"
++      test -z "$ac_dir" && ac_dir=.
++      tmp_nm="$ac_dir/$lt_tmp_nm"
++      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
++	# Check to see if the nm accepts a BSD-compat flag.
++	# Adding the `sed 1q' prevents false positives on HP-UX, which says:
++	#   nm: unknown option "B" ignored
++	# Tru64's nm complains that /dev/null is an invalid object file
++	case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
++	*/dev/null* | *'Invalid file or object type'*)
++	  lt_cv_path_NM="$tmp_nm -B"
+ 	  break
+ 	  ;;
+ 	*)
+-	  lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
+-	  continue # so that we can try to find one that supports BSD flags
++	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
++	  */dev/null*)
++	    lt_cv_path_NM="$tmp_nm -p"
++	    break
++	    ;;
++	  *)
++	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
++	    continue # so that we can try to find one that supports BSD flags
++	    ;;
++	  esac
+ 	  ;;
+ 	esac
+-      esac
+-    fi
++      fi
++    done
++    IFS="$lt_save_ifs"
+   done
+-  IFS="$lt_save_ifs"
+   test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
+ fi])
+ NM="$lt_cv_path_NM"
+@@ -2342,13 +2499,13 @@
+ # -----------------------------------
+ # sets LIBLTDL to the link flags for the libltdl convenience library and
+ # LTDLINCL to the include flags for the libltdl header and adds
+-# --enable-ltdl-convenience to the configure arguments.  Note that LIBLTDL
+-# and LTDLINCL are not AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called.  If
+-# DIRECTORY is not provided, it is assumed to be `libltdl'.  LIBLTDL will
+-# be prefixed with '${top_builddir}/' and LTDLINCL will be prefixed with
+-# '${top_srcdir}/' (note the single quotes!).  If your package is not
+-# flat and you're not using automake, define top_builddir and
+-# top_srcdir appropriately in the Makefiles.
++# --enable-ltdl-convenience to the configure arguments.  Note that
++# AC_CONFIG_SUBDIRS is not called here.  If DIRECTORY is not provided,
++# it is assumed to be `libltdl'.  LIBLTDL will be prefixed with
++# '${top_builddir}/' and LTDLINCL will be prefixed with '${top_srcdir}/'
++# (note the single quotes!).  If your package is not flat and you're not
++# using automake, define top_builddir and top_srcdir appropriately in
++# the Makefiles.
+ AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
+ [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+   case $enable_ltdl_convenience in
+@@ -2367,13 +2524,13 @@
+ # -----------------------------------
+ # sets LIBLTDL to the link flags for the libltdl installable library and
+ # LTDLINCL to the include flags for the libltdl header and adds
+-# --enable-ltdl-install to the configure arguments.  Note that LIBLTDL
+-# and LTDLINCL are not AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called.  If
+-# DIRECTORY is not provided and an installed libltdl is not found, it is
+-# assumed to be `libltdl'.  LIBLTDL will be prefixed with '${top_builddir}/'
+-# and LTDLINCL will be prefixed with '${top_srcdir}/' (note the single
+-# quotes!).  If your package is not flat and you're not using automake,
+-# define top_builddir and top_srcdir appropriately in the Makefiles.
++# --enable-ltdl-install to the configure arguments.  Note that
++# AC_CONFIG_SUBDIRS is not called here.  If DIRECTORY is not provided,
++# and an installed libltdl is not found, it is assumed to be `libltdl'.
++# LIBLTDL will be prefixed with '${top_builddir}/'# and LTDLINCL with
++# '${top_srcdir}/' (note the single quotes!).  If your package is not
++# flat and you're not using automake, define top_builddir and top_srcdir
++# appropriately in the Makefiles.
+ # 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
+@@ -2411,10 +2568,21 @@
+ # ---------------
+ AC_DEFUN([_LT_AC_LANG_CXX],
+ [AC_REQUIRE([AC_PROG_CXX])
+-AC_REQUIRE([AC_PROG_CXXCPP])
++AC_REQUIRE([_LT_AC_PROG_CXXCPP])
+ _LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}CXX])
+ ])# _LT_AC_LANG_CXX
+ 
++# _LT_AC_PROG_CXXCPP
++# ------------------
++AC_DEFUN([_LT_AC_PROG_CXXCPP],
++[
++AC_REQUIRE([AC_PROG_CXX])
++if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
++    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
++    (test "X$CXX" != "Xg++"))) ; then
++  AC_PROG_CXXCPP
++fi
++])# _LT_AC_PROG_CXXCPP
+ 
+ # AC_LIBTOOL_F77
+ # --------------
+@@ -2454,7 +2622,7 @@
+ 
+ 
+ # AC_LIBTOOL_RC
+-# --------------
++# -------------
+ # enable support for Windows resource files
+ AC_DEFUN([AC_LIBTOOL_RC],
+ [AC_REQUIRE([LT_AC_PROG_RC])
+@@ -2487,36 +2655,9 @@
+ 
+ _LT_AC_SYS_COMPILER
+ 
+-#
+-# Check for any special shared library compilation flags.
+-#
+-_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)=
+-if test "$GCC" = no; then
+-  case $host_os in
+-  sco3.2v5*)
+-    _LT_AC_TAGVAR(lt_prog_cc_shlib, $1)='-belf'
+-    ;;
+-  esac
+-fi
+-if test -n "$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)"; then
+-  AC_MSG_WARN([`$CC' requires `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to build shared libraries])
+-  if echo "$old_CC $old_CFLAGS " | grep "[[ 	]]$]_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)[[[ 	]]" >/dev/null; then :
+-  else
+-    AC_MSG_WARN([add `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to the CC or CFLAGS env variable and reconfigure])
+-    _LT_AC_TAGVAR(lt_cv_prog_cc_can_build_shared, $1)=no
+-  fi
+-fi
+-
+-
+-#
+-# Check to make sure the static flag actually works.
+-#
+-AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $_LT_AC_TAGVAR(lt_prog_compiler_static, $1) works],
+-  _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1),
+-  $_LT_AC_TAGVAR(lt_prog_compiler_static, $1),
+-  [],
+-  [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
+-
++# save warnings/boilerplate of simple test code
++_LT_COMPILER_BOILERPLATE
++_LT_LINKER_BOILERPLATE
+ 
+ ## CAVEAT EMPTOR:
+ ## There is no encapsulation within the following macros, do not change
+@@ -2530,9 +2671,9 @@
+ AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
+ AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
+ AC_LIBTOOL_SYS_LIB_STRIP
+-AC_LIBTOOL_DLOPEN_SELF($1)
++AC_LIBTOOL_DLOPEN_SELF
+ 
+-# Report which librarie types wil actually be built
++# Report which library types will actually be built
+ AC_MSG_CHECKING([if libtool supports shared libraries])
+ AC_MSG_RESULT([$can_build_shared])
+ 
+@@ -2541,7 +2682,7 @@
+ 
+ # On AIX, shared libraries and static libraries use the same namespace, and
+ # are all built from PIC.
+-case "$host_os" in
++case $host_os in
+ aix3*)
+   test "$enable_shared" = yes && enable_static=no
+   if test -n "$RANLIB"; then
+@@ -2550,48 +2691,11 @@
+   fi
+   ;;
+ 
+-aix4*)
++aix4* | aix5*)
+   if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+     test "$enable_shared" = yes && enable_static=no
+   fi
+-  ;;
+-  darwin* | rhapsody*)
+-  if test "$GCC" = yes; then
+-    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+-    case "$host_os" in
+-    rhapsody* | darwin1.[[012]])
+-      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,suppress'
+-      ;;
+-    *) # Darwin 1.3 on
+-      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+-	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+-      else
+-	case ${MACOSX_DEPLOYMENT_TARGET} in
+-	  10.[012])
+-	    _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+-	    ;;
+-	  10.*)
+-	    _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,dynamic_lookup'
+-	    ;;
+-	esac
+-      fi
+-      ;;
+-    esac
+-    output_verbose_link_cmd='echo'
+-    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring'
+-    _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs'
+-    # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
+-    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag  -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-    _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-    _LT_AC_TAGVAR(hardcode_direct, $1)=no
+-    _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
+-    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+-    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
+-    _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+-  else
+-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+-  fi  
+-    ;;  
++    ;;
+ esac
+ AC_MSG_RESULT([$enable_shared])
+ 
+@@ -2616,7 +2720,7 @@
+ AC_DEFUN([_LT_AC_LANG_CXX_CONFIG],
+ [AC_LANG_PUSH(C++)
+ AC_REQUIRE([AC_PROG_CXX])
+-AC_REQUIRE([AC_PROG_CXXCPP])
++AC_REQUIRE([_LT_AC_PROG_CXXCPP])
+ 
+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=
+@@ -2628,6 +2732,7 @@
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=no
++_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+ _LT_AC_TAGVAR(hardcode_automatic, $1)=no
+ _LT_AC_TAGVAR(module_cmds, $1)=
+ _LT_AC_TAGVAR(module_expsym_cmds, $1)=
+@@ -2645,7 +2750,7 @@
+ _LT_AC_TAGVAR(compiler_lib_search_path, $1)=
+ 
+ # Source file extension for C++ test sources.
+-ac_ext=cc
++ac_ext=cpp
+ 
+ # Object file extension for compiled C++ test sources.
+ objext=o
+@@ -2655,11 +2760,15 @@
+ lt_simple_compile_test_code="int some_variable = 0;\n"
+ 
+ # Code to be used in simple link tests
+-lt_simple_link_test_code='int main(int, char *[]) { return(0); }\n'
++lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }\n'
+ 
+ # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+ _LT_AC_SYS_COMPILER
+ 
++# save warnings/boilerplate of simple test code
++_LT_COMPILER_BOILERPLATE
++_LT_LINKER_BOILERPLATE
++
+ # Allow CC to be a program name with arguments.
+ lt_save_CC=$CC
+ lt_save_LD=$LD
+@@ -2670,18 +2779,18 @@
+ if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
+   lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
+ else
+-  unset lt_cv_prog_gnu_ld
++  $as_unset lt_cv_prog_gnu_ld
+ fi
+ if test -n "${lt_cv_path_LDCXX+set}"; then
+   lt_cv_path_LD=$lt_cv_path_LDCXX
+ else
+-  unset lt_cv_path_LD
++  $as_unset lt_cv_path_LD
+ fi
+ test -z "${LDCXX+set}" || LD=$LDCXX
+ CC=${CXX-"c++"}
+ compiler=$CC
+ _LT_AC_TAGVAR(compiler, $1)=$CC
+-cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
++_LT_CC_BASENAME([$compiler])
+ 
+ # We don't want -fno-exception wen compiling C++ code, so set the
+ # no_builtin_flag separately
+@@ -2699,8 +2808,8 @@
+   # Check if GNU C++ uses GNU ld as the underlying linker, since the
+   # archiving commands below assume that GNU ld is being used.
+   if test "$with_gnu_ld" = yes; then
+-    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib'
+-    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
++    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ 
+     _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
+     _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+@@ -2726,7 +2835,7 @@
+     # linker, instead of GNU ld.  If possible, this setting should
+     # overridden to take advantage of the native linker features on
+     # the platform it is being used on.
+-    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -o $lib'
++    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+   fi
+ 
+   # Commands to make compiler produce verbose output that lists
+@@ -2756,8 +2865,23 @@
+       exp_sym_flag='-Bexport'
+       no_entry_flag=""
+     else
+-      # KDE requires run time linking.  Make it the default.
+-      aix_use_runtimelinking=yes
++      aix_use_runtimelinking=no
++
++      # Test if we are trying to use run time linking or normal
++      # AIX style linking. If -brtl is somewhere in LDFLAGS, we
++      # need to do runtime linking.
++      case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
++	for ld_flag in $LDFLAGS; do
++	  case $ld_flag in
++	  *-brtl*)
++	    aix_use_runtimelinking=yes
++	    break
++	    ;;
++	  esac
++	done
++	;;
++      esac
++
+       exp_sym_flag='-bexport'
+       no_entry_flag='-bnoentry'
+     fi
+@@ -2774,7 +2898,7 @@
+     _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+ 
+     if test "$GXX" = yes; then
+-      case $host_os in aix4.[012]|aix4.[012].*)
++      case $host_os in aix4.[[012]]|aix4.[[012]].*)
+       # We only want to do this on AIX 4.2 and lower, the check
+       # below for broken collect2 doesn't work under 4.3+
+ 	collect2name=`${CC} -print-prog-name=collect2`
+@@ -2793,8 +2917,12 @@
+ 	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+ 	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
+ 	fi
++	;;
+       esac
+       shared_flag='-shared'
++      if test "$aix_use_runtimelinking" = yes; then
++	shared_flag="$shared_flag "'${wl}-G'
++      fi
+     else
+       # not using gcc
+       if test "$host_cpu" = ia64; then
+@@ -2803,15 +2931,16 @@
+ 	shared_flag='-G'
+       else
+ 	if test "$aix_use_runtimelinking" = yes; then
+-	  shared_flag='-qmkshrobj ${wl}-G'
++	  shared_flag='${wl}-G'
+ 	else
+-	  shared_flag='-qmkshrobj'
++	  shared_flag='${wl}-bM:SRE'
+ 	fi
+       fi
+     fi
+ 
+-    # Let the compiler handle the export list.
+-    _LT_AC_TAGVAR(always_export_symbols, $1)=no
++    # It seems that -bexpall does not export symbols beginning with
++    # underscore (_), so it is better to generate a list of symbols to export.
++    _LT_AC_TAGVAR(always_export_symbols, $1)=yes
+     if test "$aix_use_runtimelinking" = yes; then
+       # Warning - without using the other runtime loading flags (-brtl),
+       # -berok will link without error, but may produce a broken library.
+@@ -2820,13 +2949,12 @@
+       _LT_AC_SYS_LIBPATH_AIX
+       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+ 
+-      _LT_AC_TAGVAR(archive_cmds, $1)="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '" $shared_flag"
+-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
++      _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+      else
+       if test "$host_cpu" = ia64; then
+ 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
+ 	_LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
+       else
+ 	# Determine the default libpath from the value encoded in an empty executable.
+ 	_LT_AC_SYS_LIBPATH_AIX
+@@ -2835,16 +2963,26 @@
+ 	# -berok will link without error, but may produce a broken library.
+ 	_LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
+ 	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
+-	# -bexpall does not export symbols beginning with underscore (_)
+-	_LT_AC_TAGVAR(always_export_symbols, $1)=yes
+ 	# Exported symbols can be pulled into shared objects from archives
+-	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
++	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
+ 	_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
+-	# This is similar to how AIX traditionally builds it's shared libraries.
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
++	# This is similar to how AIX traditionally builds its shared libraries.
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+       fi
+     fi
+     ;;
++
++  beos*)
++    if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
++      # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
++      # support --undefined.  This deserves some investigation.  FIXME
++      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++    else
++      _LT_AC_TAGVAR(ld_shlibs, $1)=no
++    fi
++    ;;
++
+   chorus*)
+     case $cc_basename in
+       *)
+@@ -2858,12 +2996,12 @@
+     # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+     # as there is no search path for DLLs.
+     _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+-    _LT_AC_TAGVAR(allow_undefined_flag, $1)=no
++    _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+     _LT_AC_TAGVAR(always_export_symbols, $1)=no
+     _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+ 
+     if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
+-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
++      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+       # If the export-symbols file already is a .def file (1st line
+       # is EXPORTS), use it as is; otherwise, prepend...
+       _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+@@ -2872,70 +3010,81 @@
+ 	echo EXPORTS > $output_objdir/$soname.def;
+ 	cat $export_symbols >> $output_objdir/$soname.def;
+       fi~
+-      $CC -shared -nostdlib $output_objdir/$soname.def $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
++      $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+     else
+       _LT_AC_TAGVAR(ld_shlibs, $1)=no
+     fi
+   ;;
++      darwin* | rhapsody*)
++        case $host_os in
++        rhapsody* | darwin1.[[012]])
++         _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
++         ;;
++       *) # Darwin 1.3 on
++         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
++           _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++         else
++           case ${MACOSX_DEPLOYMENT_TARGET} in
++             10.[[012]])
++               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++               ;;
++             10.*)
++               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
++               ;;
++           esac
++         fi
++         ;;
++        esac
++      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
++      _LT_AC_TAGVAR(hardcode_direct, $1)=no
++      _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
++      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
++      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
++      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+ 
+-  darwin* | rhapsody*)
+-  if test "$GXX" = yes; then
+-    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+-    case "$host_os" in
+-    rhapsody* | darwin1.[[012]])
+-      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,suppress'
+-      ;;
+-    *) # Darwin 1.3 on
+-      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+-	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+-      else
+-	case ${MACOSX_DEPLOYMENT_TARGET} in
+-	  10.[012])
+-	    _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+-	    ;;
+-	  10.*)
+-	    _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,dynamic_lookup'
+-	    ;;
+-	esac
+-      fi
+-      ;;
+-    esac
+-    lt_int_apple_cc_single_mod=no
+-    output_verbose_link_cmd='echo'
+-    if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
+-      lt_int_apple_cc_single_mod=yes
+-    fi
+-    if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring'
+-    else
+-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring'
+-    fi
+-    _LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs'
+-
+-    # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
+-    if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-    else
+-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-    fi
+-    _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-    _LT_AC_TAGVAR(hardcode_direct, $1)=no
+-    _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
+-    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+-    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
+-    _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+-  else
+-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+-  fi
+-    ;;
++    if test "$GXX" = yes ; then
++      lt_int_apple_cc_single_mod=no
++      output_verbose_link_cmd='echo'
++      if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then
++       lt_int_apple_cc_single_mod=yes
++      fi
++      if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
++       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
++      else
++          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
++        fi
++        _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++        # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
++          if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
++            _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          else
++            _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          fi
++            _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++      else
++      case $cc_basename in
++        xlc*)
++         output_verbose_link_cmd='echo'
++          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
++          _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
++          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          ;;
++       *)
++         _LT_AC_TAGVAR(ld_shlibs, $1)=no
++          ;;
++      esac
++      fi
++        ;;
+ 
+   dgux*)
+     case $cc_basename in
+-      ec++)
++      ec++*)
+ 	# FIXME: insert proper C++ library support
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+ 	;;
+-      ghcx)
++      ghcx*)
+ 	# Green Hills C++ Compiler
+ 	# FIXME: insert proper C++ library support
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+@@ -2946,14 +3095,14 @@
+ 	;;
+     esac
+     ;;
+-  freebsd[12]*)
++  freebsd[[12]]*)
+     # C++ shared libraries reported to be fairly broken before switch to ELF
+     _LT_AC_TAGVAR(ld_shlibs, $1)=no
+     ;;
+   freebsd-elf*)
+     _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+     ;;
+-  freebsd* | kfreebsd*-gnu)
++  freebsd* | dragonfly*)
+     # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
+     # conventions
+     _LT_AC_TAGVAR(ld_shlibs, $1)=yes
+@@ -2970,12 +3119,12 @@
+ 				# location of the library.
+ 
+     case $cc_basename in
+-    CC)
++    CC*)
+       # FIXME: insert proper C++ library support
+       _LT_AC_TAGVAR(ld_shlibs, $1)=no
+       ;;
+-    aCC)
+-      _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
++    aCC*)
++      _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+       # Commands to make compiler produce verbose output that lists
+       # what "hidden" libraries, object files and flags are used when
+       # linking a shared library.
+@@ -2984,11 +3133,11 @@
+       # explicitly linking system object files so we need to strip them
+       # from the output so that they don't get included in the library
+       # dependencies.
+-      output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | egrep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
++      output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[[-]]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+       ;;
+     *)
+       if test "$GXX" = yes; then
+-        _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
++        _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+       else
+         # FIXME: insert proper C++ library support
+         _LT_AC_TAGVAR(ld_shlibs, $1)=no
+@@ -2998,33 +3147,22 @@
+     ;;
+   hpux10*|hpux11*)
+     if test $with_gnu_ld = no; then
+-      case "$host_cpu" in
+-      hppa*64*)
+-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
++      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
++      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
++
++      case $host_cpu in
++      hppa*64*|ia64*)
+ 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
+-	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+-        ;;
+-      ia64*)
+-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+         ;;
+       *)
+-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+-	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+ 	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+         ;;
+       esac
+     fi
+-    case "$host_cpu" in
+-    hppa*64*)
+-      _LT_AC_TAGVAR(hardcode_direct, $1)=no
+-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-      ;;
+-    ia64*)
++    case $host_cpu in
++    hppa*64*|ia64*)
+       _LT_AC_TAGVAR(hardcode_direct, $1)=no
+       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
+-					      # but as the default
+-					      # location of the library.
+       ;;
+     *)
+       _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+@@ -3035,17 +3173,20 @@
+     esac
+ 
+     case $cc_basename in
+-      CC)
++      CC*)
+ 	# FIXME: insert proper C++ library support
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+ 	;;
+-      aCC)
+-	case "$host_cpu" in
+-	hppa*64*|ia64*)
+-	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
++      aCC*)
++	case $host_cpu in
++	hppa*64*)
++	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++	  ;;
++	ia64*)
++	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ 	  ;;
+ 	*)
+-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects'
++	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ 	  ;;
+ 	esac
+ 	# Commands to make compiler produce verbose output that lists
+@@ -3061,12 +3202,15 @@
+       *)
+ 	if test "$GXX" = yes; then
+ 	  if test $with_gnu_ld = no; then
+-	    case "$host_cpu" in
+-	    ia64*|hppa*64*)
+-	      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
++	    case $host_cpu in
++	    hppa*64*)
++	      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++	      ;;
++	    ia64*)
++	      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ 	      ;;
+ 	    *)
+-	      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects'
++	      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ 	      ;;
+ 	    esac
+ 	  fi
+@@ -3077,11 +3221,25 @@
+ 	;;
+     esac
+     ;;
++  interix3*)
++    _LT_AC_TAGVAR(hardcode_direct, $1)=no
++    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++    # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
++    # Instead, shared libraries are loaded at an image base (0x10000000 by
++    # default) and relocated if they conflict, which is a slow very memory
++    # consuming and fragmenting process.  To avoid this, we pick a random,
++    # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
++    # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
++    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
++    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
++    ;;
+   irix5* | irix6*)
+     case $cc_basename in
+-      CC)
++      CC*)
+ 	# SGI C++
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+ 
+ 	# Archives containing C++ object files must be created using
+ 	# "CC -ar", where "CC" is the IRIX C++ compiler.  This is
+@@ -3092,9 +3250,9 @@
+       *)
+ 	if test "$GXX" = yes; then
+ 	  if test "$with_gnu_ld" = no; then
+-	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
++	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ 	  else
+-	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
++	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
+ 	  fi
+ 	fi
+ 	_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+@@ -3103,16 +3261,16 @@
+     _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+     _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+     ;;
+-  linux*)
++  linux* | k*bsd*-gnu)
+     case $cc_basename in
+-      KCC)
++      KCC*)
+ 	# Kuck and Associates, Inc. (KAI) C++ Compiler
+ 
+ 	# KCC will only create a shared library if the output file
+ 	# ends with ".so" (or ".sl" for HP-UX), so rename the library
+ 	# to its proper name (with version) after linking.
+-	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib; mv \$templib $lib'
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
++	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
+ 	# Commands to make compiler produce verbose output that lists
+ 	# what "hidden" libraries, object files and flags are used when
+ 	# linking a shared library.
+@@ -3130,20 +3288,44 @@
+ 	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
+ 	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
+ 	;;
+-      icpc)
++      icpc*)
+ 	# Intel C++
+ 	with_gnu_ld=yes
++	# version 8.0 and above of icpc choke on multiply defined symbols
++	# if we add $predep_objects and $postdep_objects, however 7.1 and
++	# earlier do not add the objects themselves.
++	case `$CC -V 2>&1` in
++	*"Version 7."*)
++  	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
++  	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++	  ;;
++	*)  # Version 8.0 or newer
++	  tmp_idyn=
++	  case $host_cpu in
++	    ia64*) tmp_idyn=' -i_dynamic';;
++	  esac
++  	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++	  ;;
++	esac
+ 	_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib'
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+ 	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+ 	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+ 	;;
+-      cxx)
++      pgCC*)
++        # Portland Group C++ compiler
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
++  	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
++
++	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
++	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
++	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
++        ;;
++      cxx*)
+ 	# Compaq C++
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib'
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
+ 
+ 	runpath_var=LD_RUN_PATH
+ 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+@@ -3171,7 +3353,7 @@
+     ;;
+   mvs*)
+     case $cc_basename in
+-      cxx)
++      cxx*)
+ 	# FIXME: insert proper C++ library support
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+ 	;;
+@@ -3181,7 +3363,7 @@
+ 	;;
+     esac
+     ;;
+-  netbsd*)
++  netbsd* | netbsdelf*-gnu)
+     if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+       _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
+       wlarc=
+@@ -3192,15 +3374,31 @@
+     # Workaround some broken pre-1.5 toolchains
+     output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
+     ;;
++  openbsd2*)
++    # C++ shared libraries are fairly broken
++    _LT_AC_TAGVAR(ld_shlibs, $1)=no
++    ;;
++  openbsd*)
++    _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
++    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++    if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
++      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++    fi
++    output_verbose_link_cmd='echo'
++    ;;
+   osf3*)
+     case $cc_basename in
+-      KCC)
++      KCC*)
+ 	# Kuck and Associates, Inc. (KAI) C++ Compiler
+ 
+ 	# KCC will only create a shared library if the output file
+ 	# ends with ".so" (or ".sl" for HP-UX), so rename the library
+ 	# to its proper name (with version) after linking.
+-	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib; mv \$templib $lib'
++	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+ 
+ 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+ 	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+@@ -3210,14 +3408,14 @@
+ 	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
+ 
+ 	;;
+-      RCC)
++      RCC*)
+ 	# Rational C++ 2.4.1
+ 	# FIXME: insert proper C++ library support
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+ 	;;
+-      cxx)
++      cxx*)
+ 	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+ 
+ 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ 	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+@@ -3235,7 +3433,7 @@
+       *)
+ 	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+ 	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
++	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ 
+ 	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ 	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+@@ -3254,13 +3452,13 @@
+     ;;
+   osf4* | osf5*)
+     case $cc_basename in
+-      KCC)
++      KCC*)
+ 	# Kuck and Associates, Inc. (KAI) C++ Compiler
+ 
+ 	# KCC will only create a shared library if the output file
+ 	# ends with ".so" (or ".sl" for HP-UX), so rename the library
+ 	# to its proper name (with version) after linking.
+-	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib; mv \$templib $lib'
++	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+ 
+ 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+ 	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+@@ -3269,17 +3467,17 @@
+ 	# the KAI C++ compiler.
+ 	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs'
+ 	;;
+-      RCC)
++      RCC*)
+ 	# Rational C++ 2.4.1
+ 	# FIXME: insert proper C++ library support
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+ 	;;
+-      cxx)
++      cxx*)
+ 	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+ 	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
+ 	  echo "-hidden">> $lib.exp~
+-	  $CC -shared$allow_undefined_flag $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -msym -soname $soname -Wl,-input -Wl,$lib.exp  `test -n "$verstring" && echo -set_version	$verstring` -update_registry $objdir/so_locations -o $lib~
++	  $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp  `test -n "$verstring" && echo -set_version	$verstring` -update_registry ${output_objdir}/so_locations -o $lib~
+ 	  $rm $lib.exp'
+ 
+ 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+@@ -3298,7 +3496,7 @@
+       *)
+ 	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+ 	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+-	 _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
++	 _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ 
+ 	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ 	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+@@ -3319,27 +3517,14 @@
+     # FIXME: insert proper C++ library support
+     _LT_AC_TAGVAR(ld_shlibs, $1)=no
+     ;;
+-  sco*)
+-    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+-    case $cc_basename in
+-      CC)
+-	# FIXME: insert proper C++ library support
+-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+-	;;
+-      *)
+-	# FIXME: insert proper C++ library support
+-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+-	;;
+-    esac
+-    ;;
+   sunos4*)
+     case $cc_basename in
+-      CC)
++      CC*)
+ 	# Sun C++ 4.x
+ 	# FIXME: insert proper C++ library support
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+ 	;;
+-      lcc)
++      lcc*)
+ 	# Lucid
+ 	# FIXME: insert proper C++ library support
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+@@ -3352,36 +3537,33 @@
+     ;;
+   solaris*)
+     case $cc_basename in
+-      CC)
++      CC*)
+ 	# Sun C++ 4.2, 5.x and Centerline C++
++        _LT_AC_TAGVAR(archive_cmds_need_lc,$1)=yes
+ 	_LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -nolib -h$soname -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects'
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag}  -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ 	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+-	$CC -G${allow_undefined_flag} -nolib ${wl}-M ${wl}$lib.exp -h$soname -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~$rm $lib.exp'
++	$CC -G${allow_undefined_flag}  ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
+ 
+ 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+ 	_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+ 	case $host_os in
+-	  solaris2.[0-5] | solaris2.[0-5].*) ;;
++	  solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+ 	  *)
+ 	    # The C++ compiler is used as linker so we must use $wl
+ 	    # flag to pass the commands to the underlying system
+-	    # linker.
++	    # linker. We must also pass each convience library through
++	    # to the system linker between allextract/defaultextract.
++	    # The C++ compiler will combine linker options so we
++	    # cannot just pass the convience library names through
++	    # without $wl.
+ 	    # Supported since Solaris 2.6 (maybe 2.5.1?)
+-	    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
++	    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract'
+ 	    ;;
+ 	esac
+ 	_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+ 
+-	# Commands to make compiler produce verbose output that lists
+-	# what "hidden" libraries, object files and flags are used when
+-	# linking a shared library.
+-	#
+-	# There doesn't appear to be a way to prevent this compiler from
+-	# explicitly linking system object files so we need to strip them
+-	# from the output so that they don't get included in the library
+-	# dependencies.
+-	output_verbose_link_cmd='templist=`$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep "\-[[LR]]"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
++	output_verbose_link_cmd='echo'
+ 
+ 	# Archives containing C++ object files must be created using
+ 	# "CC -xar", where "CC" is the Sun C++ compiler.  This is
+@@ -3389,9 +3571,9 @@
+ 	# in the archive.
+ 	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
+ 	;;
+-      gcx)
++      gcx*)
+ 	# Green Hills C++ Compiler
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-h $wl$soname -o $lib'
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+ 
+ 	# The C++ compiler must be used to create the archive.
+ 	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
+@@ -3401,9 +3583,9 @@
+ 	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+ 	  _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
+ 	  if $CC --version | grep -v '^2\.7' > /dev/null; then
+-	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-h $wl$soname -o $lib'
++	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+ 	    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+-		$CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~$rm $lib.exp'
++		$CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
+ 
+ 	    # Commands to make compiler produce verbose output that lists
+ 	    # what "hidden" libraries, object files and flags are used when
+@@ -3412,9 +3594,9 @@
+ 	  else
+ 	    # g++ 2.7 appears to require `-G' NOT `-shared' on this
+ 	    # platform.
+-	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-h $wl$soname -o $lib'
++	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+ 	    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+-		$CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~$rm $lib.exp'
++		$CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
+ 
+ 	    # Commands to make compiler produce verbose output that lists
+ 	    # what "hidden" libraries, object files and flags are used when
+@@ -3427,12 +3609,63 @@
+ 	;;
+     esac
+     ;;
+-  sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7*)
++  sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
++    _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
++    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
++    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++    runpath_var='LD_RUN_PATH'
++
++    case $cc_basename in
++      CC*)
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	;;
++      *)
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	;;
++    esac
++    ;;
++  sysv5* | sco3.2v5* | sco5v6*)
++    # Note: We can NOT use -z defs as we might desire, because we do not
++    # link with -lc, and that would cause any symbols used from libc to
++    # always be unresolved, which means just about no library would
++    # ever link correctly.  If we're not using GNU ld we use -z text
++    # though, which does catch some bad symbols but isn't as heavy-handed
++    # as -z defs.
++    # For security reasons, it is highly recommended that you always
++    # use absolute paths for naming shared libraries, and exclude the
++    # DT_RUNPATH tag from executables and libraries.  But doing so
++    # requires that you compile everything twice, which is a pain.
++    # So that behaviour is only enabled if SCOABSPATH is set to a
++    # non-empty value in the environment.  Most likely only useful for
++    # creating official distributions of packages.
++    # This is a hack until libtool officially supports absolute path
++    # names for shared libraries.
++    _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
++    _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
+     _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
++    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
++    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
++    _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
++    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
++    runpath_var='LD_RUN_PATH'
++
++    case $cc_basename in
++      CC*)
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	;;
++      *)
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	;;
++    esac
+     ;;
+   tandem*)
+     case $cc_basename in
+-      NCC)
++      NCC*)
+ 	# NonStop-UX NCC 3.20
+ 	# FIXME: insert proper C++ library support
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+@@ -3469,8 +3702,6 @@
+ AC_LIBTOOL_PROG_LD_SHLIBS($1)
+ AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
+ AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
+-AC_LIBTOOL_SYS_LIB_STRIP
+-AC_LIBTOOL_DLOPEN_SELF($1)
+ 
+ AC_LIBTOOL_CONFIG($1)
+ 
+@@ -3488,7 +3719,7 @@
+ ])# AC_LIBTOOL_LANG_CXX_CONFIG
+ 
+ # AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME])
+-# ------------------------
++# ------------------------------------
+ # Figure out "hidden" library dependencies from verbose
+ # compiler output when linking a shared library.
+ # Parse the compiler output and extract the necessary
+@@ -3542,7 +3773,7 @@
+   # The `*' in the case matches for architectures that use `case' in
+   # $output_verbose_cmd can trigger glob expansion during the loop
+   # eval without this substitution.
+-  output_verbose_link_cmd="`$echo \"X$output_verbose_link_cmd\" | $Xsed -e \"$no_glob_subst\"`"
++  output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"`
+ 
+   for p in `eval $output_verbose_link_cmd`; do
+     case $p in
+@@ -3582,7 +3813,7 @@
+        fi
+        ;;
+ 
+-    *.$objext|*.$libext)
++    *.$objext)
+        # This assumes that the test object file only shows up
+        # once in the compiler output.
+        if test "$p" = "conftest.$objext"; then
+@@ -3618,13 +3849,37 @@
+ 
+ $rm -f confest.$objext
+ 
++# PORTME: override above test on systems where it is broken
++ifelse([$1],[CXX],
++[case $host_os in
++interix3*)
++  # Interix 3.5 installs completely hosed .la files for C++, so rather than
++  # hack all around it, let's just trust "g++" to DTRT.
++  _LT_AC_TAGVAR(predep_objects,$1)=
++  _LT_AC_TAGVAR(postdep_objects,$1)=
++  _LT_AC_TAGVAR(postdeps,$1)=
++  ;;
++
++solaris*)
++  case $cc_basename in
++  CC*)
++    # Adding this requires a known-good setup of shared libraries for
++    # Sun compiler versions before 5.6, else PIC objects from an old
++    # archive will be linked into the output, leading to subtle bugs.
++    _LT_AC_TAGVAR(postdeps,$1)='-lCstd -lCrun'
++    ;;
++  esac
++  ;;
++esac
++])
++
+ case " $_LT_AC_TAGVAR(postdeps, $1) " in
+ *" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
+ esac
+ ])# AC_LIBTOOL_POSTDEP_PREDEP
+ 
+ # AC_LIBTOOL_LANG_F77_CONFIG
+-# ------------------------
++# --------------------------
+ # 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'.
+@@ -3668,12 +3923,16 @@
+ # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+ _LT_AC_SYS_COMPILER
+ 
++# save warnings/boilerplate of simple test code
++_LT_COMPILER_BOILERPLATE
++_LT_LINKER_BOILERPLATE
++
+ # Allow CC to be a program name with arguments.
+ lt_save_CC="$CC"
+ CC=${F77-"f77"}
+ compiler=$CC
+ _LT_AC_TAGVAR(compiler, $1)=$CC
+-cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
++_LT_CC_BASENAME([$compiler])
+ 
+ AC_MSG_CHECKING([if libtool supports shared libraries])
+ AC_MSG_RESULT([$can_build_shared])
+@@ -3683,7 +3942,7 @@
+ 
+ # On AIX, shared libraries and static libraries use the same namespace, and
+ # are all built from PIC.
+-case "$host_os" in
++case $host_os in
+ aix3*)
+   test "$enable_shared" = yes && enable_static=no
+   if test -n "$RANLIB"; then
+@@ -3691,8 +3950,10 @@
+     postinstall_cmds='$RANLIB $lib'
+   fi
+   ;;
+-aix4*)
+-  test "$enable_shared" = yes && enable_static=no
++aix4* | aix5*)
++  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
++    test "$enable_shared" = yes && enable_static=no
++  fi
+   ;;
+ esac
+ AC_MSG_RESULT([$enable_shared])
+@@ -3702,8 +3963,6 @@
+ test "$enable_shared" = yes || enable_static=yes
+ AC_MSG_RESULT([$enable_static])
+ 
+-test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
+-
+ _LT_AC_TAGVAR(GCC, $1)="$G77"
+ _LT_AC_TAGVAR(LD, $1)="$LD"
+ 
+@@ -3713,8 +3972,6 @@
+ AC_LIBTOOL_PROG_LD_SHLIBS($1)
+ AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
+ AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
+-AC_LIBTOOL_SYS_LIB_STRIP
+-
+ 
+ AC_LIBTOOL_CONFIG($1)
+ 
+@@ -3743,20 +4000,27 @@
+ lt_simple_compile_test_code="class foo {}\n"
+ 
+ # Code to be used in simple link tests
+-lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }\n'
++lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }\n'
+ 
+ # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+ _LT_AC_SYS_COMPILER
+ 
++# save warnings/boilerplate of simple test code
++_LT_COMPILER_BOILERPLATE
++_LT_LINKER_BOILERPLATE
++
+ # Allow CC to be a program name with arguments.
+ lt_save_CC="$CC"
+ CC=${GCJ-"gcj"}
+ compiler=$CC
+ _LT_AC_TAGVAR(compiler, $1)=$CC
++_LT_CC_BASENAME([$compiler])
+ 
+ # GCJ did not exist at the time GCC didn't implicitly link libc in.
+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+ 
++_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
++
+ ## CAVEAT EMPTOR:
+ ## There is no encapsulation within the following macros, do not change
+ ## the running order or otherwise move them around unless you know exactly
+@@ -3768,8 +4032,6 @@
+ AC_LIBTOOL_PROG_LD_SHLIBS($1)
+ AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
+ AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
+-AC_LIBTOOL_SYS_LIB_STRIP
+-AC_LIBTOOL_DLOPEN_SELF($1)
+ 
+ AC_LIBTOOL_CONFIG($1)
+ 
+@@ -3779,7 +4041,7 @@
+ 
+ 
+ # AC_LIBTOOL_LANG_RC_CONFIG
+-# --------------------------
++# -------------------------
+ # Ensure that the configuration vars for the Windows resource compiler are
+ # suitably defined.  Those variables are subsequently used by
+ # AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
+@@ -3803,11 +4065,16 @@
+ # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+ _LT_AC_SYS_COMPILER
+ 
++# save warnings/boilerplate of simple test code
++_LT_COMPILER_BOILERPLATE
++_LT_LINKER_BOILERPLATE
++
+ # Allow CC to be a program name with arguments.
+ lt_save_CC="$CC"
+ CC=${RC-"windres"}
+ compiler=$CC
+ _LT_AC_TAGVAR(compiler, $1)=$CC
++_LT_CC_BASENAME([$compiler])
+ _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
+ 
+ AC_LIBTOOL_CONFIG($1)
+@@ -3833,11 +4100,12 @@
+   # without removal of \ escapes.
+   if test -n "${ZSH_VERSION+set}" ; then
+     setopt NO_GLOB_SUBST
+-  fi  
++  fi
+   # Now quote all the things that may contain metacharacters while being
+   # careful not to overquote the AC_SUBSTed values.  We take copies of the
+   # variables and quote the copies for generation of the libtool script.
+-  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL \
++  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
++    SED SHELL STRIP \
+     libname_spec library_names_spec soname_spec extract_expsyms_cmds \
+     old_striplib striplib file_magic_cmd finish_cmds finish_eval \
+     deplibs_check_method reload_flag reload_cmds need_locks \
+@@ -3887,7 +4155,7 @@
+     _LT_AC_TAGVAR(archive_cmds, $1) | \
+     _LT_AC_TAGVAR(archive_expsym_cmds, $1) | \
+     _LT_AC_TAGVAR(module_cmds, $1) | \
+-    _LT_AC_TAGVAR(module_expsym_cmds, $1) | \   
++    _LT_AC_TAGVAR(module_expsym_cmds, $1) | \
+     _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \
+     _LT_AC_TAGVAR(export_symbols_cmds, $1) | \
+     extract_expsyms_cmds | reload_cmds | finish_cmds | \
+@@ -3953,11 +4221,11 @@
+ SED=$lt_SED
+ 
+ # Sed that helps us avoid accidentally triggering echo(1) options like -n.
+-Xsed="$SED -e s/^X//"
++Xsed="$SED -e 1s/^X//"
+ 
+ # The HP-UX ksh and POSIX shell print the target directory to stdout
+ # if CDPATH is set.
+-if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+ 
+ # The names of the tagged configurations supported by this script.
+ available_tags=
+@@ -3988,6 +4256,12 @@
+ # The host system.
+ host_alias=$host_alias
+ host=$host
++host_os=$host_os
++
++# The build system.
++build_alias=$build_alias
++build=$build
++build_os=$build_os
+ 
+ # An echo program that does not interpret backslashes.
+ echo=$lt_echo
+@@ -3999,6 +4273,9 @@
+ # A C compiler.
+ LTCC=$lt_LTCC
+ 
++# LTCC compiler flags.
++LTCFLAGS=$lt_LTCFLAGS
++
+ # A language-specific compiler.
+ CC=$lt_[]_LT_AC_TAGVAR(compiler, $1)
+ 
+@@ -4018,7 +4295,7 @@
+ NM=$lt_NM
+ 
+ # A symbol stripping program
+-STRIP=$STRIP
++STRIP=$lt_STRIP
+ 
+ # Used to examine libraries when file_magic_cmd begins "file"
+ MAGIC_CMD=$MAGIC_CMD
+@@ -4049,7 +4326,7 @@
+ libext="$libext"
+ 
+ # Shared library suffix (normally ".so").
+-shrext='$shrext'
++shrext_cmds='$shrext_cmds'
+ 
+ # Executable file suffix (normally "").
+ exeext="$exeext"
+@@ -4064,7 +4341,7 @@
+ # Does compiler simultaneously support -c and -o options?
+ compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)
+ 
+-# Must we lock files when doing compilation ?
++# Must we lock files when doing compilation?
+ need_locks=$lt_need_locks
+ 
+ # Do we need the lib prefix for modules?
+@@ -4293,7 +4570,10 @@
+   # If there is no Makefile yet, we rely on a make rule to execute
+   # `config.status --recheck' to rerun these tests and create the
+   # libtool script then.
+-  test -f Makefile && make "$ltmain"
++  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
++  if test -f "$ltmain_in"; then
++    test -f Makefile && make "$ltmain"
++  fi
+ fi
+ ])# AC_LIBTOOL_CONFIG
+ 
+@@ -4335,9 +4615,6 @@
+ # Regexp to match symbols that can be accessed directly from C.
+ sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
+ 
+-# Transform the above into a raw symbol and a C symbol.
+-symxfrm='\1 \2\3 \3'
+-
+ # Transform an extracted symbol line into a proper C declaration
+ lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
+ 
+@@ -4359,14 +4636,30 @@
+   lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
+   lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
+   ;;
++linux* | k*bsd*-gnu)
++  if test "$host_cpu" = ia64; then
++    symcode='[[ABCDGIRSTW]]'
++    lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
++    lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
++  fi
++  ;;
+ irix* | nonstopux*)
+   symcode='[[BCDEGRST]]'
+   ;;
+ osf*)
+   symcode='[[BCDEGQRST]]'
+   ;;
+-solaris* | sysv5*)
+-  symcode='[[BDT]]'
++solaris*)
++  symcode='[[BDRT]]'
++  ;;
++sco3.2v5*)
++  symcode='[[DT]]'
++  ;;
++sysv4.2uw2*)
++  symcode='[[DT]]'
++  ;;
++sysv5* | sco5v6* | unixware* | OpenUNIX*)
++  symcode='[[ABDT]]'
+   ;;
+ sysv4)
+   symcode='[[DFNSTU]]'
+@@ -4384,14 +4677,17 @@
+ # If we're using GNU nm, then use its standard symbol codes.
+ case `$NM -V 2>&1` in
+ *GNU* | *'with BFD'*)
+-  symcode='[[ABCDGISTW]]' ;;
++  symcode='[[ABCDGIRSTW]]' ;;
+ esac
+ 
+ # Try without a prefix undercore, then with it.
+ for ac_symprfx in "" "_"; do
+ 
++  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
++  symxfrm="\\1 $ac_symprfx\\2 \\2"
++
+   # Write the raw and C identifiers.
+-  lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ 	]]\($symcode$symcode*\)[[ 	]][[ 	]]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'"
++  lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ 	]]\($symcode$symcode*\)[[ 	]][[ 	]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
+ 
+   # Check to see that the pipe works correctly.
+   pipe_works=no
+@@ -4547,6 +4843,10 @@
+       # DJGPP does not support shared libraries at all
+       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+       ;;
++    interix3*)
++      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
++      # Instead, we relocate shared libraries at runtime.
++      ;;
+     sysv4*MP*)
+       if test -d /usr/nec; then
+ 	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
+@@ -4555,7 +4855,7 @@
+     hpux*)
+       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+       # not for PA HP-UX.
+-      case "$host_cpu" in
++      case $host_cpu in
+       hppa*64*|ia64*)
+ 	;;
+       *)
+@@ -4580,18 +4880,28 @@
+ 	;;
+       chorus*)
+ 	case $cc_basename in
+-	cxch68)
++	cxch68*)
+ 	  # Green Hills C++ Compiler
+ 	  # _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
+ 	  ;;
+ 	esac
+ 	;;
++       darwin*)
++         # PIC is the default on this platform
++         # Common symbols not allowed in MH_DYLIB files
++         case $cc_basename in
++           xlc*)
++           _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon'
++           _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++           ;;
++         esac
++       ;;
+       dgux*)
+ 	case $cc_basename in
+-	  ec++)
++	  ec++*)
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ 	    ;;
+-	  ghcx)
++	  ghcx*)
+ 	    # Green Hills C++ Compiler
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+ 	    ;;
+@@ -4599,22 +4909,22 @@
+ 	    ;;
+ 	esac
+ 	;;
+-      freebsd* | kfreebsd*-gnu)
++      freebsd* | dragonfly*)
+ 	# FreeBSD uses GNU C++
+ 	;;
+       hpux9* | hpux10* | hpux11*)
+ 	case $cc_basename in
+-	  CC)
++	  CC*)
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
++	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
+ 	    if test "$host_cpu" != ia64; then
+ 	      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+ 	    fi
+ 	    ;;
+-	  aCC)
++	  aCC*)
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
+-	    case "$host_cpu" in
++	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
++	    case $host_cpu in
+ 	    hppa*64*|ia64*)
+ 	      # +Z the default
+ 	      ;;
+@@ -4627,9 +4937,13 @@
+ 	    ;;
+ 	esac
+ 	;;
++      interix*)
++	# This is c89, which is MS Visual C++ (no shared libs)
++	# Anyone wants to do a port?
++	;;
+       irix5* | irix6* | nonstopux*)
+ 	case $cc_basename in
+-	  CC)
++	  CC*)
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+ 	    # CC pic flag -KPIC is the default.
+@@ -4638,20 +4952,26 @@
+ 	    ;;
+ 	esac
+ 	;;
+-      linux*)
++      linux* | k*bsd*-gnu)
+ 	case $cc_basename in
+-	  KCC)
++	  KCC*)
+ 	    # KAI C++ Compiler
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+ 	    ;;
+-	  icpc)
++	  icpc* | ecpc*)
+ 	    # Intel C++
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
+-	    ;; 
+-	  cxx)
++	    ;;
++	  pgCC*)
++	    # Portland Group C++ compiler.
++	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
++	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++	    ;;
++	  cxx*)
+ 	    # Compaq C++
+ 	    # Make sure the PIC flag is empty.  It appears that all Alpha
+ 	    # Linux and Compaq Tru64 Unix objects are PIC.
+@@ -4668,25 +4988,25 @@
+ 	;;
+       mvs*)
+ 	case $cc_basename in
+-	  cxx)
++	  cxx*)
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'
+ 	    ;;
+ 	  *)
+ 	    ;;
+ 	esac
+ 	;;
+-      netbsd*)
++      netbsd* | netbsdelf*-gnu)
+ 	;;
+       osf3* | osf4* | osf5*)
+ 	case $cc_basename in
+-	  KCC)
++	  KCC*)
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
+ 	    ;;
+-	  RCC)
++	  RCC*)
+ 	    # Rational C++ 2.4.1
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+ 	    ;;
+-	  cxx)
++	  cxx*)
+ 	    # Digital/Compaq C++
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ 	    # Make sure the PIC flag is empty.  It appears that all Alpha
+@@ -4700,24 +5020,15 @@
+ 	;;
+       psos*)
+ 	;;
+-      sco*)
+-	case $cc_basename in
+-	  CC)
+-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+-	    ;;
+-	  *)
+-	    ;;
+-	esac
+-	;;
+       solaris*)
+ 	case $cc_basename in
+-	  CC)
++	  CC*)
+ 	    # Sun C++ 4.2, 5.x and Centerline C++
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+ 	    ;;
+-	  gcx)
++	  gcx*)
+ 	    # Green Hills C++ Compiler
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+ 	    ;;
+@@ -4727,12 +5038,12 @@
+ 	;;
+       sunos4*)
+ 	case $cc_basename in
+-	  CC)
++	  CC*)
+ 	    # Sun C++ 4.x
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ 	    ;;
+-	  lcc)
++	  lcc*)
+ 	    # Lucid
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+ 	    ;;
+@@ -4742,7 +5053,7 @@
+ 	;;
+       tandem*)
+ 	case $cc_basename in
+-	  NCC)
++	  NCC*)
+ 	    # NonStop-UX NCC 3.20
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ 	    ;;
+@@ -4750,7 +5061,14 @@
+ 	    ;;
+ 	esac
+ 	;;
+-      unixware*)
++      sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
++	case $cc_basename in
++	  CC*)
++	    _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'
++	    ;;
++	esac
+ 	;;
+       vxworks*)
+ 	;;
+@@ -4797,6 +5115,11 @@
+       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
+       ;;
+ 
++    interix3*)
++      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
++      # Instead, we relocate shared libraries at runtime.
++      ;;
++
+     msdosdjgpp*)
+       # Just because we use GCC doesn't mean we suddenly get shared libraries
+       # on systems that don't support them.
+@@ -4813,7 +5136,7 @@
+     hpux*)
+       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+       # not for PA HP-UX.
+-      case "$host_cpu" in
++      case $host_cpu in
+       hppa*64*|ia64*)
+ 	# +Z the default
+ 	;;
+@@ -4839,6 +5162,16 @@
+ 	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
+       fi
+       ;;
++      darwin*)
++        # PIC is the default on this platform
++        # Common symbols not allowed in MH_DYLIB files
++       case $cc_basename in
++         xlc*)
++         _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon'
++         _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++         ;;
++       esac
++       ;;
+ 
+     mingw* | pw32* | os2*)
+       # This hack is so that the source file can tell whether it is being
+@@ -4850,7 +5183,7 @@
+       _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+       # not for PA HP-UX.
+-      case "$host_cpu" in
++      case $host_cpu in
+       hppa*64*|ia64*)
+ 	# +Z the default
+ 	;;
+@@ -4873,13 +5206,20 @@
+       _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+       ;;
+ 
+-    linux*)
+-      case $CC in
++    linux* | k*bsd*-gnu)
++      case $cc_basename in
+       icc* | ecc*)
+ 	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ 	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ 	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
+         ;;
++      pgcc* | pgf77* | pgf90* | pgf95*)
++        # Portland Group compilers (*not* the Pentium gcc compiler,
++	# which looks to be a dead project)
++	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
++	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++        ;;
+       ccc*)
+         _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+         # All Alpha code is PIC.
+@@ -4894,15 +5234,15 @@
+       _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+       ;;
+ 
+-    sco3.2v5*)
+-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kpic'
+-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-dn'
+-      ;;
+-
+     solaris*)
+-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+       _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++      case $cc_basename in
++      f77* | f90* | f95*)
++	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
++      *)
++	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
++      esac
+       ;;
+ 
+     sunos4*)
+@@ -4911,7 +5251,7 @@
+       _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+       ;;
+ 
+-    sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
++    sysv4 | sysv4.2uw2* | sysv4.3*)
+       _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+       _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+@@ -4924,6 +5264,17 @@
+       fi
+       ;;
+ 
++    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
++      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++      ;;
++
++    unicos*)
++      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
++      ;;
++
+     uts4*)
+       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+       _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+@@ -4951,7 +5302,7 @@
+     [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
+ fi
+-case "$host_os" in
++case $host_os in
+   # For platforms which do not support PIC, -DPIC is meaningless:
+   *djgpp*)
+     _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+@@ -4960,6 +5311,16 @@
+     _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])"
+     ;;
+ esac
++
++#
++# Check to make sure the static flag actually works.
++#
++wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\"
++AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
++  _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1),
++  $lt_tmp_static_flag,
++  [],
++  [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
+ ])
+ 
+ 
+@@ -4984,7 +5345,10 @@
+     _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
+   ;;
+   cygwin* | mingw*)
+-    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
++    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([[^ ]]*\) [[^ ]]*/\1 DATA/;/^I /d;/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
++  ;;
++  linux* | k*bsd*-gnu)
++    _LT_AC_TAGVAR(link_all_deplibs, $1)=no
+   ;;
+   *)
+     _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+@@ -5010,7 +5374,7 @@
+   _LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
+   _LT_AC_TAGVAR(hardcode_automatic, $1)=no
+   _LT_AC_TAGVAR(module_cmds, $1)=
+-  _LT_AC_TAGVAR(module_expsym_cmds, $1)=  
++  _LT_AC_TAGVAR(module_expsym_cmds, $1)=
+   _LT_AC_TAGVAR(always_export_symbols, $1)=no
+   _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+   # include_expsyms should be a list of space-separated symbols to be *always*
+@@ -5027,7 +5391,8 @@
+   # rely on this symbol name, it's probably fine to never include it in
+   # preloaded symbol tables.
+   extract_expsyms_cmds=
+-
++  # Just being paranoid about ensuring that cc_basename is set.
++  _LT_CC_BASENAME([$compiler])
+   case $host_os in
+   cygwin* | mingw* | pw32*)
+     # FIXME: the MSVC++ port hasn't been tested in a loooong time
+@@ -5037,6 +5402,10 @@
+       with_gnu_ld=no
+     fi
+     ;;
++  interix*)
++    # we just hope/assume this is gcc and not c89 (= MSVC++)
++    with_gnu_ld=yes
++    ;;
+   openbsd*)
+     with_gnu_ld=no
+     ;;
+@@ -5047,6 +5416,27 @@
+     # If archive_cmds runs LD, not CC, wlarc should be empty
+     wlarc='${wl}'
+ 
++    # Set some defaults for GNU ld with shared library support. These
++    # are reset later if shared libraries are not supported. Putting them
++    # here allows them to be overridden if necessary.
++    runpath_var=LD_RUN_PATH
++    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
++    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
++    # ancient GNU ld didn't support --whole-archive et. al.
++    if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
++	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++      else
++  	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
++    fi
++    supports_anon_versioning=no
++    case `$LD -v 2>/dev/null` in
++      *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
++      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
++      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
++      *\ 2.11.*) ;; # other 2.11 versions
++      *) supports_anon_versioning=yes ;;
++    esac
++
+     # See if GNU ld supports shared libraries.
+     case $host_os in
+     aix3* | aix4* | aix5*)
+@@ -5084,7 +5474,7 @@
+ 	_LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+ 	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+ 	# support --undefined.  This deserves some investigation.  FIXME
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+       else
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+       fi
+@@ -5094,13 +5484,13 @@
+       # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+       # as there is no search path for DLLs.
+       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+-      _LT_AC_TAGVAR(allow_undefined_flag, $1)=no
++      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+       _LT_AC_TAGVAR(always_export_symbols, $1)=no
+       _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+-      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
++      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
+ 
+       if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
+-        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
++        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+ 	# If the export-symbols file already is a .def file (1st line
+ 	# is EXPORTS), use it as is; otherwise, prepend...
+ 	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+@@ -5109,23 +5499,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
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++      fi
++      ;;
++
++    interix3*)
++      _LT_AC_TAGVAR(hardcode_direct, $1)=no
++      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
++      # Instead, shared libraries are loaded at an image base (0x10000000 by
++      # default) and relocated if they conflict, which is a slow very memory
++      # consuming and fragmenting process.  To avoid this, we pick a random,
++      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
++      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
++      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
++      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
++      ;;
++
++    linux* | k*bsd*-gnu)
++      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++	tmp_addflag=
++	case $cc_basename,$host_cpu in
++	pgcc*)				# Portland Group C compiler
++	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
++	  tmp_addflag=' $pic_flag'
++	  ;;
++	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
++	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
++	  tmp_addflag=' $pic_flag -Mnomain' ;;
++	ecc*,ia64* | icc*,ia64*)		# Intel C compiler on ia64
++	  tmp_addflag=' -i_dynamic' ;;
++	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
++	  tmp_addflag=' -i_dynamic -nofor_main' ;;
++	ifc* | ifort*)			# Intel Fortran compiler
++	  tmp_addflag=' -nofor_main' ;;
++	esac
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++
++	if test $supports_anon_versioning = yes; then
++	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~
++  cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
++  $echo "local: *; };" >> $output_objdir/$libname.ver~
++	  $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
++	fi
++	_LT_AC_TAGVAR(link_all_deplibs, $1)=no
+       else
+-	ld_shlibs=no
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+       fi
+       ;;
+ 
+-    netbsd*)
++    netbsd* | netbsdelf*-gnu)
+       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ 	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+ 	wlarc=
+       else
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+       fi
+       ;;
+ 
+-    solaris* | sysv5*)
++    solaris*)
+       if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+ 	cat <<EOF 1>&2
+@@ -5139,13 +5576,40 @@
+ 
+ EOF
+       elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+       else
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+       fi
+       ;;
+ 
++    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
++      case `$LD -v 2>&1` in
++        *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*) 
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++	cat <<_LT_EOF 1>&2
++
++*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
++*** reliably create shared libraries on SCO systems.  Therefore, libtool
++*** is disabling shared libraries support.  We urge you to upgrade GNU
++*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
++*** your PATH or compiler configuration so that the native linker is
++*** used, and then restart.
++
++_LT_EOF
++	;;
++	*)
++	  if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++	    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
++	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib'
++	    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib'
++	  else
++	    _LT_AC_TAGVAR(ld_shlibs, $1)=no
++	  fi
++	;;
++      esac
++      ;;
++
+     sunos4*)
+       _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+       wlarc=
+@@ -5155,24 +5619,19 @@
+ 
+     *)
+       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+       else
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+       fi
+       ;;
+     esac
+ 
+-    if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = yes; then
+-      runpath_var=LD_RUN_PATH
+-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
+-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+-      # ancient GNU ld didn't support --whole-archive et. al.
+-      if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
+- 	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+-      else
+-  	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
+-      fi
++    if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no; then
++      runpath_var=
++      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
++      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
++      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
+     fi
+   else
+     # PORTME fill in a description of your system's linker (not GNU ld)
+@@ -5184,7 +5643,7 @@
+       # Note: this linker hardcodes the directories in LIBPATH if there
+       # are no directories specified by -L.
+       _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+-      if test "$GCC" = yes && test -z "$link_static_flag"; then
++      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
+ 	# Neither direct hardcoding nor static linking is supported with a
+ 	# broken collect2.
+ 	_LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
+@@ -5206,9 +5665,21 @@
+ 	else
+ 	  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
+ 	fi
++	aix_use_runtimelinking=no
++
++	# Test if we are trying to use run time linking or normal
++	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
++	# need to do runtime linking.
++	case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
++	  for ld_flag in $LDFLAGS; do
++  	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
++  	    aix_use_runtimelinking=yes
++  	    break
++  	  fi
++	  done
++	  ;;
++	esac
+ 
+-	# KDE requires run time linking.  Make it the default.
+-	aix_use_runtimelinking=yes
+ 	exp_sym_flag='-bexport'
+ 	no_entry_flag='-bnoentry'
+       fi
+@@ -5225,7 +5696,7 @@
+       _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+ 
+       if test "$GCC" = yes; then
+-	case $host_os in aix4.[012]|aix4.[012].*)
++	case $host_os in aix4.[[012]]|aix4.[[012]].*)
+ 	# We only want to do this on AIX 4.2 and lower, the check
+ 	# below for broken collect2 doesn't work under 4.3+
+ 	  collect2name=`${CC} -print-prog-name=collect2`
+@@ -5244,8 +5715,12 @@
+   	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+   	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
+ 	  fi
++	  ;;
+ 	esac
+ 	shared_flag='-shared'
++	if test "$aix_use_runtimelinking" = yes; then
++	  shared_flag="$shared_flag "'${wl}-G'
++	fi
+       else
+ 	# not using gcc
+ 	if test "$host_cpu" = ia64; then
+@@ -5253,30 +5728,30 @@
+   	# chokes on -Wl,-G. The following line is correct:
+ 	  shared_flag='-G'
+ 	else
+-  	if test "$aix_use_runtimelinking" = yes; then
+-	    shared_flag='-qmkshrobj ${wl}-G'
++	  if test "$aix_use_runtimelinking" = yes; then
++	    shared_flag='${wl}-G'
+ 	  else
+-	    shared_flag='-qmkshrobj'
+-  	fi
++	    shared_flag='${wl}-bM:SRE'
++	  fi
+ 	fi
+       fi
+ 
+-      # Let the compiler handle the export list.
+-      _LT_AC_TAGVAR(always_export_symbols, $1)=no
++      # It seems that -bexpall does not export symbols beginning with
++      # underscore (_), so it is better to generate a list of symbols to export.
++      _LT_AC_TAGVAR(always_export_symbols, $1)=yes
+       if test "$aix_use_runtimelinking" = yes; then
+ 	# Warning - without using the other runtime loading flags (-brtl),
+ 	# -berok will link without error, but may produce a broken library.
+ 	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok'
+        # Determine the default libpath from the value encoded in an empty executable.
+-	_LT_AC_SYS_LIBPATH_AIX
+-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+-	_LT_AC_TAGVAR(archive_cmds, $1)="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '" $shared_flag"
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
++       _LT_AC_SYS_LIBPATH_AIX
++       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+        else
+ 	if test "$host_cpu" = ia64; then
+ 	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
+ 	  _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
+-	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
++	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
+ 	else
+ 	 # Determine the default libpath from the value encoded in an empty executable.
+ 	 _LT_AC_SYS_LIBPATH_AIX
+@@ -5285,13 +5760,11 @@
+ 	  # -berok will link without error, but may produce a broken library.
+ 	  _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
+ 	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
+-	  # -bexpall does not export symbols beginning with underscore (_)
+-	  _LT_AC_TAGVAR(always_export_symbols, $1)=yes
+ 	  # Exported symbols can be pulled into shared objects from archives
+-	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
++	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
+ 	  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
+-	  # This is similar to how AIX traditionally builds it's shared libraries.
+-	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
++	  # This is similar to how AIX traditionally builds its shared libraries.
++	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+ 	fi
+       fi
+       ;;
+@@ -5304,7 +5777,7 @@
+       _LT_AC_TAGVAR(ld_shlibs, $1)=no
+       ;;
+ 
+-    bsdi4*)
++    bsdi[[45]]*)
+       _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
+       ;;
+ 
+@@ -5314,69 +5787,69 @@
+       # hardcode_libdir_flag_spec is actually meaningless, as there is
+       # no search path for DLLs.
+       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
+-      _LT_AC_TAGVAR(allow_undefined_flag, $1)=no
++      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+       # Tell ltmain to make .lib files, not .a files.
+       libext=lib
+       # Tell ltmain to make .dll files, not .so files.
+-      shrext=".dll"
++      shrext_cmds=".dll"
+       # FIXME: Setting linknames here is a bad hack.
+-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -o $lib $compiler_flags $libobjs `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
++      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
+       # The linker will automatically build a .lib file if we build a DLL.
+       _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true'
+       # FIXME: Should let the user specify the lib program.
+       _LT_AC_TAGVAR(old_archive_cmds, $1)='lib /OUT:$oldlib$oldobjs$old_deplibs'
+-      fix_srcfile_path='`cygpath -w "$srcfile"`'
++      _LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
+       _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+       ;;
+ 
+     darwin* | rhapsody*)
+-    if test "$GXX" = yes ; then
+-      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+-      case "$host_os" in
+-      rhapsody* | darwin1.[[012]])
+-	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,suppress'
+-	;;
+-      *) # Darwin 1.3 on
+-	if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+-	  _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+-	else
+-	  case ${MACOSX_DEPLOYMENT_TARGET} in
+-	    10.[012])
+-	      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+-	      ;;
+-	    10.*)
+-	      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,dynamic_lookup'
+-	      ;;
+-	  esac
+-	fi
+-	;;
++      case $host_os in
++        rhapsody* | darwin1.[[012]])
++         _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
++         ;;
++       *) # Darwin 1.3 on
++         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
++           _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++         else
++           case ${MACOSX_DEPLOYMENT_TARGET} in
++             10.[[012]])
++               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++               ;;
++             10.*)
++               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
++               ;;
++           esac
++         fi
++         ;;
+       esac
+-    	lt_int_apple_cc_single_mod=no
+-    	output_verbose_link_cmd='echo'
+-    	if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
+-    	  lt_int_apple_cc_single_mod=yes
+-    	fi
+-    	if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+-    	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring'
+-    	else
+-        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring'
+-      fi
+-      _LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs'
+-      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
+-        if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+-          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-        else
+-          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-        fi
+-          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+       _LT_AC_TAGVAR(hardcode_direct, $1)=no
+       _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
+       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+-      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
++      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
+       _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+-    else  
+-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
+-    fi  
++    if test "$GCC" = yes ; then
++    	output_verbose_link_cmd='echo'
++        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
++      _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
++      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++      _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++    else
++      case $cc_basename in
++        xlc*)
++         output_verbose_link_cmd='echo'
++         _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
++         _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
++         _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          ;;
++       *)
++         _LT_AC_TAGVAR(ld_shlibs, $1)=no
++          ;;
++      esac
++    fi
+       ;;
+ 
+     dgux*)
+@@ -5409,8 +5882,8 @@
+       ;;
+ 
+     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+-    freebsd* | kfreebsd*-gnu)
+-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $compiler_flags $libobjs $deplibs'
++    freebsd* | dragonfly*)
++      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
+       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+       _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+@@ -5418,7 +5891,7 @@
+ 
+     hpux9*)
+       if test "$GCC" = yes; then
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $compiler_flags $libobjs $deplibs~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
++	_LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+       else
+ 	_LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+       fi
+@@ -5432,47 +5905,62 @@
+       _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+       ;;
+ 
+-    hpux10* | hpux11*)
++    hpux10*)
+       if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+-	case "$host_cpu" in
+-	hppa*64*|ia64*)
+-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
++      else
++	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
++      fi
++      if test "$with_gnu_ld" = no; then
++	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
++	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
++
++	_LT_AC_TAGVAR(hardcode_direct, $1)=yes
++	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++
++	# hardcode_minus_L: Not really in the search PATH,
++	# but as the default location of the library.
++	_LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
++      fi
++      ;;
++
++    hpux11*)
++      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
++	case $host_cpu in
++	hppa*64*)
++	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	  ;;
++	ia64*)
++	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+ 	  ;;
+ 	*)
+-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $compiler_flags $libobjs $deplibs'
++	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+ 	  ;;
+ 	esac
+       else
+-	case "$host_cpu" in
+-	hppa*64*|ia64*)
+-	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
++	case $host_cpu in
++	hppa*64*)
++	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	  ;;
++	ia64*)
++	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+ 	  ;;
+ 	*)
+-	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
++	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+ 	  ;;
+ 	esac
+       fi
+       if test "$with_gnu_ld" = no; then
+-	case "$host_cpu" in
+-	hppa*64*)
+-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
++	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
++	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
++
++	case $host_cpu in
++	hppa*64*|ia64*)
+ 	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
+-	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+ 	  _LT_AC_TAGVAR(hardcode_direct, $1)=no
+ 	  _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+ 	  ;;
+-	ia64*)
+-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+-	  _LT_AC_TAGVAR(hardcode_direct, $1)=no
+-	  _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-
+-	  # hardcode_minus_L: Not really in the search PATH,
+-	  # but as the default location of the library.
+-	  _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+-	  ;;
+ 	*)
+-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+-	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+ 	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+ 	  _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+ 
+@@ -5486,7 +5974,7 @@
+ 
+     irix5* | irix6* | nonstopux*)
+       if test "$GCC" = yes; then
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+       else
+ 	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+ 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
+@@ -5496,7 +5984,7 @@
+       _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+       ;;
+ 
+-    netbsd*)
++    netbsd* | netbsdelf*-gnu)
+       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ 	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
+       else
+@@ -5519,7 +6007,8 @@
+       _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+       if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs'
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
+ 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+ 	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+       else
+@@ -5529,7 +6018,7 @@
+ 	   _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+ 	   ;;
+ 	 *)
+-	   _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs'
++	   _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+ 	   _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+ 	   ;;
+        esac
+@@ -5540,14 +6029,14 @@
+       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+       _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+       _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+-      _LT_AC_TAGVAR(archive_cmds, $1)='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $compiler_flags $libobjs $deplibs$output_objdir/$libname.def'
++      _LT_AC_TAGVAR(archive_cmds, $1)='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
+       _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
+       ;;
+ 
+     osf3*)
+       if test "$GCC" = yes; then
+ 	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $compiler_flags $libobjs $deplibs ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+       else
+ 	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+ 	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+@@ -5559,13 +6048,13 @@
+     osf4* | osf5*)	# as osf3* with the addition of -msym flag
+       if test "$GCC" = yes; then
+ 	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $compiler_flags $libobjs $deplibs ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+       else
+ 	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+ 	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+ 	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
+-	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
++	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
+ 
+ 	# Both c and cxx compiler support -rpath directly
+ 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+@@ -5573,21 +6062,15 @@
+       _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+       ;;
+ 
+-    sco3.2v5*)
+-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
+-      runpath_var=LD_RUN_PATH
+-      hardcode_runpath_var=yes
+-      ;;
+-
+     solaris*)
+       _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
+       if test "$GCC" = yes; then
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
++	wlarc='${wl}'
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ 	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+-	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs~$rm $lib.exp'
++	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
+       else
++	wlarc=''
+ 	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+ 	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+   	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
+@@ -5596,8 +6079,18 @@
+       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+       case $host_os in
+       solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+-      *) # Supported since Solaris 2.6 (maybe 2.5.1?)
+-	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;;
++      *)
++ 	# The compiler driver will combine linker options so we
++ 	# cannot just pass the convience library names through
++ 	# without $wl, iff we do not link with $LD.
++ 	# Luckily, gcc supports the same syntax we need for Sun Studio.
++ 	# Supported since Solaris 2.6 (maybe 2.5.1?)
++ 	case $wlarc in
++ 	'')
++ 	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;;
++ 	*)
++ 	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
++ 	esac ;;
+       esac
+       _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+       ;;
+@@ -5606,7 +6099,7 @@
+       if test "x$host_vendor" = xsequent; then
+ 	# Use $CC to link under sequent, because it throws in some extra .o
+ 	# files that make .init and .fini sections work.
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $compiler_flags $libobjs $deplibs'
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
+       else
+ 	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
+       fi
+@@ -5654,36 +6147,45 @@
+       fi
+       ;;
+ 
+-    sysv4.2uw2*)
+-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
+-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=no
++    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7*)
++      _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
++      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-      hardcode_runpath_var=yes
+-      runpath_var=LD_RUN_PATH
+-      ;;
++      runpath_var='LD_RUN_PATH'
+ 
+-   sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[[78]]* | unixware7*)
+-      _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z ${wl}text'
+       if test "$GCC" = yes; then
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+       else
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+       fi
+-      runpath_var='LD_RUN_PATH'
+-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+       ;;
+ 
+-    sysv5*)
+-      _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
+-      # $CC -shared without GNU ld will not create a library from C++
+-      # object files and a static libstdc++, better avoid it by now
+-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+-  		$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
+-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
++    sysv5* | sco3.2v5* | sco5v6*)
++      # Note: We can NOT use -z defs as we might desire, because we do not
++      # link with -lc, and that would cause any symbols used from libc to
++      # always be unresolved, which means just about no library would
++      # ever link correctly.  If we're not using GNU ld we use -z text
++      # though, which does catch some bad symbols but isn't as heavy-handed
++      # as -z defs.
++      _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
++      _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
++      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
++      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
++      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
++      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
+       runpath_var='LD_RUN_PATH'
++
++      if test "$GCC" = yes; then
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++      else
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++      fi
+       ;;
+ 
+     uts4*)
+@@ -5701,11 +6203,6 @@
+ AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
+ test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
+ 
+-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+-if test "$GCC" = yes; then
+-  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+-fi
+-
+ #
+ # Do we need to explicitly link libc?
+ #
+@@ -5726,13 +6223,14 @@
+       AC_MSG_CHECKING([whether -lc should be explicitly linked in])
+       $rm conftest*
+       printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+-  
++
+       if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
+         soname=conftest
+         lib=conftest
+         libobjs=conftest.$ac_objext
+         deplibs=
+         wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)
++	pic_flag=$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)
+         compiler_flags=-v
+         linker_flags=-v
+         verstring=
+@@ -5860,7 +6358,7 @@
+ # Add /usr/xpg4/bin/sed as it is typically found on Solaris
+ # along with /bin/sed that truncates output.
+ for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
+-  test ! -f $lt_ac_sed && break
++  test ! -f $lt_ac_sed && continue
+   cat /dev/null > conftest.in
+   lt_ac_count=0
+   echo $ECHO_N "0123456789$ECHO_C" >conftest.in
+diff -Nrua a/admin/ltmain.sh b/admin/ltmain.sh
+--- a/admin/ltmain.sh	2007-05-14 12:58:18.000000000 +0200
++++ b/admin/ltmain.sh	2007-05-14 23:36:38.000000000 +0200
+@@ -1,7 +1,7 @@
+ # ltmain.sh - Provide generalized library-building support services.
+ # NOTE: Changing this file will not affect anything until you rerun configure.
+ #
+-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003
++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005
+ # Free Software Foundation, Inc.
+ # Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
+ #
+@@ -24,6 +24,34 @@
+ # configuration script generated by Autoconf, you may include it under
+ # the same distribution terms that you use for the rest of that program.
+ 
++basename="s,^.*/,,g"
++
++# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
++# is ksh but when the shell is invoked as "sh" and the current value of
++# the _XPG environment variable is not equal to 1 (one), the special
++# positional parameter $0, within a function call, is the name of the
++# function.
++progpath="$0"
++
++# The name of this program:
++progname=`echo "$progpath" | $SED $basename`
++modename="$progname"
++
++# Global variables:
++EXIT_SUCCESS=0
++EXIT_FAILURE=1
++
++PROGRAM=ltmain.sh
++PACKAGE=libtool
++VERSION="1.5.22 Debian 1.5.22-4"
++TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)"
++
++# See if we are running on zsh, and set the options which allow our
++# commands through without removal of \ escapes.
++if test -n "${ZSH_VERSION+set}" ; then
++  setopt NO_GLOB_SUBST
++fi
++
+ # Check that we have a working $echo.
+ if test "X$1" = X--no-reexec; then
+   # Discard the --no-reexec flag, and continue.
+@@ -36,7 +64,7 @@
+   :
+ else
+   # Restart under the correct shell, and then maybe $echo will work.
+-  exec $SHELL "$0" --no-reexec ${1+"$@"}
++  exec $SHELL "$progpath" --no-reexec ${1+"$@"}
+ fi
+ 
+ if test "X$1" = X--fallback-echo; then
+@@ -45,19 +73,9 @@
+   cat <<EOF
+ $*
+ EOF
+-  exit 0
++  exit $EXIT_SUCCESS
+ fi
+ 
+-# The name of this program.
+-progname=`$echo "$0" | ${SED} 's%^.*/%%'`
+-modename="$progname"
+-
+-# Constants.
+-PROGRAM=ltmain.sh
+-PACKAGE=libtool
+-VERSION=1.5a
+-TIMESTAMP=" (1.1240 2003/06/26 06:55:19)"
+-
+ default_mode=
+ help="Try \`$progname --help' for more information."
+ magic="%%%MAGIC variable%%%"
+@@ -70,14 +88,15 @@
+ Xsed="${SED}"' -e 1s/^X//'
+ sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g'
+ # test EBCDIC or ASCII
+-case `echo A|tr A '\301'` in
+- A) # EBCDIC based system
+-  SP2NL="tr '\100' '\n'"
+-  NL2SP="tr '\r\n' '\100\100'"
++case `echo X|tr X '\101'` in
++ A) # ASCII based system
++    # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
++  SP2NL='tr \040 \012'
++  NL2SP='tr \015\012 \040\040'
+   ;;
+- *) # Assume ASCII based system
+-  SP2NL="tr '\040' '\012'"
+-  NL2SP="tr '\015\012' '\040\040'"
++ *) # EBCDIC based system
++  SP2NL='tr \100 \n'
++  NL2SP='tr \r\n \100\100'
+   ;;
+ esac
+ 
+@@ -94,12 +113,14 @@
+ fi
+ 
+ # Make sure IFS has a sensible default
+-: ${IFS=" 	"}
++lt_nl='
++'
++IFS=" 	$lt_nl"
+ 
+ if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
+   $echo "$modename: not configured to build any kind of library" 1>&2
+   $echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
+-  exit 1
++  exit $EXIT_FAILURE
+ fi
+ 
+ # Global variables.
+@@ -111,6 +132,8 @@
+ show="$echo"
+ show_help=
+ execute_dlfiles=
++duplicate_deps=no
++preserve_args=
+ lo2o="s/\\.lo\$/.${objext}/"
+ o2lo="s/\\.${objext}\$/.lo/"
+ 
+@@ -118,10 +141,51 @@
+ # Shell function definitions:
+ # This seems to be the best place for them
+ 
++# func_mktempdir [string]
++# Make a temporary directory that won't clash with other running
++# libtool processes, and avoids race conditions if possible.  If
++# given, STRING is the basename for that directory.
++func_mktempdir ()
++{
++    my_template="${TMPDIR-/tmp}/${1-$progname}"
++
++    if test "$run" = ":"; then
++      # Return a directory name, but don't create it in dry-run mode
++      my_tmpdir="${my_template}-$$"
++    else
++
++      # If mktemp works, use that first and foremost
++      my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null`
++
++      if test ! -d "$my_tmpdir"; then
++	# Failing that, at least try and use $RANDOM to avoid a race
++	my_tmpdir="${my_template}-${RANDOM-0}$$"
++
++	save_mktempdir_umask=`umask`
++	umask 0077
++	$mkdir "$my_tmpdir"
++	umask $save_mktempdir_umask
++      fi
++
++      # If we're not in dry-run mode, bomb out on failure
++      test -d "$my_tmpdir" || {
++        $echo "cannot create temporary directory \`$my_tmpdir'" 1>&2
++	exit $EXIT_FAILURE
++      }
++    fi
++
++    $echo "X$my_tmpdir" | $Xsed
++}
++
++
++# func_win32_libid arg
++# return the library type of file 'arg'
++#
+ # Need a lot of goo to handle *both* DLLs and import libs
+ # Has to be a shell function in order to 'eat' the argument
+ # that is supplied when $file_magic_command is called.
+-win32_libid () {
++func_win32_libid ()
++{
+   win32_libid_type="unknown"
+   win32_fileres=`file -L $1 2>/dev/null`
+   case $win32_fileres in
+@@ -130,17 +194,16 @@
+     ;;
+   *ar\ archive*) # could be an import, or static
+     if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \
+-      grep -E 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
++      $EGREP -e 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
+       win32_nmres=`eval $NM -f posix -A $1 | \
+-	sed -n -e '1,100{/ I /{x;/import/!{s/^/import/;h;p;};x;};}'`
+-      if test "X$win32_nmres" = "Ximport" ; then
+-        win32_libid_type="x86 archive import"
+-      else
+-        win32_libid_type="x86 archive static"
+-      fi
++	$SED -n -e '1,100{/ I /{s,.*,import,;p;q;};}'`
++      case $win32_nmres in
++      import*)  win32_libid_type="x86 archive import";;
++      *)        win32_libid_type="x86 archive static";;
++      esac
+     fi
+     ;;
+-  *DLL*) 
++  *DLL*)
+     win32_libid_type="x86 DLL"
+     ;;
+   *executable*) # but shell scripts are "executable" too...
+@@ -154,9 +217,181 @@
+   $echo $win32_libid_type
+ }
+ 
++
++# func_infer_tag arg
++# Infer tagged configuration to use if any are available and
++# if one wasn't chosen via the "--tag" command line option.
++# Only attempt this if the compiler in the base compile
++# command doesn't match the default compiler.
++# arg is usually of the form 'gcc ...'
++func_infer_tag ()
++{
++    if test -n "$available_tags" && test -z "$tagname"; then
++      CC_quoted=
++      for arg in $CC; do
++	case $arg in
++	  *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
++	  arg="\"$arg\""
++	  ;;
++	esac
++	CC_quoted="$CC_quoted $arg"
++      done
++      case $@ in
++      # Blanks in the command may have been stripped by the calling shell,
++      # but not from the CC environment variable when configure was run.
++      " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*) ;;
++      # Blanks at the start of $base_compile will cause this to fail
++      # if we don't check for them as well.
++      *)
++	for z in $available_tags; do
++	  if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then
++	    # Evaluate the configuration.
++	    eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`"
++	    CC_quoted=
++	    for arg in $CC; do
++	    # Double-quote args containing other shell metacharacters.
++	    case $arg in
++	      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
++	      arg="\"$arg\""
++	      ;;
++	    esac
++	    CC_quoted="$CC_quoted $arg"
++	  done
++	    case "$@ " in
++	      " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*)
++	      # The compiler in the base compile command matches
++	      # the one in the tagged configuration.
++	      # Assume this is the tagged configuration we want.
++	      tagname=$z
++	      break
++	      ;;
++	    esac
++	  fi
++	done
++	# If $tagname still isn't set, then no tagged configuration
++	# was found and let the user know that the "--tag" command
++	# line option must be used.
++	if test -z "$tagname"; then
++	  $echo "$modename: unable to infer tagged configuration"
++	  $echo "$modename: specify a tag with \`--tag'" 1>&2
++	  exit $EXIT_FAILURE
++#        else
++#          $echo "$modename: using $tagname tagged configuration"
++	fi
++	;;
++      esac
++    fi
++}
++
++
++# func_extract_an_archive dir oldlib
++func_extract_an_archive ()
++{
++    f_ex_an_ar_dir="$1"; shift
++    f_ex_an_ar_oldlib="$1"
++
++    $show "(cd $f_ex_an_ar_dir && $AR x $f_ex_an_ar_oldlib)"
++    $run eval "(cd \$f_ex_an_ar_dir && $AR x \$f_ex_an_ar_oldlib)" || exit $?
++    if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
++     :
++    else
++      $echo "$modename: ERROR: object name conflicts: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib" 1>&2
++      exit $EXIT_FAILURE
++    fi
++}
++
++# func_extract_archives gentop oldlib ...
++func_extract_archives ()
++{
++    my_gentop="$1"; shift
++    my_oldlibs=${1+"$@"}
++    my_oldobjs=""
++    my_xlib=""
++    my_xabs=""
++    my_xdir=""
++    my_status=""
++
++    $show "${rm}r $my_gentop"
++    $run ${rm}r "$my_gentop"
++    $show "$mkdir $my_gentop"
++    $run $mkdir "$my_gentop"
++    my_status=$?
++    if test "$my_status" -ne 0 && test ! -d "$my_gentop"; then
++      exit $my_status
++    fi
++
++    for my_xlib in $my_oldlibs; do
++      # Extract the objects.
++      case $my_xlib in
++	[\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;;
++	*) my_xabs=`pwd`"/$my_xlib" ;;
++      esac
++      my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'`
++      my_xdir="$my_gentop/$my_xlib"
++
++      $show "${rm}r $my_xdir"
++      $run ${rm}r "$my_xdir"
++      $show "$mkdir $my_xdir"
++      $run $mkdir "$my_xdir"
++      exit_status=$?
++      if test "$exit_status" -ne 0 && test ! -d "$my_xdir"; then
++	exit $exit_status
++      fi
++      case $host in
++      *-darwin*)
++	$show "Extracting $my_xabs"
++	# Do not bother doing anything if just a dry run
++	if test -z "$run"; then
++	  darwin_orig_dir=`pwd`
++	  cd $my_xdir || exit $?
++	  darwin_archive=$my_xabs
++	  darwin_curdir=`pwd`
++	  darwin_base_archive=`$echo "X$darwin_archive" | $Xsed -e 's%^.*/%%'`
++	  darwin_arches=`lipo -info "$darwin_archive" 2>/dev/null | $EGREP Architectures 2>/dev/null`
++	  if test -n "$darwin_arches"; then 
++	    darwin_arches=`echo "$darwin_arches" | $SED -e 's/.*are://'`
++	    darwin_arch=
++	    $show "$darwin_base_archive has multiple architectures $darwin_arches"
++	    for darwin_arch in  $darwin_arches ; do
++	      mkdir -p "unfat-$$/${darwin_base_archive}-${darwin_arch}"
++	      lipo -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}"
++	      cd "unfat-$$/${darwin_base_archive}-${darwin_arch}"
++	      func_extract_an_archive "`pwd`" "${darwin_base_archive}"
++	      cd "$darwin_curdir"
++	      $rm "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}"
++	    done # $darwin_arches
++      ## Okay now we have a bunch of thin objects, gotta fatten them up :)
++	    darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print| xargs basename | sort -u | $NL2SP`
++	    darwin_file=
++	    darwin_files=
++	    for darwin_file in $darwin_filelist; do
++	      darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP`
++	      lipo -create -output "$darwin_file" $darwin_files
++	    done # $darwin_filelist
++	    ${rm}r unfat-$$
++	    cd "$darwin_orig_dir"
++	  else
++	    cd "$darwin_orig_dir"
++ 	    func_extract_an_archive "$my_xdir" "$my_xabs"
++	  fi # $darwin_arches
++	fi # $run
++	;;
++      *)
++        func_extract_an_archive "$my_xdir" "$my_xabs"
++        ;;
++      esac
++      my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
++    done
++    func_extract_archives_result="$my_oldobjs"
++}
+ # End of Shell function definitions
+ #####################################
+ 
++# Darwin sucks
++eval std_shrext=\"$shrext_cmds\"
++
++disable_libs=no
++
+ # Parse our command line options once, thoroughly.
+ while test "$#" -gt 0
+ do
+@@ -176,12 +411,13 @@
+       ;;
+     tag)
+       tagname="$arg"
++      preserve_args="${preserve_args}=$arg"
+ 
+       # Check whether tagname contains only valid characters
+       case $tagname in
+       *[!-_A-Za-z0-9,/]*)
+ 	$echo "$progname: invalid tag name: $tagname" 1>&2
+-	exit 1
++	exit $EXIT_FAILURE
+ 	;;
+       esac
+ 
+@@ -191,10 +427,10 @@
+ 	# not specially marked.
+ 	;;
+       *)
+-	if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "$0" > /dev/null; then
++	if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "$progpath" > /dev/null; then
+ 	  taglist="$taglist $tagname"
+ 	  # Evaluate the configuration.
+-	  eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$tagname'$/,/^# ### END LIBTOOL TAG CONFIG: '$tagname'$/p' < $0`"
++	  eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$tagname'$/,/^# ### END LIBTOOL TAG CONFIG: '$tagname'$/p' < $progpath`"
+ 	else
+ 	  $echo "$progname: ignoring unknown tag $tagname" 1>&2
+ 	fi
+@@ -220,24 +456,25 @@
+   --version)
+     $echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP"
+     $echo
+-    $echo "Copyright (C) 2003  Free Software Foundation, Inc."
++    $echo "Copyright (C) 2005  Free Software Foundation, Inc."
+     $echo "This is free software; see the source for copying conditions.  There is NO"
+     $echo "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+-    exit 0
++    exit $?
+     ;;
+ 
+   --config)
+-    ${SED} -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $0
++    ${SED} -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $progpath
+     # Now print the configurations for the tags.
+     for tagname in $taglist; do
+-      ${SED} -n -e "/^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$/,/^# ### END LIBTOOL TAG CONFIG: $tagname$/p" < "$0"
++      ${SED} -n -e "/^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$/,/^# ### END LIBTOOL TAG CONFIG: $tagname$/p" < "$progpath"
+     done
+-    exit 0
++    exit $?
+     ;;
+ 
+   --debug)
+     $echo "$progname: enabling shell trace mode"
+     set -x
++    preserve_args="$preserve_args $arg"
+     ;;
+ 
+   --dry-run | -n)
+@@ -256,7 +493,7 @@
+     else
+       $echo "disable static libraries"
+     fi
+-    exit 0
++    exit $?
+     ;;
+ 
+   --finish) mode="finish" ;;
+@@ -268,13 +505,19 @@
+ 
+   --quiet | --silent)
+     show=:
++    preserve_args="$preserve_args $arg"
+     ;;
+ 
+-  --tag) prevopt="--tag" prev=tag ;;
++  --tag)
++    prevopt="--tag"
++    prev=tag
++    preserve_args="$preserve_args --tag"
++    ;;
+   --tag=*)
+     set tag "$optarg" ${1+"$@"}
+     shift
+     prev=tag
++    preserve_args="$preserve_args --tag"
+     ;;
+ 
+   -dlopen)
+@@ -285,7 +528,7 @@
+   -*)
+     $echo "$modename: unrecognized option \`$arg'" 1>&2
+     $echo "$help" 1>&2
+-    exit 1
++    exit $EXIT_FAILURE
+     ;;
+ 
+   *)
+@@ -298,9 +541,21 @@
+ if test -n "$prevopt"; then
+   $echo "$modename: option \`$prevopt' requires an argument" 1>&2
+   $echo "$help" 1>&2
+-  exit 1
++  exit $EXIT_FAILURE
+ fi
+ 
++case $disable_libs in
++no) 
++  ;;
++shared)
++  build_libtool_libs=no
++  build_old_libs=yes
++  ;;
++static)
++  build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac`
++  ;;
++esac
++
+ # If this variable is set in any of the actions, the command in it
+ # will be execed at the end.  This prevents here-documents from being
+ # left over by shells.
+@@ -311,7 +566,7 @@
+   # Infer the operation mode.
+   if test -z "$mode"; then
+     $echo "*** Warning: inferring the mode of operation is deprecated." 1>&2
+-    $echo "*** Future versions of Libtool will require -mode=MODE be specified." 1>&2
++    $echo "*** Future versions of Libtool will require --mode=MODE be specified." 1>&2
+     case $nonopt in
+     *cc | cc* | *++ | gcc* | *-gcc* | g++* | xlc*)
+       mode=link
+@@ -354,7 +609,7 @@
+   if test -n "$execute_dlfiles" && test "$mode" != execute; then
+     $echo "$modename: unrecognized option \`-dlopen'" 1>&2
+     $echo "$help" 1>&2
+-    exit 1
++    exit $EXIT_FAILURE
+   fi
+ 
+   # Change the help message to a mode-specific one.
+@@ -369,13 +624,15 @@
+     # Get the compilation command and the source file.
+     base_compile=
+     srcfile="$nonopt"  #  always keep a non-empty value in "srcfile"
++    suppress_opt=yes
+     suppress_output=
+     arg_mode=normal
+     libobj=
++    later=
+ 
+     for arg
+     do
+-      case "$arg_mode" in
++      case $arg_mode in
+       arg  )
+ 	# do not "continue".  Instead, add this to base_compile
+ 	lastarg="$arg"
+@@ -394,24 +651,19 @@
+ 	-o)
+ 	  if test -n "$libobj" ; then
+ 	    $echo "$modename: you cannot specify \`-o' more than once" 1>&2
+-	    exit 1
++	    exit $EXIT_FAILURE
+ 	  fi
+ 	  arg_mode=target
+ 	  continue
+ 	  ;;
+ 
+-	-static)
+-	  build_old_libs=yes
++	-static | -prefer-pic | -prefer-non-pic)
++	  later="$later $arg"
+ 	  continue
+ 	  ;;
+ 
+-	-prefer-pic)
+-	  pic_mode=yes
+-	  continue
+-	  ;;
+-
+-	-prefer-non-pic)
+-	  pic_mode=no
++	-no-suppress)
++	  suppress_opt=no
+ 	  continue
+ 	  ;;
+ 
+@@ -424,7 +676,7 @@
+ 	  args=`$echo "X$arg" | $Xsed -e "s/^-Wc,//"`
+ 	  lastarg=
+ 	  save_ifs="$IFS"; IFS=','
+-	  for arg in $args; do
++ 	  for arg in $args; do
+ 	    IFS="$save_ifs"
+ 
+ 	    # Double-quote args containing other shell metacharacters.
+@@ -462,7 +714,10 @@
+       case $lastarg in
+       # Double-quote args containing other shell metacharacters.
+       # Many Bourne shells cannot handle close brackets correctly
+-      # in scan sets, so we specify it separately.
++      # in scan sets, and some SunOS ksh mistreat backslash-escaping
++      # in scan sets (worked around with variable expansion),
++      # and furthermore cannot handle '|' '&' '(' ')' in scan sets 
++      # at all, so we specify them separately.
+       *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+ 	lastarg="\"$lastarg\""
+ 	;;
+@@ -474,11 +729,11 @@
+     case $arg_mode in
+     arg)
+       $echo "$modename: you must specify an argument for -Xcompile"
+-      exit 1
++      exit $EXIT_FAILURE
+       ;;
+     target)
+       $echo "$modename: you must specify a target with \`-o'" 1>&2
+-      exit 1
++      exit $EXIT_FAILURE
+       ;;
+     *)
+       # Get the name of the library object.
+@@ -511,51 +766,39 @@
+     *.lo) obj=`$echo "X$libobj" | $Xsed -e "$lo2o"` ;;
+     *)
+       $echo "$modename: cannot determine name of library object from \`$libobj'" 1>&2
+-      exit 1
++      exit $EXIT_FAILURE
+       ;;
+     esac
+ 
+-    # Infer tagged configuration to use if any are available and
+-    # if one wasn't chosen via the "--tag" command line option.
+-    # Only attempt this if the compiler in the base compile
+-    # command doesn't match the default compiler.
+-    if test -n "$available_tags" && test -z "$tagname"; then
+-      case $base_compile in
+-      # Blanks in the command may have been stripped by the calling shell,
+-      # but not from the CC environment variable when configure was run.
+-      " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "*) ;;
+-      # Blanks at the start of $base_compile will cause this to fail
+-      # if we don't check for them as well.
+-      *)
+-	for z in $available_tags; do
+-	  if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$0" > /dev/null; then
+-	    # Evaluate the configuration.
+-	    eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $0`"
+-	    case "$base_compile " in
+-	    "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*)
+-	      # The compiler in the base compile command matches
+-	      # the one in the tagged configuration.
+-	      # Assume this is the tagged configuration we want.
+-	      tagname=$z
+-	      break
+-	      ;;
+-	    esac
+-	  fi
+-	done
+-	# If $tagname still isn't set, then no tagged configuration
+-	# was found and let the user know that the "--tag" command
+-	# line option must be used.
+-	if test -z "$tagname"; then
+-	  $echo "$modename: unable to infer tagged configuration"
+-	  $echo "$modename: specify a tag with \`--tag'" 1>&2
+-	  exit 1
+-#        else
+-#          $echo "$modename: using $tagname tagged configuration"
+-	fi
++    func_infer_tag $base_compile
++
++    for arg in $later; do
++      case $arg in
++      -static)
++	build_old_libs=yes
++	continue
++	;;
++
++      -prefer-pic)
++	pic_mode=yes
++	continue
++	;;
++
++      -prefer-non-pic)
++	pic_mode=no
++	continue
+ 	;;
+       esac
+-    fi
++    done
+ 
++    qlibobj=`$echo "X$libobj" | $Xsed -e "$sed_quote_subst"`
++    case $qlibobj in
++      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
++	qlibobj="\"$qlibobj\"" ;;
++    esac
++    test "X$libobj" != "X$qlibobj" \
++	&& $echo "X$libobj" | grep '[]~#^*{};<>?"'"'"' 	&()|`$[]' \
++	&& $echo "$modename: libobj name \`$libobj' may not contain shell special characters."
+     objname=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
+     xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'`
+     if test "X$xdir" = "X$obj"; then
+@@ -568,7 +811,7 @@
+     if test -z "$base_compile"; then
+       $echo "$modename: you must specify a compilation command" 1>&2
+       $echo "$help" 1>&2
+-      exit 1
++      exit $EXIT_FAILURE
+     fi
+ 
+     # Delete any leftover library objects.
+@@ -579,7 +822,7 @@
+     fi
+ 
+     $run $rm $removelist
+-    trap "$run $rm $removelist; exit 1" 1 2 15
++    trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15
+ 
+     # On Cygwin there's no "real" PIC flag so we must build both object types
+     case $host_os in
+@@ -598,7 +841,7 @@
+       output_obj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext}
+       lockfile="$output_obj.lock"
+       removelist="$removelist $output_obj $lockfile"
+-      trap "$run $rm $removelist; exit 1" 1 2 15
++      trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15
+     else
+       output_obj=
+       need_locks=no
+@@ -608,7 +851,7 @@
+     # Lock this critical section if it is needed
+     # We use this script file to make the link, it avoids creating a new file
+     if test "$need_locks" = yes; then
+-      until $run ln "$0" "$lockfile" 2>/dev/null; do
++      until $run ln "$progpath" "$lockfile" 2>/dev/null; do
+ 	$show "Waiting for $lockfile to be removed"
+ 	sleep 2
+       done
+@@ -626,14 +869,19 @@
+ compiler."
+ 
+ 	$run $rm $removelist
+-	exit 1
++	exit $EXIT_FAILURE
+       fi
+-      $echo $srcfile > "$lockfile"
++      $echo "$srcfile" > "$lockfile"
+     fi
+ 
+     if test -n "$fix_srcfile_path"; then
+       eval srcfile=\"$fix_srcfile_path\"
+     fi
++    qsrcfile=`$echo "X$srcfile" | $Xsed -e "$sed_quote_subst"`
++    case $qsrcfile in
++      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
++      qsrcfile="\"$qsrcfile\"" ;;
++    esac
+ 
+     $run $rm "$libobj" "${libobj}T"
+ 
+@@ -655,18 +903,18 @@
+       fbsd_hideous_sh_bug=$base_compile
+ 
+       if test "$pic_mode" != no; then
+-	command="$base_compile $srcfile $pic_flag"
++	command="$base_compile $qsrcfile $pic_flag"
+       else
+ 	# Don't build PIC code
+-	command="$base_compile $srcfile"
++	command="$base_compile $qsrcfile"
+       fi
+ 
+       if test ! -d "${xdir}$objdir"; then
+ 	$show "$mkdir ${xdir}$objdir"
+ 	$run $mkdir ${xdir}$objdir
+-	status=$?
+-	if test "$status" -ne 0 && test ! -d "${xdir}$objdir"; then
+-	  exit $status
++	exit_status=$?
++	if test "$exit_status" -ne 0 && test ! -d "${xdir}$objdir"; then
++	  exit $exit_status
+ 	fi
+       fi
+ 
+@@ -681,7 +929,7 @@
+       if $run eval "$command"; then :
+       else
+ 	test -n "$output_obj" && $run $rm $removelist
+-	exit 1
++	exit $EXIT_FAILURE
+       fi
+ 
+       if test "$need_locks" = warn &&
+@@ -701,7 +949,7 @@
+ compiler."
+ 
+ 	$run $rm $removelist
+-	exit 1
++	exit $EXIT_FAILURE
+       fi
+ 
+       # Just move the object if needed, then go on to compile the next one
+@@ -722,7 +970,9 @@
+ EOF
+ 
+       # Allow error messages only from the first compilation.
+-      suppress_output=' >/dev/null 2>&1'
++      if test "$suppress_opt" = yes; then
++        suppress_output=' >/dev/null 2>&1'
++      fi
+     else
+       # No PIC object so indicate it doesn't exist in the libtool
+       # object file.
+@@ -736,9 +986,9 @@
+     if test "$build_old_libs" = yes; then
+       if test "$pic_mode" != yes; then
+ 	# Don't build PIC code
+-	command="$base_compile $srcfile"
++	command="$base_compile $qsrcfile"
+       else
+-	command="$base_compile $srcfile $pic_flag"
++	command="$base_compile $qsrcfile $pic_flag"
+       fi
+       if test "$compiler_c_o" = yes; then
+ 	command="$command -o $obj"
+@@ -751,7 +1001,7 @@
+       if $run eval "$command"; then :
+       else
+ 	$run $rm $removelist
+-	exit 1
++	exit $EXIT_FAILURE
+       fi
+ 
+       if test "$need_locks" = warn &&
+@@ -771,7 +1021,7 @@
+ compiler."
+ 
+ 	$run $rm $removelist
+-	exit 1
++	exit $EXIT_FAILURE
+       fi
+ 
+       # Just move the object if needed
+@@ -809,7 +1059,7 @@
+       $run $rm "$lockfile"
+     fi
+ 
+-    exit 0
++    exit $EXIT_SUCCESS
+     ;;
+ 
+   # libtool link mode
+@@ -835,7 +1085,7 @@
+       ;;
+     esac
+     libtool_args="$nonopt"
+-    base_compile="$nonopt"
++    base_compile="$nonopt $@"
+     compile_command="$nonopt"
+     finalize_command="$nonopt"
+ 
+@@ -847,7 +1097,6 @@
+     old_convenience=
+     deplibs=
+     old_deplibs=
+-    add_flags=
+     compiler_flags=
+     linker_flags=
+     dllsearchpath=
+@@ -868,6 +1117,8 @@
+     no_install=no
+     objs=
+     non_pic_objects=
++    notinst_path= # paths that contain not-installed libtool libraries
++    precious_files_regex=
+     prefer_static_libs=no
+     preload=no
+     prev=
+@@ -881,6 +1132,8 @@
+     vinfo=
+     vinfo_number=no
+ 
++    func_infer_tag $base_compile
++
+     # We need to know -static, to get the right output filenames.
+     for arg
+     do
+@@ -893,14 +1146,15 @@
+ 	  if test -n "$link_static_flag"; then
+ 	    dlopen_self=$dlopen_self_static
+ 	  fi
++	  prefer_static_libs=yes
+ 	else
+ 	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
+ 	    dlopen_self=$dlopen_self_static
+ 	  fi
++	  prefer_static_libs=built
+ 	fi
+ 	build_libtool_libs=no
+ 	build_old_libs=yes
+-	prefer_static_libs=yes
+ 	break
+ 	;;
+       esac
+@@ -912,7 +1166,6 @@
+     # Go through the arguments, transforming them on the way.
+     while test "$#" -gt 0; do
+       arg="$1"
+-      base_compile="$base_compile $arg"
+       shift
+       case $arg in
+       *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+@@ -976,7 +1229,7 @@
+ 	  export_symbols="$arg"
+ 	  if test ! -f "$arg"; then
+ 	    $echo "$modename: symbol file \`$arg' does not exist"
+-	    exit 1
++	    exit $EXIT_FAILURE
+ 	  fi
+ 	  prev=
+ 	  continue
+@@ -991,6 +1244,11 @@
+ 	  prev=
+ 	  continue
+ 	  ;;
++	precious_regex)
++	  precious_files_regex="$arg"
++	  prev=
++	  continue
++	  ;;
+ 	release)
+ 	  release="-$arg"
+ 	  prev=
+@@ -1023,7 +1281,7 @@
+ 		   test "$pic_object" = none && \
+ 		   test "$non_pic_object" = none; then
+ 		  $echo "$modename: cannot find name of object for \`$arg'" 1>&2
+-		  exit 1
++		  exit $EXIT_FAILURE
+ 		fi
+ 
+ 		# Extract subdirectory from the argument.
+@@ -1071,12 +1329,17 @@
+ 		  if test -z "$pic_object" || test "$pic_object" = none ; then
+ 		    arg="$non_pic_object"
+ 		  fi
++		else
++		  # If the PIC object exists, use it instead.
++		  # $xdir was prepended to $pic_object above.
++		  non_pic_object="$pic_object"
++		  non_pic_objects="$non_pic_objects $non_pic_object"
+ 		fi
+ 	      else
+ 		# Only an error if not doing a dry-run.
+ 		if test -z "$run"; then
+ 		  $echo "$modename: \`$arg' is not a valid libtool object" 1>&2
+-		  exit 1
++		  exit $EXIT_FAILURE
+ 		else
+ 		  # Dry-run case.
+ 
+@@ -1097,7 +1360,7 @@
+ 	    done
+ 	  else
+ 	    $echo "$modename: link input file \`$save_arg' does not exist"
+-	    exit 1
++	    exit $EXIT_FAILURE
+ 	  fi
+ 	  arg=$save_arg
+ 	  prev=
+@@ -1109,7 +1372,7 @@
+ 	  [\\/]* | [A-Za-z]:[\\/]*) ;;
+ 	  *)
+ 	    $echo "$modename: only absolute run-paths are allowed" 1>&2
+-	    exit 1
++	    exit $EXIT_FAILURE
+ 	    ;;
+ 	  esac
+ 	  if test "$prev" = rpath; then
+@@ -1149,16 +1412,15 @@
+ 	  finalize_command="$finalize_command $qarg"
+ 	  continue
+ 	  ;;
+-	framework)
+-	  case $host in
+-	    *-*-darwin*)
+-	      case "$deplibs " in
+-	        *" $qarg.ltframework "*) ;;
+-		*) deplibs="$deplibs $qarg.ltframework" # this is fixed later
+-		   ;;
+-              esac
+-              ;;
+-   	  esac
++	shrext)
++  	  shrext_cmds="$arg"
++	  prev=
++	  continue
++	  ;;
++	darwin_framework|darwin_framework_skip)
++	  test "$prev" = "darwin_framework" && compiler_flags="$compiler_flags $arg"
++	  compile_command="$compile_command $arg"
++	  finalize_command="$finalize_command $arg"
+ 	  prev=
+ 	  continue
+ 	  ;;
+@@ -1210,7 +1472,7 @@
+       -export-symbols | -export-symbols-regex)
+ 	if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
+ 	  $echo "$modename: more than one -exported-symbols argument is not allowed"
+-	  exit 1
++	  exit $EXIT_FAILURE
+ 	fi
+ 	if test "X$arg" = "X-export-symbols"; then
+ 	  prev=expsyms
+@@ -1220,6 +1482,18 @@
+ 	continue
+ 	;;
+ 
++      -framework|-arch|-isysroot)
++	case " $CC " in
++	  *" ${arg} ${1} "* | *" ${arg}	${1} "*) 
++		prev=darwin_framework_skip ;;
++	  *) compiler_flags="$compiler_flags $arg"
++	     prev=darwin_framework ;;
++	esac
++	compile_command="$compile_command $arg"
++	finalize_command="$finalize_command $arg"
++	continue
++	;;
++
+       -inst-prefix-dir)
+ 	prev=inst_prefix
+ 	continue
+@@ -1246,7 +1520,8 @@
+ 	  absdir=`cd "$dir" && pwd`
+ 	  if test -z "$absdir"; then
+ 	    $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2
+-	    exit 1
++	    absdir="$dir"
++	    notinst_path="$notinst_path $dir"
+ 	  fi
+ 	  dir="$absdir"
+ 	  ;;
+@@ -1260,10 +1535,15 @@
+ 	esac
+ 	case $host in
+ 	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
++	  testbindir=`$echo "X$dir" | $Xsed -e 's*/lib$*/bin*'`
+ 	  case :$dllsearchpath: in
+ 	  *":$dir:"*) ;;
+ 	  *) dllsearchpath="$dllsearchpath:$dir";;
+ 	  esac
++	  case :$dllsearchpath: in
++	  *":$testbindir:"*) ;;
++	  *) dllsearchpath="$dllsearchpath:$testbindir";;
++	  esac
+ 	  ;;
+ 	esac
+ 	continue
+@@ -1272,26 +1552,35 @@
+       -l*)
+ 	if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
+ 	  case $host in
+-	  *-*-cygwin* | *-*-pw32* | *-*-beos*)
++	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos*)
+ 	    # These systems don't actually have a C or math library (as such)
+ 	    continue
+ 	    ;;
+-	  *-*-mingw* | *-*-os2*)
++	  *-*-os2*)
+ 	    # These systems don't actually have a C library (as such)
+ 	    test "X$arg" = "X-lc" && continue
+ 	    ;;
+-	  *-*-openbsd* | *-*-freebsd*)
++	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
+ 	    # Do not include libc due to us having libc/libc_r.
+ 	    test "X$arg" = "X-lc" && continue
+ 	    ;;
+ 	  *-*-rhapsody* | *-*-darwin1.[012])
+ 	    # Rhapsody C and math libraries are in the System framework
+-	    deplibs="$deplibs System.ltframework"
++	    deplibs="$deplibs -framework System"
+ 	    continue
++	    ;;
++	  *-*-sco3.2v5* | *-*-sco5v6*)
++	    # Causes problems with __ctype
++	    test "X$arg" = "X-lc" && continue
++	    ;;
++	  *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
++	    # Compiler inserts libc in the correct place for threads to work
++	    test "X$arg" = "X-lc" && continue
++	    ;;
+ 	  esac
+ 	elif test "X$arg" = "X-lc_r"; then
+ 	 case $host in
+-	 *-*-openbsd*)
++	 *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
+ 	   # Do not include libc_r directly, use -pthread flag.
+ 	   continue
+ 	   ;;
+@@ -1301,18 +1590,41 @@
+ 	continue
+ 	;;
+ 
++      # Tru64 UNIX uses -model [arg] to determine the layout of C++
++      # classes, name mangling, and exception handling.
++      -model)
++	compile_command="$compile_command $arg"
++	compiler_flags="$compiler_flags $arg"
++	finalize_command="$finalize_command $arg"
++	prev=xcompiler
++	continue
++	;;
++
++     -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
++	compiler_flags="$compiler_flags $arg"
++	compile_command="$compile_command $arg"
++	finalize_command="$finalize_command $arg"
++	continue
++	;;
++
+       -module)
+ 	module=yes
+ 	continue
+ 	;;
+ 
+-      # gcc -m* arguments should be passed to the linker via $compiler_flags
+-      # in order to pass architecture information to the linker
+-      # (e.g. 32 vs 64-bit).  This may also be accomplished via -Wl,-mfoo
+-      # but this is not reliable with gcc because gcc may use -mfoo to
+-      # select a different linker, different libraries, etc, while
+-      # -Wl,-mfoo simply passes -mfoo to the linker.
+-      -m*)
++      # -64, -mips[0-9] enable 64-bit mode on the SGI compiler
++      # -r[0-9][0-9]* specifies the processor on the SGI compiler
++      # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler
++      # +DA*, +DD* enable 64-bit mode on the HP compiler
++      # -q* pass through compiler args for the IBM compiler
++      # -m* pass through architecture-specific compiler args for GCC
++      # -m*, -t[45]*, -txscale* pass through architecture-specific
++      # compiler args for GCC
++      # -pg pass through profiling flag for GCC
++      # @file GCC response files
++      -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*|-pg| \
++      -t[45]*|-txscale*|@*)
++
+ 	# Unknown arguments in both finalize_command and compile_command need
+ 	# to be aesthetically quoted because they are evaled later.
+ 	arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
+@@ -1323,9 +1635,7 @@
+ 	esac
+         compile_command="$compile_command $arg"
+         finalize_command="$finalize_command $arg"
+-        if test "$with_gcc" = "yes" ; then
+-          compiler_flags="$compiler_flags $arg"
+-        fi
++        compiler_flags="$compiler_flags $arg"
+         continue
+         ;;
+ 
+@@ -1365,6 +1675,11 @@
+ 
+       -o) prev=output ;;
+ 
++      -precious-files-regex)
++	prev=precious_regex
++	continue
++	;;
++
+       -release)
+ 	prev=release
+ 	continue
+@@ -1387,7 +1702,7 @@
+ 	[\\/]* | [A-Za-z]:[\\/]*) ;;
+ 	*)
+ 	  $echo "$modename: only absolute run-paths are allowed" 1>&2
+-	  exit 1
++	  exit $EXIT_FAILURE
+ 	  ;;
+ 	esac
+ 	case "$xrpath " in
+@@ -1473,11 +1788,6 @@
+ 	continue
+ 	;;
+ 
+-      -framework)
+-        prev=framework
+-	continue
+-	;;
+-
+       # Some other compiler flag.
+       -* | +*)
+ 	# Unknown arguments in both finalize_command and compile_command need
+@@ -1488,7 +1798,6 @@
+ 	  arg="\"$arg\""
+ 	  ;;
+ 	esac
+-	add_flags="$add_flags $arg"
+ 	;;
+ 
+       *.$objext)
+@@ -1516,7 +1825,7 @@
+ 	     test "$pic_object" = none && \
+ 	     test "$non_pic_object" = none; then
+ 	    $echo "$modename: cannot find name of object for \`$arg'" 1>&2
+-	    exit 1
++	    exit $EXIT_FAILURE
+ 	  fi
+ 
+ 	  # Extract subdirectory from the argument.
+@@ -1564,12 +1873,17 @@
+ 	    if test -z "$pic_object" || test "$pic_object" = none ; then
+ 	      arg="$non_pic_object"
+ 	    fi
++	  else
++	    # If the PIC object exists, use it instead.
++	    # $xdir was prepended to $pic_object above.
++	    non_pic_object="$pic_object"
++	    non_pic_objects="$non_pic_objects $non_pic_object"
+ 	  fi
+ 	else
+ 	  # Only an error if not doing a dry-run.
+ 	  if test -z "$run"; then
+ 	    $echo "$modename: \`$arg' is not a valid libtool object" 1>&2
+-	    exit 1
++	    exit $EXIT_FAILURE
+ 	  else
+ 	    # Dry-run case.
+ 
+@@ -1623,7 +1937,6 @@
+ 	  arg="\"$arg\""
+ 	  ;;
+ 	esac
+-	add_flags="$add_flags $arg"
+ 	;;
+       esac # arg
+ 
+@@ -1637,48 +1950,7 @@
+     if test -n "$prev"; then
+       $echo "$modename: the \`$prevarg' option requires an argument" 1>&2
+       $echo "$help" 1>&2
+-      exit 1
+-    fi
+-
+-    # Infer tagged configuration to use if any are available and
+-    # if one wasn't chosen via the "--tag" command line option.
+-    # Only attempt this if the compiler in the base link
+-    # command doesn't match the default compiler.
+-    if test -n "$available_tags" && test -z "$tagname"; then
+-      case $base_compile in
+-      # Blanks in the command may have been stripped by the calling shell,
+-      # but not from the CC environment variable when configure was run.
+-      "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*) ;;
+-      # Blanks at the start of $base_compile will cause this to fail
+-      # if we don't check for them as well.
+-      *)
+-	for z in $available_tags; do
+-	  if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$0" > /dev/null; then
+-	    # Evaluate the configuration.
+-	    eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $0`"
+-	    case $base_compile in
+-	    "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*)
+-	      # The compiler in $compile_command matches
+-	      # the one in the tagged configuration.
+-	      # Assume this is the tagged configuration we want.
+-	      tagname=$z
+-	      break
+-	      ;;
+-	    esac
+-	  fi
+-	done
+-	# If $tagname still isn't set, then no tagged configuration
+-	# was found and let the user know that the "--tag" command
+-	# line option must be used.
+-	if test -z "$tagname"; then
+-	  $echo "$modename: unable to infer tagged configuration"
+-	  $echo "$modename: specify a tag with \`--tag'" 1>&2
+-	  exit 1
+-#       else
+-#         $echo "$modename: using $tagname tagged configuration"
+-	fi
+-	;;
+-      esac
++      exit $EXIT_FAILURE
+     fi
+ 
+     if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
+@@ -1711,9 +1983,9 @@
+     if test ! -d "$output_objdir"; then
+       $show "$mkdir $output_objdir"
+       $run $mkdir $output_objdir
+-      status=$?
+-      if test "$status" -ne 0 && test ! -d "$output_objdir"; then
+-	exit $status
++      exit_status=$?
++      if test "$exit_status" -ne 0 && test ! -d "$output_objdir"; then
++	exit $exit_status
+       fi
+     fi
+ 
+@@ -1722,7 +1994,7 @@
+     "")
+       $echo "$modename: you must specify an output file" 1>&2
+       $echo "$help" 1>&2
+-      exit 1
++      exit $EXIT_FAILURE
+       ;;
+     *.$libext) linkmode=oldlib ;;
+     *.lo | *.$objext) linkmode=obj ;;
+@@ -1732,7 +2004,7 @@
+ 
+     case $host in
+     *cygwin* | *mingw* | *pw32*)
+-      # don't eliminate duplcations in $postdeps and $predeps
++      # don't eliminate duplications in $postdeps and $predeps
+       duplicate_compiler_generated_deps=yes
+       ;;
+     *)
+@@ -1776,7 +2048,6 @@
+     newlib_search_path=
+     need_relink=no # whether we're linking any uninstalled libtool libraries
+     notinst_deplibs= # not-installed libtool libraries
+-    notinst_path= # paths that contain not-installed libtool libraries
+     case $linkmode in
+     lib)
+ 	passes="conv link"
+@@ -1785,7 +2056,7 @@
+ 	  *.la) ;;
+ 	  *)
+ 	    $echo "$modename: libraries can \`-dlopen' only libtool libraries: $file" 1>&2
+-	    exit 1
++	    exit $EXIT_FAILURE
+ 	    ;;
+ 	  esac
+ 	done
+@@ -1811,7 +2082,10 @@
+ 	case $pass in
+ 	dlopen) libs="$dlfiles" ;;
+ 	dlpreopen) libs="$dlprefiles" ;;
+-	link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
++	link)
++	  libs="$deplibs %DEPLIBS%"
++	  test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
++	  ;;
+ 	esac
+       fi
+       if test "$pass" = dlopen; then
+@@ -1823,18 +2097,23 @@
+ 	lib=
+ 	found=no
+ 	case $deplib in
++	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
++	  if test "$linkmode,$pass" = "prog,link"; then
++	    compile_deplibs="$deplib $compile_deplibs"
++	    finalize_deplibs="$deplib $finalize_deplibs"
++	  else
++	    compiler_flags="$compiler_flags $deplib"
++	  fi
++	  continue
++	  ;;
+ 	-l*)
+ 	  if test "$linkmode" != lib && test "$linkmode" != prog; then
+ 	    $echo "$modename: warning: \`-l' is ignored for archives/objects" 1>&2
+ 	    continue
+ 	  fi
+-	  if test "$pass" = conv && test "$allow_undefined" = yes; then
+-	    deplibs="$deplib $deplibs"
+-	    continue
+-	  fi
+ 	  name=`$echo "X$deplib" | $Xsed -e 's/^-l//'`
+ 	  for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do
+-	    for search_ext in .la $shrext .so .a; do
++	    for search_ext in .la $std_shrext .so .a; do
+ 	      # Search the libtool library
+ 	      lib="$searchdir/lib${name}${search_ext}"
+ 	      if test -f "$lib"; then
+@@ -1895,18 +2174,6 @@
+ 	    fi
+ 	  fi
+ 	  ;; # -l
+-	*.ltframework)
+-	  if test "$linkmode,$pass" = "prog,link"; then
+-	    compile_deplibs="$deplib $compile_deplibs"
+-	    finalize_deplibs="$deplib $finalize_deplibs"
+-	  else
+-	    deplibs="$deplib $deplibs"
+-	    if test "$linkmode" = lib ; then
+-	      newdependency_libs="$deplib $newdependency_libs"
+-	    fi
+-	  fi
+-	  continue
+-	  ;;
+ 	-L*)
+ 	  case $linkmode in
+ 	  lib)
+@@ -1922,11 +2189,11 @@
+ 	    fi
+ 	    if test "$pass" = scan; then
+ 	      deplibs="$deplib $deplibs"
+-	      newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
+ 	    else
+ 	      compile_deplibs="$deplib $compile_deplibs"
+ 	      finalize_deplibs="$deplib $finalize_deplibs"
+ 	    fi
++	    newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
+ 	    ;;
+ 	  *)
+ 	    $echo "$modename: warning: \`-L' is ignored for archives/objects" 1>&2
+@@ -1954,7 +2221,22 @@
+ 	  fi
+ 	  case $linkmode in
+ 	  lib)
+-	    if test "$deplibs_check_method" != pass_all; then
++	    valid_a_lib=no
++	    case $deplibs_check_method in
++	      match_pattern*)
++		set dummy $deplibs_check_method
++	        match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
++		if eval $echo \"$deplib\" 2>/dev/null \
++		    | $SED 10q \
++		    | $EGREP "$match_pattern_regex" > /dev/null; then
++		  valid_a_lib=yes
++		fi
++		;;
++	      pass_all)
++		valid_a_lib=yes
++		;;
++            esac
++	    if test "$valid_a_lib" != yes; then
+ 	      $echo
+ 	      $echo "*** Warning: Trying to link with static lib archive $deplib."
+ 	      $echo "*** I have the capability to make that library automatically link in when"
+@@ -2004,15 +2286,15 @@
+ 	esac # case $deplib
+ 	if test "$found" = yes || test -f "$lib"; then :
+ 	else
+-	  $echo "$modename: cannot find the library \`$lib'" 1>&2
+-	  exit 1
++	  $echo "$modename: cannot find the library \`$lib' or unhandled argument \`$deplib'" 1>&2
++	  exit $EXIT_FAILURE
+ 	fi
+ 
+ 	# Check to see that this really is a libtool archive.
+ 	if (${SED} -e '2q' $lib | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
+ 	else
+ 	  $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
+-	  exit 1
++	  exit $EXIT_FAILURE
+ 	fi
+ 
+ 	ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'`
+@@ -2028,6 +2310,8 @@
+ 	# it will not redefine variables installed, or shouldnotlink
+ 	installed=yes
+ 	shouldnotlink=no
++	avoidtemprpath=
++
+ 
+ 	# Read the .la file
+ 	case $lib in
+@@ -2035,13 +2319,6 @@
+ 	*) . ./$lib ;;
+ 	esac
+ 
+-	case $host in
+-	*-*-darwin*)
+-	  # Convert "-framework foo" to "foo.ltframework" in dependency_libs
+-	  test -n "$dependency_libs" && dependency_libs=`$echo "X$dependency_libs" | $Xsed -e 's/-framework \([^ $]*\)/\1.ltframework/g'`
+-	  ;;
+-	esac
+-
+ 	if test "$linkmode,$pass" = "lib,link" ||
+ 	   test "$linkmode,$pass" = "prog,scan" ||
+ 	   { test "$linkmode" != prog && test "$linkmode" != lib; }; then
+@@ -2052,33 +2329,32 @@
+ 	if test "$pass" = conv; then
+ 	  # Only check for convenience libraries
+ 	  deplibs="$lib $deplibs"
+-	  tmp_libs=
+-	  for deplib in $dependency_libs; do
+-	    #echo "Adding $deplib to \$deplibs"
+-	    deplibs="$deplib $deplibs"
+-            if test "X$duplicate_deps" = "Xyes" ; then
+-	      case "$tmp_libs " in
+-	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+-	      esac
+-            fi
+-	    tmp_libs="$tmp_libs $deplib"
+-	  done
+ 	  if test -z "$libdir"; then
+ 	    if test -z "$old_library"; then
+ 	      $echo "$modename: cannot find name of link library for \`$lib'" 1>&2
+-	      exit 1
++	      exit $EXIT_FAILURE
+ 	    fi
+ 	    # It is a libtool convenience library, so add in its objects.
+ 	    convenience="$convenience $ladir/$objdir/$old_library"
+ 	    old_convenience="$old_convenience $ladir/$objdir/$old_library"
++	    tmp_libs=
++	    for deplib in $dependency_libs; do
++	      deplibs="$deplib $deplibs"
++              if test "X$duplicate_deps" = "Xyes" ; then
++	        case "$tmp_libs " in
++	        *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
++	        esac
++              fi
++	      tmp_libs="$tmp_libs $deplib"
++	    done
+ 	  elif test "$linkmode" != prog && test "$linkmode" != lib; then
+ 	    $echo "$modename: \`$lib' is not a convenience library" 1>&2
+-	    exit 1
++	    exit $EXIT_FAILURE
+ 	  fi
+ 	  continue
+ 	fi # $pass = conv
+ 
+-    
++
+ 	# Get the name of the library we link against.
+ 	linklib=
+ 	for l in $old_library $library_names; do
+@@ -2086,16 +2362,18 @@
+ 	done
+ 	if test -z "$linklib"; then
+ 	  $echo "$modename: cannot find name of link library for \`$lib'" 1>&2
+-	  exit 1
++	  exit $EXIT_FAILURE
+ 	fi
+ 
+ 	# This library was specified with -dlopen.
+ 	if test "$pass" = dlopen; then
+ 	  if test -z "$libdir"; then
+ 	    $echo "$modename: cannot -dlopen a convenience library: \`$lib'" 1>&2
+-	    exit 1
++	    exit $EXIT_FAILURE
+ 	  fi
+-	  if test -z "$dlname" || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
++	  if test -z "$dlname" ||
++	     test "$dlopen_support" != yes ||
++	     test "$build_libtool_libs" = no; then
+ 	    # If there is no dlname, no dlopen support or we're linking
+ 	    # statically, we need to preload.  We also need to preload any
+ 	    # dependent libraries so libltdl's deplib preloader doesn't
+@@ -2132,11 +2410,19 @@
+ 	    dir="$libdir"
+ 	    absdir="$libdir"
+ 	  fi
++	  test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
+ 	else
+-	  dir="$ladir/$objdir"
+-	  absdir="$abs_ladir/$objdir"
+-	  # Remove this search path later
+-	  notinst_path="$notinst_path $abs_ladir"
++	  if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then
++	    dir="$ladir"
++	    absdir="$abs_ladir"
++	    # Remove this search path later
++	    notinst_path="$notinst_path $abs_ladir"
++	  else
++	    dir="$ladir/$objdir"
++	    absdir="$abs_ladir/$objdir"
++	    # Remove this search path later
++	    notinst_path="$notinst_path $abs_ladir"
++	  fi
+ 	fi # $installed = yes
+ 	name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
+ 
+@@ -2144,7 +2430,7 @@
+ 	if test "$pass" = dlpreopen; then
+ 	  if test -z "$libdir"; then
+ 	    $echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2
+-	    exit 1
++	    exit $EXIT_FAILURE
+ 	  fi
+ 	  # Prefer using a static library (so that no silly _DYNAMIC symbols
+ 	  # are required to link).
+@@ -2171,7 +2457,7 @@
+ 	  continue
+ 	fi
+ 
+-    
++
+ 	if test "$linkmode" = prog && test "$pass" != link; then
+ 	  newlib_search_path="$newlib_search_path $ladir"
+ 	  deplibs="$lib $deplibs"
+@@ -2209,12 +2495,12 @@
+ 	  if test -n "$library_names" &&
+ 	     { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
+ 	    # We need to hardcode the library path
+-	    if test -n "$shlibpath_var"; then
++	    if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
+ 	      # Make sure the rpath contains only unique directories.
+ 	      case "$temp_rpath " in
+ 	      *" $dir "*) ;;
+ 	      *" $absdir "*) ;;
+-	      *) temp_rpath="$temp_rpath $dir" ;;
++	      *) temp_rpath="$temp_rpath $absdir" ;;
+ 	      esac
+ 	    fi
+ 
+@@ -2251,24 +2537,29 @@
+ 	fi
+ 
+ 	link_static=no # Whether the deplib will be linked statically
++	use_static_libs=$prefer_static_libs
++	if test "$use_static_libs" = built && test "$installed" = yes ; then
++	  use_static_libs=no
++	fi
+ 	if test -n "$library_names" &&
+-	   { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
++	   { test "$use_static_libs" = no || test -z "$old_library"; }; then
+ 	  if test "$installed" = no; then
+ 	    notinst_deplibs="$notinst_deplibs $lib"
+ 	    need_relink=yes
+ 	  fi
+ 	  # This is a shared library
+-	
+-      # Warn about portability, can't link against -module's on some systems (darwin)
+-      if test "$shouldnotlink" = yes && test "$pass" = link ; then
++
++	  # Warn about portability, can't link against -module's on
++	  # some systems (darwin)
++	  if test "$shouldnotlink" = yes && test "$pass" = link ; then
+ 	    $echo
+ 	    if test "$linkmode" = prog; then
+ 	      $echo "*** Warning: Linking the executable $output against the loadable module"
+ 	    else
+ 	      $echo "*** Warning: Linking the shared library $output against the loadable module"
+ 	    fi
+-	    $echo "*** $linklib is not portable!"    
+-      fi	  
++	    $echo "*** $linklib is not portable!"
++	  fi
+ 	  if test "$linkmode" = lib &&
+ 	     test "$hardcode_into_libs" = yes; then
+ 	    # Hardcode the library path.
+@@ -2326,9 +2617,10 @@
+ 	    else
+ 	      $show "extracting exported symbol list from \`$soname'"
+ 	      save_ifs="$IFS"; IFS='~'
+-	      eval cmds=\"$extract_expsyms_cmds\"
++	      cmds=$extract_expsyms_cmds
+ 	      for cmd in $cmds; do
+ 		IFS="$save_ifs"
++		eval cmd=\"$cmd\"
+ 		$show "$cmd"
+ 		$run eval "$cmd" || exit $?
+ 	      done
+@@ -2339,9 +2631,10 @@
+ 	    if test -f "$output_objdir/$newlib"; then :; else
+ 	      $show "generating import library for \`$soname'"
+ 	      save_ifs="$IFS"; IFS='~'
+-	      eval cmds=\"$old_archive_from_expsyms_cmds\"
++	      cmds=$old_archive_from_expsyms_cmds
+ 	      for cmd in $cmds; do
+ 		IFS="$save_ifs"
++		eval cmd=\"$cmd\"
+ 		$show "$cmd"
+ 		$run eval "$cmd" || exit $?
+ 	      done
+@@ -2362,11 +2655,15 @@
+ 	      if test "$hardcode_direct" = no; then
+ 		add="$dir/$linklib"
+ 		case $host in
+-		  *-*-sco3.2v5* ) add_dir="-L$dir" ;;
++		  *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;;
++		  *-*-sysv4*uw2*) add_dir="-L$dir" ;;
++		  *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \
++		    *-*-unixware7*) add_dir="-L$dir" ;;
+ 		  *-*-darwin* )
+-		    # if the lib is a module then we can not link against it, someone
+-		    # is ignoring the new warnings I added
+-		    if /usr/bin/file -L $add 2> /dev/null | grep "bundle" >/dev/null ; then
++		    # if the lib is a module then we can not link against
++		    # it, someone is ignoring the new warnings I added
++		    if /usr/bin/file -L $add 2> /dev/null |
++                      $EGREP ": [^:]* bundle" >/dev/null ; then
+ 		      $echo "** Warning, lib $linklib is a module, not a shared library"
+ 		      if test -z "$old_library" ; then
+ 		        $echo
+@@ -2374,7 +2671,7 @@
+ 		        $echo "** The link will probably fail, sorry"
+ 		      else
+ 		        add="$dir/$old_library"
+-		      fi 
++		      fi
+ 		    fi
+ 		esac
+ 	      elif test "$hardcode_minus_L" = no; then
+@@ -2397,9 +2694,9 @@
+ 		add_dir="-L$dir"
+ 		# Try looking first in the location we're being installed to.
+ 		if test -n "$inst_prefix_dir"; then
+-		  case "$libdir" in
++		  case $libdir in
+ 		    [\\/]*)
+-		      add_dir="-L$inst_prefix_dir$libdir $add_dir"
++		      add_dir="$add_dir -L$inst_prefix_dir$libdir"
+ 		      ;;
+ 		  esac
+ 		fi
+@@ -2416,7 +2713,7 @@
+ 
+ 	    if test "$lib_linked" != yes; then
+ 	      $echo "$modename: configuration error: unsupported hardcode properties"
+-	      exit 1
++	      exit $EXIT_FAILURE
+ 	    fi
+ 
+ 	    if test -n "$add_shlibpath"; then
+@@ -2459,7 +2756,8 @@
+ 	      esac
+ 	      add="-l$name"
+ 	    elif test "$hardcode_automatic" = yes; then
+-	      if test -n "$inst_prefix_dir" && test -f "$inst_prefix_dir$libdir/$linklib" ; then
++	      if test -n "$inst_prefix_dir" &&
++		 test -f "$inst_prefix_dir$libdir/$linklib" ; then
+ 	        add="$inst_prefix_dir$libdir/$linklib"
+ 	      else
+ 	        add="$libdir/$linklib"
+@@ -2469,9 +2767,9 @@
+ 	      add_dir="-L$libdir"
+ 	      # Try looking first in the location we're being installed to.
+ 	      if test -n "$inst_prefix_dir"; then
+-		case "$libdir" in
++		case $libdir in
+ 		  [\\/]*)
+-		    add_dir="-L$inst_prefix_dir$libdir $add_dir"
++		    add_dir="$add_dir -L$inst_prefix_dir$libdir"
+ 		    ;;
+ 		esac
+ 	      fi
+@@ -2530,17 +2828,16 @@
+ 	      fi
+ 	    fi
+ 	  else
+-	    convenience="$convenience $dir/$old_library"
+-	    old_convenience="$old_convenience $dir/$old_library"
+ 	    deplibs="$dir/$old_library $deplibs"
+ 	    link_static=yes
+ 	  fi
+ 	fi # link shared/static library?
+ 
+ 	if test "$linkmode" = lib; then
+-	  #if test -n "$dependency_libs" &&
+-	  #   { test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes ||
+-	  #     test "$link_static" = yes; }; then
++	  if test -n "$dependency_libs" &&
++	     { test "$hardcode_into_libs" != yes ||
++	       test "$build_old_libs" = yes ||
++	       test "$link_static" = yes; }; then
+ 	    # Extract -R from dependency_libs
+ 	    temp_deplibs=
+ 	    for libdir in $dependency_libs; do
+@@ -2554,7 +2851,7 @@
+ 	      esac
+ 	    done
+ 	    dependency_libs="$temp_deplibs"
+-	  #fi
++	  fi
+ 
+ 	  newlib_search_path="$newlib_search_path $absdir"
+ 	  # Link against this library
+@@ -2596,20 +2893,18 @@
+ 		  eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+ 		  if test -z "$libdir"; then
+ 		    $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
+-		    exit 1
++		    exit $EXIT_FAILURE
+ 		  fi
+ 		  if test "$absdir" != "$libdir"; then
+-		    # Sure, some shells/systems don't implement the -ef.
+-		    # Those will have to live with the warning.
+-		    test "$absdir" -ef "$libdir" > /dev/null 2>&1 ||
+-		      $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2
++		    $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2
+ 		  fi
+ 		  path="$absdir"
+ 		fi
+ 		depdepl=
+ 		case $host in
+ 		*-*-darwin*)
+-		  # we do not want to link against static libs, but need to link against shared
++		  # we do not want to link against static libs,
++		  # but need to link against shared
+ 		  eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
+ 		  if test -n "$deplibrary_names" ; then
+ 		    for tmp in $deplibrary_names ; do
+@@ -2617,55 +2912,45 @@
+ 		    done
+ 		    if test -f "$path/$depdepl" ; then
+ 		      depdepl="$path/$depdepl"
+-		   fi
++		    fi
+ 		    # do not add paths which are already there
+ 		    case " $newlib_search_path " in
+ 		    *" $path "*) ;;
+ 		    *) newlib_search_path="$newlib_search_path $path";;
+ 		    esac
+-		    path=""
+ 		  fi
++		  path=""
+ 		  ;;
+ 		*)
+-		path="-L$path"
+-		;;
+-		esac 
+-		
++		  path="-L$path"
++		  ;;
++		esac
+ 		;;
+-		  -l*)
++	      -l*)
+ 		case $host in
+ 		*-*-darwin*)
+-		 # Again, we only want to link against shared libraries
+-		 eval tmp_libs=`$echo "X$deplib" | $Xsed -e "s,^\-l,,"`
+-		 for tmp in $newlib_search_path ; do
+-		     if test -f "$tmp/lib$tmp_libs.dylib" ; then
+-		       eval depdepl="$tmp/lib$tmp_libs.dylib"
+-		       break
+-		     fi  
+-         done
+-         path=""
++		  # Again, we only want to link against shared libraries
++		  eval tmp_libs=`$echo "X$deplib" | $Xsed -e "s,^\-l,,"`
++		  for tmp in $newlib_search_path ; do
++		    if test -f "$tmp/lib$tmp_libs.dylib" ; then
++		      eval depdepl="$tmp/lib$tmp_libs.dylib"
++		      break
++		    fi
++		  done
++		  path=""
+ 		  ;;
+ 		*) continue ;;
+-		esac  		  
+-		;;
+-
+-	      *.ltframework)
+-		case $host in
+-		  *-*-darwin*)
+-		    depdepl="$deplib"
+-		    ;;
+ 		esac
+ 		;;
+-
+ 	      *) continue ;;
+ 	      esac
+ 	      case " $deplibs " in
+-	      *" $depdepl "*) ;;
+-	      *) deplibs="$deplibs $depdepl" ;;
+-	      esac	      
+-	      case " $deplibs " in
+ 	      *" $path "*) ;;
+-	      *) deplibs="$deplibs $path" ;;
++	      *) deplibs="$path $deplibs" ;;
++	      esac
++	      case " $deplibs " in
++	      *" $depdepl "*) ;;
++	      *) deplibs="$depdepl $deplibs" ;;
+ 	      esac
+ 	    done
+ 	  fi # link_all_deplibs != no
+@@ -2752,7 +3037,8 @@
+ 	  eval $var=\"$tmp_libs\"
+ 	done # for var
+       fi
+-      # Last step: remove runtime libs from dependency_libs (they stay in deplibs)
++      # Last step: remove runtime libs from dependency_libs
++      # (they stay in deplibs)
+       tmp_libs=
+       for i in $dependency_libs ; do
+ 	case " $predeps $postdeps $compiler_lib_search_path " in
+@@ -2812,19 +3098,19 @@
+       case $outputname in
+       lib*)
+ 	name=`$echo "X$outputname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
+-	eval shared_ext=\"$shrext\"
++	eval shared_ext=\"$shrext_cmds\"
+ 	eval libname=\"$libname_spec\"
+ 	;;
+       *)
+ 	if test "$module" = no; then
+ 	  $echo "$modename: libtool library \`$output' must begin with \`lib'" 1>&2
+ 	  $echo "$help" 1>&2
+-	  exit 1
++	  exit $EXIT_FAILURE
+ 	fi
+ 	if test "$need_lib_prefix" != no; then
+ 	  # Add the "lib" prefix for modules if required
+ 	  name=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
+-	  eval shared_ext=\"$shrext\"
++	  eval shared_ext=\"$shrext_cmds\"
+ 	  eval libname=\"$libname_spec\"
+ 	else
+ 	  libname=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
+@@ -2835,7 +3121,7 @@
+       if test -n "$objs"; then
+ 	if test "$deplibs_check_method" != pass_all; then
+ 	  $echo "$modename: cannot build libtool library \`$output' from non-libtool objects on this host:$objs" 2>&1
+-	  exit 1
++	  exit $EXIT_FAILURE
+ 	else
+ 	  $echo
+ 	  $echo "*** Warning: Linking the shared library $output against the non-libtool"
+@@ -2883,13 +3169,13 @@
+ 	if test -n "$8"; then
+ 	  $echo "$modename: too many parameters to \`-version-info'" 1>&2
+ 	  $echo "$help" 1>&2
+-	  exit 1
++	  exit $EXIT_FAILURE
+ 	fi
+ 
+ 	# convert absolute version numbers to libtool ages
+ 	# this retains compatibility with .la files and attempts
+ 	# to make the code below a bit more comprehensible
+-	
++
+ 	case $vinfo_number in
+ 	yes)
+ 	  number_major="$2"
+@@ -2918,6 +3204,11 @@
+ 	    age="$number_minor"
+ 	    revision="$number_minor"
+ 	    ;;
++	  *)
++	    $echo "$modename: unknown library version type \`$version_type'" 1>&2
++	    $echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
++	    exit $EXIT_FAILURE
++	    ;;
+ 	  esac
+ 	  ;;
+ 	no)
+@@ -2929,36 +3220,36 @@
+ 
+ 	# Check that each of the things are valid numbers.
+ 	case $current in
+-	0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
++	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
+ 	*)
+-	  $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2
++	  $echo "$modename: CURRENT \`$current' must be a nonnegative integer" 1>&2
+ 	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
+-	  exit 1
++	  exit $EXIT_FAILURE
+ 	  ;;
+ 	esac
+ 
+ 	case $revision in
+-	0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
++	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
+ 	*)
+-	  $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2
++	  $echo "$modename: REVISION \`$revision' must be a nonnegative integer" 1>&2
+ 	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
+-	  exit 1
++	  exit $EXIT_FAILURE
+ 	  ;;
+ 	esac
+ 
+ 	case $age in
+-	0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
++	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
+ 	*)
+-	  $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2
++	  $echo "$modename: AGE \`$age' must be a nonnegative integer" 1>&2
+ 	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
+-	  exit 1
++	  exit $EXIT_FAILURE
+ 	  ;;
+ 	esac
+ 
+ 	if test "$age" -gt "$current"; then
+ 	  $echo "$modename: AGE \`$age' is greater than the current interface number \`$current'" 1>&2
+ 	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
+-	  exit 1
++	  exit $EXIT_FAILURE
+ 	fi
+ 
+ 	# Calculate the version variables.
+@@ -2975,7 +3266,7 @@
+ 	  versuffix="$major.$age.$revision"
+ 	  # Darwin ld doesn't like 0 for these options...
+ 	  minor_current=`expr $current + 1`
+-	  verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
++	  verstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
+ 	  ;;
+ 
+ 	freebsd-aout)
+@@ -3047,7 +3338,7 @@
+ 	*)
+ 	  $echo "$modename: unknown library version type \`$version_type'" 1>&2
+ 	  $echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
+-	  exit 1
++	  exit $EXIT_FAILURE
+ 	  ;;
+ 	esac
+ 
+@@ -3098,9 +3389,15 @@
+ 	tempremovelist=`$echo "$output_objdir/*"`
+ 	for p in $tempremovelist; do
+ 	  case $p in
+-	    *.$objext | *$exeext)
++	    *.$objext)
+ 	       ;;
+ 	    $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*)
++	       if test "X$precious_files_regex" != "X"; then
++	         if echo $p | $EGREP -e "$precious_files_regex" >/dev/null 2>&1
++	         then
++		   continue
++		 fi
++	       fi
+ 	       removelist="$removelist $p"
+ 	       ;;
+ 	    *) ;;
+@@ -3122,9 +3419,9 @@
+ 
+       # Eliminate all temporary directories.
+       for path in $notinst_path; do
+-	lib_search_path=`$echo "$lib_search_path " | ${SED} -e 's% $path % %g'`
+-	deplibs=`$echo "$deplibs " | ${SED} -e 's% -L$path % %g'`
+-	dependency_libs=`$echo "$dependency_libs " | ${SED} -e 's% -L$path % %g'`
++	lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`
++	deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
++	dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`
+       done
+ 
+       if test -n "$xrpath"; then
+@@ -3137,7 +3434,7 @@
+ 	  *) finalize_rpath="$finalize_rpath $libdir" ;;
+ 	  esac
+ 	done
+-	if true || test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
++	if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
+ 	  dependency_libs="$temp_xrpath $dependency_libs"
+ 	fi
+       fi
+@@ -3170,14 +3467,19 @@
+ 	    ;;
+ 	  *-*-rhapsody* | *-*-darwin1.[012])
+ 	    # Rhapsody C library is in the System framework
+-	    deplibs="$deplibs System.ltframework"
++	    deplibs="$deplibs -framework System"
+ 	    ;;
+ 	  *-*-netbsd*)
+ 	    # Don't link with libc until the a.out ld.so is fixed.
+ 	    ;;
+-	  *-*-openbsd* | *-*-freebsd*)
++	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
+ 	    # Do not include libc due to us having libc/libc_r.
+-	    test "X$arg" = "X-lc" && continue
++	    ;;
++	  *-*-sco3.2v5* | *-*-sco5v6*)
++	    # Causes problems with __ctype
++	    ;;
++	  *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
++	    # Compiler inserts libc in the correct place for threads to work
+ 	    ;;
+  	  *)
+ 	    # Add libc to deplibs on all other systems if necessary.
+@@ -3221,11 +3523,11 @@
+ 	  int main() { return 0; }
+ EOF
+ 	  $rm conftest
+-	  $LTCC -o conftest conftest.c $deplibs
++	  $LTCC $LTCFLAGS -o conftest conftest.c $deplibs
+ 	  if test "$?" -eq 0 ; then
+ 	    ldd_output=`ldd conftest`
+ 	    for i in $deplibs; do
+-	      name="`expr $i : '-l\(.*\)'`"
++	      name=`expr $i : '-l\(.*\)'`
+ 	      # If $name is empty we are operating on a -L argument.
+               if test "$name" != "" && test "$name" -ne "0"; then
+ 		if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+@@ -3262,11 +3564,11 @@
+ 	    # Error occurred in the first compile.  Let's try to salvage
+ 	    # the situation: Compile a separate program for each library.
+ 	    for i in $deplibs; do
+-	      name="`expr $i : '-l\(.*\)'`"
++	      name=`expr $i : '-l\(.*\)'`
+ 	      # If $name is empty we are operating on a -L argument.
+               if test "$name" != "" && test "$name" != "0"; then
+ 		$rm conftest
+-		$LTCC -o conftest conftest.c $i
++		$LTCC $LTCFLAGS -o conftest conftest.c $i
+ 		# Did it work?
+ 		if test "$?" -eq 0 ; then
+ 		  ldd_output=`ldd conftest`
+@@ -3314,7 +3616,7 @@
+ 	  set dummy $deplibs_check_method
+ 	  file_magic_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
+ 	  for a_deplib in $deplibs; do
+-	    name="`expr $a_deplib : '-l\(.*\)'`"
++	    name=`expr $a_deplib : '-l\(.*\)'`
+ 	    # If $name is empty we are operating on a -L argument.
+             if test "$name" != "" && test  "$name" != "0"; then
+ 	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+@@ -3383,7 +3685,7 @@
+ 	  set dummy $deplibs_check_method
+ 	  match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
+ 	  for a_deplib in $deplibs; do
+-	    name="`expr $a_deplib : '-l\(.*\)'`"
++	    name=`expr $a_deplib : '-l\(.*\)'`
+ 	    # If $name is empty we are operating on a -L argument.
+ 	    if test -n "$name" && test "$name" != "0"; then
+ 	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+@@ -3463,7 +3765,7 @@
+ 	case $host in
+ 	*-*-rhapsody* | *-*-darwin1.[012])
+ 	  # On Rhapsody replace the C library is the System framework
+-	  newdeplibs=`$echo "X $newdeplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
++	  newdeplibs=`$echo "X $newdeplibs" | $Xsed -e 's/ -lc / -framework System /'`
+ 	  ;;
+ 	esac
+ 
+@@ -3509,17 +3811,39 @@
+ 	    fi
+ 	  fi
+ 	fi
+-	# Time to change all our "foo.ltframework" stuff back to "-framework foo"
+-	case $host in
+-	  *-*-darwin*)
+-	    newdeplibs=`$echo "X $newdeplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
+-	    dependency_libs=`$echo "X $dependency_libs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
+-	    ;;
+-	esac
+ 	# Done checking deplibs!
+ 	deplibs=$newdeplibs
+       fi
+ 
++
++      # move library search paths that coincide with paths to not yet
++      # installed libraries to the beginning of the library search list
++      new_libs=
++      for path in $notinst_path; do
++	case " $new_libs " in
++	*" -L$path/$objdir "*) ;;
++	*)
++	  case " $deplibs " in
++	  *" -L$path/$objdir "*)
++	    new_libs="$new_libs -L$path/$objdir" ;;
++	  esac
++	  ;;
++	esac
++      done
++      for deplib in $deplibs; do
++	case $deplib in
++	-L*)
++	  case " $new_libs " in
++	  *" $deplib "*) ;;
++	  *) new_libs="$new_libs $deplib" ;;
++	  esac
++	  ;;
++	*) new_libs="$new_libs $deplib" ;;
++	esac
++      done
++      deplibs="$new_libs"
++
++
+       # All the library-specific variables (install_libdir is set above).
+       library_names=
+       old_library=
+@@ -3532,7 +3856,7 @@
+ 	  hardcode_libdirs=
+ 	  dep_rpath=
+ 	  rpath="$finalize_rpath"
+-	  test "$mode" != relink && test "$fast_install" = no && rpath="$compile_rpath$rpath"
++	  test "$mode" != relink && rpath="$compile_rpath$rpath"
+ 	  for libdir in $rpath; do
+ 	    if test -n "$hardcode_libdir_flag_spec"; then
+ 	      if test -n "$hardcode_libdir_separator"; then
+@@ -3587,7 +3911,7 @@
+ 	fi
+ 
+ 	# Get the real and link names of the library.
+-	eval shared_ext=\"$shrext\"
++	eval shared_ext=\"$shrext_cmds\"
+ 	eval library_names=\"$library_names_spec\"
+ 	set dummy $library_names
+ 	realname="$2"
+@@ -3603,6 +3927,7 @@
+ 	fi
+ 
+ 	lib="$output_objdir/$realname"
++	linknames=
+ 	for link
+ 	do
+ 	  linknames="$linknames $link"
+@@ -3617,10 +3942,11 @@
+ 	    $show "generating symbol list for \`$libname.la'"
+ 	    export_symbols="$output_objdir/$libname.exp"
+ 	    $run $rm $export_symbols
+-	    eval cmds=\"$export_symbols_cmds\"
++	    cmds=$export_symbols_cmds
+ 	    save_ifs="$IFS"; IFS='~'
+ 	    for cmd in $cmds; do
+ 	      IFS="$save_ifs"
++	      eval cmd=\"$cmd\"
+ 	      if len=`expr "X$cmd" : ".*"` &&
+ 	       test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
+ 	        $show "$cmd"
+@@ -3630,6 +3956,9 @@
+ 	        # The command line is too long to execute in one step.
+ 	        $show "using reloadable object file for export list..."
+ 	        skipped_export=:
++		# Break out early, otherwise skipped_export may be
++		# set to false by a later but shorter cmd.
++		break
+ 	      fi
+ 	    done
+ 	    IFS="$save_ifs"
+@@ -3650,12 +3979,12 @@
+ 	for test_deplib in $deplibs; do
+ 		case " $convenience " in
+ 		*" $test_deplib "*) ;;
+-		*) 
++		*)
+ 			tmp_deplibs="$tmp_deplibs $test_deplib"
+ 			;;
+ 		esac
+ 	done
+-	deplibs="$tmp_deplibs" 
++	deplibs="$tmp_deplibs"
+ 
+ 	if test -n "$convenience"; then
+ 	  if test -n "$whole_archive_flag_spec"; then
+@@ -3663,67 +3992,13 @@
+ 	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
+ 	  else
+ 	    gentop="$output_objdir/${outputname}x"
+-	    $show "${rm}r $gentop"
+-	    $run ${rm}r "$gentop"
+-	    $show "$mkdir $gentop"
+-	    $run $mkdir "$gentop"
+-	    status=$?
+-	    if test "$status" -ne 0 && test ! -d "$gentop"; then
+-	      exit $status
+-	    fi
+ 	    generated="$generated $gentop"
+ 
+-	    for xlib in $convenience; do
+-	      # Extract the objects.
+-	      case $xlib in
+-	      [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
+-	      *) xabs=`pwd`"/$xlib" ;;
+-	      esac
+-	      xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
+-	      xdir="$gentop/$xlib"
+-
+-	      $show "${rm}r $xdir"
+-	      $run ${rm}r "$xdir"
+-	      $show "$mkdir $xdir"
+-	      $run $mkdir "$xdir"
+-	      status=$?
+-	      if test "$status" -ne 0 && test ! -d "$xdir"; then
+-		exit $status
+-	      fi
+-	      # We will extract separately just the conflicting names and we will no
+-	      # longer touch any unique names. It is faster to leave these extract
+-	      # automatically by $AR in one run.
+-	      $show "(cd $xdir && $AR x $xabs)"
+-	      $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
+-	      if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then
+-		:
+-	      else
+-		$echo "$modename: warning: object name conflicts; renaming object files" 1>&2
+-		$echo "$modename: warning: to ensure that they will not overwrite" 1>&2
+-		$AR t "$xabs" | sort | uniq -cd | while read -r count name
+-		do
+-		  i=1
+-		  while test "$i" -le "$count"
+-		  do
+-		   # Put our $i before any first dot (extension)
+-		   # Never overwrite any file
+-		   name_to="$name"
+-		   while test "X$name_to" = "X$name" || test -f "$xdir/$name_to"
+-		   do
+-		     name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"`
+-		   done
+-		   $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')"
+-		   $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $?
+-		   i=`expr $i + 1`
+-		  done
+-		done
+-	      fi
+-
+-	      libobjs="$libobjs "`find $xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
+-	    done
++	    func_extract_archives $gentop $convenience
++	    libobjs="$libobjs $func_extract_archives_result"
+ 	  fi
+ 	fi
+-
++	
+ 	if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
+ 	  eval flag=\"$thread_safe_flag_spec\"
+ 	  linker_flags="$linker_flags $flag"
+@@ -3734,31 +4009,27 @@
+ 	  $run eval '(cd $output_objdir && $rm ${realname}U && $mv $realname ${realname}U)' || exit $?
+ 	fi
+ 
+-	# Add all flags from the command line.  We here create a library,
+-	# but those flags were only added to compile_command and
+-	# finalize_command, which are only used when creating executables.
+-	# So do it by hand here.
+-	compiler_flags="$compiler_flags $add_flags"
+-	# Only add it to commands which use CC, instead of LD, i.e.
+-	# only to $compiler_flags
+-	#linker_flags="$linker_flags $add_flags"
+-
+ 	# Do each of the archive commands.
+ 	if test "$module" = yes && test -n "$module_cmds" ; then
+ 	  if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
+-	    eval cmds=\"$module_expsym_cmds\"
++	    eval test_cmds=\"$module_expsym_cmds\"
++	    cmds=$module_expsym_cmds
+ 	  else
+-	    eval cmds=\"$module_cmds\"
++	    eval test_cmds=\"$module_cmds\"
++	    cmds=$module_cmds
+ 	  fi
+ 	else
+ 	if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
+-	  eval cmds=\"$archive_expsym_cmds\"
++	  eval test_cmds=\"$archive_expsym_cmds\"
++	  cmds=$archive_expsym_cmds
+ 	else
+-	  eval cmds=\"$archive_cmds\"
++	  eval test_cmds=\"$archive_cmds\"
++	  cmds=$archive_cmds
+ 	  fi
+ 	fi
+ 
+-	if test "X$skipped_export" != "X:" && len=`expr "X$cmds" : ".*"` &&
++	if test "X$skipped_export" != "X:" &&
++	   len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
+ 	   test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
+ 	  :
+ 	else
+@@ -3777,6 +4048,7 @@
+ 	    save_libobjs=$libobjs
+ 	  fi
+ 	  save_output=$output
++	  output_la=`$echo "X$output" | $Xsed -e "$basename"`
+ 
+ 	  # Clear the reloadable object creation command queue and
+ 	  # initialize k to one.
+@@ -3786,13 +4058,13 @@
+ 	  delfiles=
+ 	  last_robj=
+ 	  k=1
+-	  output=$output_objdir/$save_output-${k}.$objext
++	  output=$output_objdir/$output_la-${k}.$objext
+ 	  # Loop over the list of objects to be linked.
+ 	  for obj in $save_libobjs
+ 	  do
+ 	    eval test_cmds=\"$reload_cmds $objlist $last_robj\"
+ 	    if test "X$objlist" = X ||
+-	       { len=`expr "X$test_cmds" : ".*"` &&
++	       { len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
+ 		 test "$len" -le "$max_cmd_len"; }; then
+ 	      objlist="$objlist $obj"
+ 	    else
+@@ -3806,9 +4078,9 @@
+ 		# the last one created.
+ 		eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj\"
+ 	      fi
+-	      last_robj=$output_objdir/$save_output-${k}.$objext
++	      last_robj=$output_objdir/$output_la-${k}.$objext
+ 	      k=`expr $k + 1`
+-	      output=$output_objdir/$save_output-${k}.$objext
++	      output=$output_objdir/$output_la-${k}.$objext
+ 	      objlist=$obj
+ 	      len=1
+ 	    fi
+@@ -3828,13 +4100,13 @@
+ 	    eval concat_cmds=\"\$concat_cmds~$export_symbols_cmds\"
+           fi
+ 
+-	  # Set up a command to remove the reloadale object files
++	  # Set up a command to remove the reloadable object files
+ 	  # after they are used.
+ 	  i=0
+ 	  while test "$i" -lt "$k"
+ 	  do
+ 	    i=`expr $i + 1`
+-	    delfiles="$delfiles $output_objdir/$save_output-${i}.$objext"
++	    delfiles="$delfiles $output_objdir/$output_la-${i}.$objext"
+ 	  done
+ 
+ 	  $echo "creating a temporary reloadable object file: $output"
+@@ -3859,28 +4131,54 @@
+ 	  # value of $libobjs for piecewise linking.
+ 
+ 	  # Do each of the archive commands.
++	  if test "$module" = yes && test -n "$module_cmds" ; then
++	    if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
++	      cmds=$module_expsym_cmds
++	    else
++	      cmds=$module_cmds
++	    fi
++	  else
+ 	  if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
+-	    eval cmds=\"$archive_expsym_cmds\"
++	    cmds=$archive_expsym_cmds
+ 	  else
+-	    eval cmds=\"$archive_cmds\"
++	    cmds=$archive_cmds
++	    fi
+ 	  fi
+ 
+ 	  # Append the command to remove the reloadable object files
+ 	  # to the just-reset $cmds.
+-	  eval cmds=\"\$cmds~$rm $delfiles\"
++	  eval cmds=\"\$cmds~\$rm $delfiles\"
+ 	fi
+ 	save_ifs="$IFS"; IFS='~'
+ 	for cmd in $cmds; do
+ 	  IFS="$save_ifs"
++	  eval cmd=\"$cmd\"
+ 	  $show "$cmd"
+-	  $run eval "$cmd" || exit $?
++	  $run eval "$cmd" || {
++	    lt_exit=$?
++
++	    # Restore the uninstalled library and exit
++	    if test "$mode" = relink; then
++	      $run eval '(cd $output_objdir && $rm ${realname}T && $mv ${realname}U $realname)'
++	    fi
++
++	    exit $lt_exit
++	  }
+ 	done
+ 	IFS="$save_ifs"
+ 
+ 	# Restore the uninstalled library and exit
+ 	if test "$mode" = relink; then
+ 	  $run eval '(cd $output_objdir && $rm ${realname}T && $mv $realname ${realname}T && $mv "$realname"U $realname)' || exit $?
+-	  exit 0
++
++	  if test -n "$convenience"; then
++	    if test -z "$whole_archive_flag_spec"; then
++	      $show "${rm}r $gentop"
++	      $run ${rm}r "$gentop"
++	    fi
++	  fi
++
++	  exit $EXIT_SUCCESS
+ 	fi
+ 
+ 	# Create links to the real library.
+@@ -3928,7 +4226,7 @@
+       *.lo)
+ 	if test -n "$objs$old_deplibs"; then
+ 	  $echo "$modename: cannot build library object \`$output' from non-libtool objects" 1>&2
+-	  exit 1
++	  exit $EXIT_FAILURE
+ 	fi
+ 	libobj="$output"
+ 	obj=`$echo "X$output" | $Xsed -e "$lo2o"`
+@@ -3957,64 +4255,10 @@
+ 	  eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\"
+ 	else
+ 	  gentop="$output_objdir/${obj}x"
+-	  $show "${rm}r $gentop"
+-	  $run ${rm}r "$gentop"
+-	  $show "$mkdir $gentop"
+-	  $run $mkdir "$gentop"
+-	  status=$?
+-	  if test "$status" -ne 0 && test ! -d "$gentop"; then
+-	    exit $status
+-	  fi
+ 	  generated="$generated $gentop"
+ 
+-	  for xlib in $convenience; do
+-	    # Extract the objects.
+-	    case $xlib in
+-	    [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
+-	    *) xabs=`pwd`"/$xlib" ;;
+-	    esac
+-	    xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
+-	    xdir="$gentop/$xlib"
+-
+-	    $show "${rm}r $xdir"
+-	    $run ${rm}r "$xdir"
+-	    $show "$mkdir $xdir"
+-	    $run $mkdir "$xdir"
+-	    status=$?
+-	    if test "$status" -ne 0 && test ! -d "$xdir"; then
+-	      exit $status
+-	    fi
+-	    # We will extract separately just the conflicting names and we will no
+-	    # longer touch any unique names. It is faster to leave these extract
+-	    # automatically by $AR in one run.
+-	    $show "(cd $xdir && $AR x $xabs)"
+-	    $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
+-	    if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then
+-	      :
+-	    else
+-	      $echo "$modename: warning: object name conflicts; renaming object files" 1>&2
+-	      $echo "$modename: warning: to ensure that they will not overwrite" 1>&2
+-	      $AR t "$xabs" | sort | uniq -cd | while read -r count name
+-	      do
+-		i=1
+-		while test "$i" -le "$count"
+-		do
+-		 # Put our $i before any first dot (extension)
+-		 # Never overwrite any file
+-		 name_to="$name"
+-		 while test "X$name_to" = "X$name" || test -f "$xdir/$name_to"
+-		 do
+-		   name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"`
+-		 done
+-		 $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')"
+-		 $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $?
+-		 i=`expr $i + 1`
+-		done
+-	      done
+-	    fi
+-
+-	    reload_conv_objs="$reload_objs "`find $xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
+-	  done
++	  func_extract_archives $gentop $convenience
++	  reload_conv_objs="$reload_objs $func_extract_archives_result"
+ 	fi
+       fi
+ 
+@@ -4022,10 +4266,11 @@
+       reload_objs="$objs$old_deplibs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
+ 
+       output="$obj"
+-      eval cmds=\"$reload_cmds\"
++      cmds=$reload_cmds
+       save_ifs="$IFS"; IFS='~'
+       for cmd in $cmds; do
+ 	IFS="$save_ifs"
++	eval cmd=\"$cmd\"
+ 	$show "$cmd"
+ 	$run eval "$cmd" || exit $?
+       done
+@@ -4038,7 +4283,7 @@
+ 	  $run ${rm}r $gentop
+ 	fi
+ 
+-	exit 0
++	exit $EXIT_SUCCESS
+       fi
+ 
+       if test "$build_libtool_libs" != yes; then
+@@ -4051,17 +4296,18 @@
+ 	# accidentally link it into a program.
+ 	# $show "echo timestamp > $libobj"
+ 	# $run eval "echo timestamp > $libobj" || exit $?
+-	exit 0
++	exit $EXIT_SUCCESS
+       fi
+ 
+       if test -n "$pic_flag" || test "$pic_mode" != default; then
+ 	# Only do commands if we really have different PIC objects.
+ 	reload_objs="$libobjs $reload_conv_objs"
+ 	output="$libobj"
+-	eval cmds=\"$reload_cmds\"
++	cmds=$reload_cmds
+ 	save_ifs="$IFS"; IFS='~'
+ 	for cmd in $cmds; do
+ 	  IFS="$save_ifs"
++	  eval cmd=\"$cmd\"
+ 	  $show "$cmd"
+ 	  $run eval "$cmd" || exit $?
+ 	done
+@@ -4073,7 +4319,7 @@
+ 	$run ${rm}r $gentop
+       fi
+ 
+-      exit 0
++      exit $EXIT_SUCCESS
+       ;;
+ 
+     prog)
+@@ -4098,24 +4344,50 @@
+       case $host in
+       *-*-rhapsody* | *-*-darwin1.[012])
+ 	# On Rhapsody replace the C library is the System framework
+-	compile_deplibs=`$echo "X $compile_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
+-	finalize_deplibs=`$echo "X $finalize_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
++	compile_deplibs=`$echo "X $compile_deplibs" | $Xsed -e 's/ -lc / -framework System /'`
++	finalize_deplibs=`$echo "X $finalize_deplibs" | $Xsed -e 's/ -lc / -framework System /'`
+ 	;;
+       esac
+ 
+       case $host in
+-      *-*-darwin*)
++      *darwin*)
+         # Don't allow lazy linking, it breaks C++ global constructors
+         if test "$tagname" = CXX ; then
+         compile_command="$compile_command ${wl}-bind_at_load"
+         finalize_command="$finalize_command ${wl}-bind_at_load"
+         fi
+-	# Time to change all our "foo.ltframework" stuff back to "-framework foo"
+-	compile_deplibs=`$echo "X $compile_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
+-	finalize_deplibs=`$echo "X $finalize_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
+         ;;
+       esac
+ 
++
++      # move library search paths that coincide with paths to not yet
++      # installed libraries to the beginning of the library search list
++      new_libs=
++      for path in $notinst_path; do
++	case " $new_libs " in
++	*" -L$path/$objdir "*) ;;
++	*)
++	  case " $compile_deplibs " in
++	  *" -L$path/$objdir "*)
++	    new_libs="$new_libs -L$path/$objdir" ;;
++	  esac
++	  ;;
++	esac
++      done
++      for deplib in $compile_deplibs; do
++	case $deplib in
++	-L*)
++	  case " $new_libs " in
++	  *" $deplib "*) ;;
++	  *) new_libs="$new_libs $deplib" ;;
++	  esac
++	  ;;
++	*) new_libs="$new_libs $deplib" ;;
++	esac
++      done
++      compile_deplibs="$new_libs"
++
++
+       compile_command="$compile_command $compile_deplibs"
+       finalize_command="$finalize_command $finalize_deplibs"
+ 
+@@ -4160,10 +4432,15 @@
+ 	fi
+ 	case $host in
+ 	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
++	  testbindir=`$echo "X$libdir" | $Xsed -e 's*/lib$*/bin*'`
+ 	  case :$dllsearchpath: in
+ 	  *":$libdir:"*) ;;
+ 	  *) dllsearchpath="$dllsearchpath:$libdir";;
+ 	  esac
++	  case :$dllsearchpath: in
++	  *":$testbindir:"*) ;;
++	  *) dllsearchpath="$dllsearchpath:$testbindir";;
++	  esac
+ 	  ;;
+ 	esac
+       done
+@@ -4277,13 +4554,25 @@
+ 
+ 	    # Prepare the list of exported symbols
+ 	    if test -z "$export_symbols"; then
+-	      export_symbols="$output_objdir/$output.exp"
++	      export_symbols="$output_objdir/$outputname.exp"
+ 	      $run $rm $export_symbols
+-	      $run eval "${SED} -n -e '/^: @PROGRAM@$/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
++	      $run eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
++              case $host in
++              *cygwin* | *mingw* )
++	        $run eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
++		$run eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"'
++                ;;
++              esac
+ 	    else
+-	      $run eval "${SED} -e 's/\([][.*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$output.exp"'
+-	      $run eval 'grep -f "$output_objdir/$output.exp" < "$nlist" > "$nlist"T'
++	      $run eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
++	      $run eval 'grep -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
+ 	      $run eval 'mv "$nlist"T "$nlist"'
++              case $host in
++              *cygwin* | *mingw* )
++	        $run eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
++		$run eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
++                ;;
++              esac
+ 	    fi
+ 	  fi
+ 
+@@ -4334,7 +4623,26 @@
+ #endif
+ 
+ /* The mapping between symbol names and symbols. */
++"
++
++	    case $host in
++	    *cygwin* | *mingw* )
++	  $echo >> "$output_objdir/$dlsyms" "\
++/* DATA imports from DLLs on WIN32 can't be const, because
++   runtime relocations are performed -- see ld's documentation
++   on pseudo-relocs */
++struct {
++"
++	      ;;
++	    * )
++	  $echo >> "$output_objdir/$dlsyms" "\
+ const struct {
++"
++	      ;;
++	    esac
++
++
++	  $echo >> "$output_objdir/$dlsyms" "\
+   const char *name;
+   lt_ptr address;
+ }
+@@ -4381,20 +4689,33 @@
+ 	  esac
+ 
+ 	  # Now compile the dynamic symbol file.
+-	  $show "(cd $output_objdir && $LTCC -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")"
+-	  $run eval '(cd $output_objdir && $LTCC -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $?
++	  $show "(cd $output_objdir && $LTCC  $LTCFLAGS -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")"
++	  $run eval '(cd $output_objdir && $LTCC  $LTCFLAGS -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $?
+ 
+ 	  # Clean up the generated files.
+ 	  $show "$rm $output_objdir/$dlsyms $nlist ${nlist}S ${nlist}T"
+ 	  $run $rm "$output_objdir/$dlsyms" "$nlist" "${nlist}S" "${nlist}T"
+ 
+ 	  # Transform the symbol file into the correct name.
+-	  compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
+-	  finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
++          case $host in
++          *cygwin* | *mingw* )
++            if test -f "$output_objdir/${outputname}.def" ; then
++              compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"`
++              finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"`
++            else
++              compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
++              finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
++             fi
++            ;;
++          * )
++            compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
++            finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
++            ;;
++          esac
+ 	  ;;
+ 	*)
+ 	  $echo "$modename: unknown suffix for \`$dlsyms'" 1>&2
+-	  exit 1
++	  exit $EXIT_FAILURE
+ 	  ;;
+ 	esac
+       else
+@@ -4407,17 +4728,6 @@
+ 	finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
+       fi
+ 
+-      # AIX runtime linking requires linking programs with -Wl,-brtl and libs with -Wl,-G
+-      # Also add -bnolibpath to the beginning of the link line, to clear the hardcoded runpath.
+-      # Otherwise, things like the -L path to libgcc.a are accidentally hardcoded by ld.
+-      # This does not apply on AIX for ia64, which uses a SysV linker.
+-      case "$host" in
+-        ia64-*-aix5*) ;;
+-        *-*-aix4* | *-*-aix5*)
+-                   compile_command=`$echo "X$compile_command $wl-brtl" | $Xsed -e "s/\$CC/\$CC $wl-bnolibpath/1"`
+-                   finalize_command=`$echo "X$finalize_command $wl-brtl" | $Xsed -e "s/\$CC/\$CC $wl-bnolibpath/1"` ;;
+-      esac
+-
+       if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
+ 	# Replace the output file specification.
+ 	compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
+@@ -4426,7 +4736,7 @@
+ 	# We have no uninstalled library dependencies, so finalize right now.
+ 	$show "$link_command"
+ 	$run eval "$link_command"
+-	status=$?
++	exit_status=$?
+ 
+ 	# Delete the generated files.
+ 	if test -n "$dlsyms"; then
+@@ -4434,7 +4744,7 @@
+ 	  $run $rm "$output_objdir/${outputname}S.${objext}"
+ 	fi
+ 
+-	exit $status
++	exit $exit_status
+       fi
+ 
+       if test -n "$shlibpath_var"; then
+@@ -4493,7 +4803,7 @@
+ 	# Link the executable and exit
+ 	$show "$link_command"
+ 	$run eval "$link_command" || exit $?
+-	exit 0
++	exit $EXIT_SUCCESS
+       fi
+ 
+       if test "$hardcode_action" = relink; then
+@@ -4548,10 +4858,10 @@
+       fi
+ 
+       # Quote $echo for shipping.
+-      if test "X$echo" = "X$SHELL $0 --fallback-echo"; then
+-	case $0 in
+-	[\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $0 --fallback-echo";;
+-	*) qecho="$SHELL `pwd`/$0 --fallback-echo";;
++      if test "X$echo" = "X$SHELL $progpath --fallback-echo"; then
++	case $progpath in
++	[\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $progpath --fallback-echo";;
++	*) qecho="$SHELL `pwd`/$progpath --fallback-echo";;
+ 	esac
+ 	qecho=`$echo "X$qecho" | $Xsed -e "$sed_quote_subst"`
+       else
+@@ -4573,11 +4883,13 @@
+ 	  *) exeext= ;;
+ 	esac
+ 	case $host in
+-	  *mingw* )
+-	    cwrappersource=`$echo ${output_objdir}/lt-${outputname}.c`
+-	    cwrapper=`$echo ${output}.exe`
+-	    $rm $cwrappersource $cwrapper
+-	    trap "$rm $cwrappersource $cwrapper; exit 1" 1 2 15
++	  *cygwin* | *mingw* )
++            output_name=`basename $output`
++            output_path=`dirname $output`
++            cwrappersource="$output_path/$objdir/lt-$output_name.c"
++            cwrapper="$output_path/$output_name.exe"
++            $rm $cwrappersource $cwrapper
++            trap "$rm $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15
+ 
+ 	    cat > $cwrappersource <<EOF
+ 
+@@ -4586,7 +4898,7 @@
+ 
+    The $output program cannot be directly executed until all the libtool
+    libraries that it depends on are installed.
+-   
++
+    This wrapper executable should never be moved out of the build directory.
+    If it is, it will not operate correctly.
+ 
+@@ -4602,6 +4914,9 @@
+ #include <malloc.h>
+ #include <stdarg.h>
+ #include <assert.h>
++#include <string.h>
++#include <ctype.h>
++#include <sys/stat.h>
+ 
+ #if defined(PATH_MAX)
+ # define LT_PATHMAX PATH_MAX
+@@ -4612,15 +4927,19 @@
+ #endif
+ 
+ #ifndef DIR_SEPARATOR
+-#define DIR_SEPARATOR '/'
++# define DIR_SEPARATOR '/'
++# define PATH_SEPARATOR ':'
+ #endif
+ 
+ #if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \
+   defined (__OS2__)
+-#define HAVE_DOS_BASED_FILE_SYSTEM
+-#ifndef DIR_SEPARATOR_2 
+-#define DIR_SEPARATOR_2 '\\'
+-#endif
++# define HAVE_DOS_BASED_FILE_SYSTEM
++# ifndef DIR_SEPARATOR_2
++#  define DIR_SEPARATOR_2 '\\'
++# endif
++# ifndef PATH_SEPARATOR_2
++#  define PATH_SEPARATOR_2 ';'
++# endif
+ #endif
+ 
+ #ifndef DIR_SEPARATOR_2
+@@ -4630,17 +4949,32 @@
+         (((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2))
+ #endif /* DIR_SEPARATOR_2 */
+ 
++#ifndef PATH_SEPARATOR_2
++# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR)
++#else /* PATH_SEPARATOR_2 */
++# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2)
++#endif /* PATH_SEPARATOR_2 */
++
+ #define XMALLOC(type, num)      ((type *) xmalloc ((num) * sizeof(type)))
+ #define XFREE(stale) do { \
+   if (stale) { free ((void *) stale); stale = 0; } \
+ } while (0)
+ 
++/* -DDEBUG is fairly common in CFLAGS.  */
++#undef DEBUG
++#if defined DEBUGWRAPPER
++# define DEBUG(format, ...) fprintf(stderr, format, __VA_ARGS__)
++#else
++# define DEBUG(format, ...)
++#endif
++
+ const char *program_name = NULL;
+ 
+ void * xmalloc (size_t num);
+ char * xstrdup (const char *string);
+-char * basename (const char *name);
+-char * fnqualify(const char *path);
++const char * base_name (const char *name);
++char * find_executable(const char *wrapper);
++int    check_executable(const char *path);
+ char * strendzap(char *str, const char *pat);
+ void lt_fatal (const char *message, ...);
+ 
+@@ -4649,30 +4983,52 @@
+ {
+   char **newargz;
+   int i;
+-  
+-  program_name = (char *) xstrdup ((char *) basename (argv[0]));
++
++  program_name = (char *) xstrdup (base_name (argv[0]));
++  DEBUG("(main) argv[0]      : %s\n",argv[0]);
++  DEBUG("(main) program_name : %s\n",program_name);
+   newargz = XMALLOC(char *, argc+2);
+ EOF
+ 
+-	    cat >> $cwrappersource <<EOF
+-  newargz[0] = "$SHELL";
++            cat >> $cwrappersource <<EOF
++  newargz[0] = (char *) xstrdup("$SHELL");
+ EOF
+ 
+-	    cat >> $cwrappersource <<"EOF"
+-  newargz[1] = fnqualify(argv[0]);
++            cat >> $cwrappersource <<"EOF"
++  newargz[1] = find_executable(argv[0]);
++  if (newargz[1] == NULL)
++    lt_fatal("Couldn't find %s", argv[0]);
++  DEBUG("(main) found exe at : %s\n",newargz[1]);
+   /* we know the script has the same name, without the .exe */
+   /* so make sure newargz[1] doesn't end in .exe */
+-  strendzap(newargz[1],".exe"); 
++  strendzap(newargz[1],".exe");
+   for (i = 1; i < argc; i++)
+     newargz[i+1] = xstrdup(argv[i]);
+   newargz[argc+1] = NULL;
++
++  for (i=0; i<argc+1; i++)
++  {
++    DEBUG("(main) newargz[%d]   : %s\n",i,newargz[i]);
++    ;
++  }
++
+ EOF
+ 
+-	    cat >> $cwrappersource <<EOF
++            case $host_os in
++              mingw*)
++                cat >> $cwrappersource <<EOF
++  execv("$SHELL",(char const **)newargz);
++EOF
++              ;;
++              *)
++                cat >> $cwrappersource <<EOF
+   execv("$SHELL",newargz);
+ EOF
++              ;;
++            esac
+ 
+-	    cat >> $cwrappersource <<"EOF"
++            cat >> $cwrappersource <<"EOF"
++  return 127;
+ }
+ 
+ void *
+@@ -4685,59 +5041,159 @@
+   return p;
+ }
+ 
+-char * 
++char *
+ xstrdup (const char *string)
+ {
+   return string ? strcpy ((char *) xmalloc (strlen (string) + 1), string) : NULL
+ ;
+ }
+ 
+-char *
+-basename (const char *name)
++const char *
++base_name (const char *name)
+ {
+   const char *base;
+ 
+ #if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+   /* Skip over the disk name in MSDOS pathnames. */
+-  if (isalpha (name[0]) && name[1] == ':') 
++  if (isalpha ((unsigned char)name[0]) && name[1] == ':')
+     name += 2;
+ #endif
+ 
+   for (base = name; *name; name++)
+     if (IS_DIR_SEPARATOR (*name))
+       base = name + 1;
+-  return (char *) base;
++  return base;
+ }
+ 
+-char * 
+-fnqualify(const char *path)
++int
++check_executable(const char * path)
++{
++  struct stat st;
++
++  DEBUG("(check_executable)  : %s\n", path ? (*path ? path : "EMPTY!") : "NULL!");
++  if ((!path) || (!*path))
++    return 0;
++
++  if ((stat (path, &st) >= 0) &&
++      (
++        /* MinGW & native WIN32 do not support S_IXOTH or S_IXGRP */
++#if defined (S_IXOTH)
++       ((st.st_mode & S_IXOTH) == S_IXOTH) ||
++#endif
++#if defined (S_IXGRP)
++       ((st.st_mode & S_IXGRP) == S_IXGRP) ||
++#endif
++       ((st.st_mode & S_IXUSR) == S_IXUSR))
++      )
++    return 1;
++  else
++    return 0;
++}
++
++/* Searches for the full path of the wrapper.  Returns
++   newly allocated full path name if found, NULL otherwise */
++char *
++find_executable (const char* wrapper)
+ {
+-  size_t size;
+-  char *p;
++  int has_slash = 0;
++  const char* p;
++  const char* p_next;
++  /* static buffer for getcwd */
+   char tmp[LT_PATHMAX + 1];
++  int tmp_len;
++  char* concat_name;
++
++  DEBUG("(find_executable)  : %s\n", wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!");
+ 
+-  assert(path != NULL);
++  if ((wrapper == NULL) || (*wrapper == '\0'))
++    return NULL;
+ 
+-  /* Is it qualified already? */
++  /* Absolute path? */
++#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
++  if (isalpha ((unsigned char)wrapper[0]) && wrapper[1] == ':')
++  {
++    concat_name = xstrdup (wrapper);
++    if (check_executable(concat_name))
++      return concat_name;
++    XFREE(concat_name);
++  }
++  else
++  {
++#endif
++    if (IS_DIR_SEPARATOR (wrapper[0]))
++    {
++      concat_name = xstrdup (wrapper);
++      if (check_executable(concat_name))
++        return concat_name;
++      XFREE(concat_name);
++    }
+ #if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+-  if (isalpha (path[0]) && path[1] == ':')
+-    return xstrdup (path);
++  }
+ #endif
+-  if (IS_DIR_SEPARATOR (path[0]))
+-    return xstrdup (path);
+ 
+-  /* prepend the current directory */
+-  /* doesn't handle '~' */
++  for (p = wrapper; *p; p++)
++    if (*p == '/')
++    {
++      has_slash = 1;
++      break;
++    }
++  if (!has_slash)
++  {
++    /* no slashes; search PATH */
++    const char* path = getenv ("PATH");
++    if (path != NULL)
++    {
++      for (p = path; *p; p = p_next)
++      {
++        const char* q;
++        size_t p_len;
++        for (q = p; *q; q++)
++          if (IS_PATH_SEPARATOR(*q))
++            break;
++        p_len = q - p;
++        p_next = (*q == '\0' ? q : q + 1);
++        if (p_len == 0)
++        {
++          /* empty path: current directory */
++          if (getcwd (tmp, LT_PATHMAX) == NULL)
++            lt_fatal ("getcwd failed");
++          tmp_len = strlen(tmp);
++          concat_name = XMALLOC(char, tmp_len + 1 + strlen(wrapper) + 1);
++          memcpy (concat_name, tmp, tmp_len);
++          concat_name[tmp_len] = '/';
++          strcpy (concat_name + tmp_len + 1, wrapper);
++        }
++        else
++        {
++          concat_name = XMALLOC(char, p_len + 1 + strlen(wrapper) + 1);
++          memcpy (concat_name, p, p_len);
++          concat_name[p_len] = '/';
++          strcpy (concat_name + p_len + 1, wrapper);
++        }
++        if (check_executable(concat_name))
++          return concat_name;
++        XFREE(concat_name);
++      }
++    }
++    /* not found in PATH; assume curdir */
++  }
++  /* Relative path | not found in path: prepend cwd */
+   if (getcwd (tmp, LT_PATHMAX) == NULL)
+     lt_fatal ("getcwd failed");
+-  size = strlen(tmp) + 1 + strlen(path) + 1; /* +2 for '/' and '\0' */
+-  p = XMALLOC(char, size);
+-  sprintf(p, "%s%c%s", tmp, DIR_SEPARATOR, path);
+-  return p;
++  tmp_len = strlen(tmp);
++  concat_name = XMALLOC(char, tmp_len + 1 + strlen(wrapper) + 1);
++  memcpy (concat_name, tmp, tmp_len);
++  concat_name[tmp_len] = '/';
++  strcpy (concat_name + tmp_len + 1, wrapper);
++
++  if (check_executable(concat_name))
++    return concat_name;
++  XFREE(concat_name);
++  return NULL;
+ }
+ 
+ char *
+-strendzap(char *str, const char *pat) 
++strendzap(char *str, const char *pat)
+ {
+   size_t len, patlen;
+ 
+@@ -4757,7 +5213,7 @@
+ }
+ 
+ static void
+-lt_error_core (int exit_status, const char * mode, 
++lt_error_core (int exit_status, const char * mode,
+           const char * message, va_list ap)
+ {
+   fprintf (stderr, "%s: %s: ", program_name, mode);
+@@ -4777,16 +5233,16 @@
+   va_end (ap);
+ }
+ EOF
+-	  # we should really use a build-platform specific compiler
+-	  # here, but OTOH, the wrappers (shell script and this C one)
+-	  # are only useful if you want to execute the "real" binary.
+-	  # Since the "real" binary is built for $host, then this
+-	  # wrapper might as well be built for $host, too.
+-	  $run $LTCC -s -o $cwrapper $cwrappersource
+-	  ;;
+-	esac
+-	$rm $output
+-	trap "$rm $output; exit 1" 1 2 15
++          # we should really use a build-platform specific compiler
++          # here, but OTOH, the wrappers (shell script and this C one)
++          # are only useful if you want to execute the "real" binary.
++          # Since the "real" binary is built for $host, then this
++          # wrapper might as well be built for $host, too.
++          $run $LTCC $LTCFLAGS -s -o $cwrapper $cwrappersource
++          ;;
++        esac
++        $rm $output
++        trap "$rm $output; exit $EXIT_FAILURE" 1 2 15
+ 
+ 	$echo > $output "\
+ #! $SHELL
+@@ -4807,7 +5263,7 @@
+ 
+ # The HP-UX ksh and POSIX shell print the target directory to stdout
+ # if CDPATH is set.
+-if test \"\${CDPATH+set}\" = set; then CDPATH=:; export CDPATH; fi
++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+ 
+ relink_command=\"$relink_command\"
+ 
+@@ -4886,7 +5342,7 @@
+       else
+ 	$echo \"\$relink_command_output\" >&2
+ 	$rm \"\$progdir/\$file\"
+-	exit 1
++	exit $EXIT_FAILURE
+       fi
+     fi
+ 
+@@ -4936,34 +5392,32 @@
+ 	# Backslashes separate directories on plain windows
+ 	*-*-mingw | *-*-os2*)
+ 	  $echo >> $output "\
+-      exec \$progdir\\\\\$program \${1+\"\$@\"}
++      exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
+ "
+ 	  ;;
+ 
+ 	*)
+-	  # Need to set LD_LIBRARY_PATH, to the value already
+-	  # computed within libtool.
+ 	  $echo >> $output "\
+-      LD_LIBRARY_PATH=\"$rpath\" exec \$progdir/\$program \${1+\"\$@\"}
++      exec \"\$progdir/\$program\" \${1+\"\$@\"}
+ "
+ 	  ;;
+ 	esac
+ 	$echo >> $output "\
+       \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\"
+-      exit 1
++      exit $EXIT_FAILURE
+     fi
+   else
+     # The program doesn't exist.
+-    \$echo \"\$0: error: \$progdir/\$program does not exist\" 1>&2
++    \$echo \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2
+     \$echo \"This script is just a wrapper for \$program.\" 1>&2
+     $echo \"See the $PACKAGE documentation for more information.\" 1>&2
+-    exit 1
++    exit $EXIT_FAILURE
+   fi
+ fi\
+ "
+ 	chmod +x $output
+       fi
+-      exit 0
++      exit $EXIT_SUCCESS
+       ;;
+     esac
+ 
+@@ -4986,78 +5440,78 @@
+ 
+       if test -n "$addlibs"; then
+ 	gentop="$output_objdir/${outputname}x"
+-	$show "${rm}r $gentop"
+-	$run ${rm}r "$gentop"
+-	$show "$mkdir $gentop"
+-	$run $mkdir "$gentop"
+-	status=$?
+-	if test "$status" -ne 0 && test ! -d "$gentop"; then
+-	  exit $status
+-	fi
+ 	generated="$generated $gentop"
+ 
+-	# Add in members from convenience archives.
+-	for xlib in $addlibs; do
+-	  # Extract the objects.
+-	  case $xlib in
+-	  [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
+-	  *) xabs=`pwd`"/$xlib" ;;
+-	  esac
+-	  xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
+-	  xdir="$gentop/$xlib"
+-
+-	  $show "${rm}r $xdir"
+-	  $run ${rm}r "$xdir"
+-	  $show "$mkdir $xdir"
+-	  $run $mkdir "$xdir"
+-	  status=$?
+-	  if test "$status" -ne 0 && test ! -d "$xdir"; then
+-	    exit $status
+-	  fi
+-	  # We will extract separately just the conflicting names and we will no
+-	  # longer touch any unique names. It is faster to leave these extract
+-	  # automatically by $AR in one run.
+-	  $show "(cd $xdir && $AR x $xabs)"
+-	  $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
+-	  if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then
+-	    :
+-	  else
+-	    $echo "$modename: warning: object name conflicts; renaming object files" 1>&2
+-	    $echo "$modename: warning: to ensure that they will not overwrite" 1>&2
+-	    $AR t "$xabs" | sort | uniq -cd | while read -r count name
+-	    do
+-	      i=1
+-	      while test "$i" -le "$count"
+-	      do
+-	       # Put our $i before any first dot (extension)
+-	       # Never overwrite any file
+-	       name_to="$name"
+-	       while test "X$name_to" = "X$name" || test -f "$xdir/$name_to"
+-	       do
+-		 name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"`
+-	       done
+-	       $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')"
+-	       $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $?
+-	       i=`expr $i + 1`
+-	      done
+-	    done
+-	  fi
+-
+-	  oldobjs="$oldobjs "`find $xdir -name \*.${objext} -print -o -name \*.lo -print | $NL2SP`
+-	done
++	func_extract_archives $gentop $addlibs
++	oldobjs="$oldobjs $func_extract_archives_result"
+       fi
+ 
+-      compiler_flags="$compiler_flags $add_flags"
+-
+       # Do each command in the archive commands.
+       if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then
+-	eval cmds=\"$old_archive_from_new_cmds\"
++       cmds=$old_archive_from_new_cmds
+       else
++	# POSIX demands no paths to be encoded in archives.  We have
++	# to avoid creating archives with duplicate basenames if we
++	# might have to extract them afterwards, e.g., when creating a
++	# static archive out of a convenience library, or when linking
++	# the entirety of a libtool archive into another (currently
++	# not supported by libtool).
++	if (for obj in $oldobjs
++	    do
++	      $echo "X$obj" | $Xsed -e 's%^.*/%%'
++	    done | sort | sort -uc >/dev/null 2>&1); then
++	  :
++	else
++	  $echo "copying selected object files to avoid basename conflicts..."
++
++	  if test -z "$gentop"; then
++	    gentop="$output_objdir/${outputname}x"
++	    generated="$generated $gentop"
++
++	    $show "${rm}r $gentop"
++	    $run ${rm}r "$gentop"
++	    $show "$mkdir $gentop"
++	    $run $mkdir "$gentop"
++	    exit_status=$?
++	    if test "$exit_status" -ne 0 && test ! -d "$gentop"; then
++	      exit $exit_status
++	    fi
++	  fi
++
++	  save_oldobjs=$oldobjs
++	  oldobjs=
++	  counter=1
++	  for obj in $save_oldobjs
++	  do
++	    objbase=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
++	    case " $oldobjs " in
++	    " ") oldobjs=$obj ;;
++	    *[\ /]"$objbase "*)
++	      while :; do
++		# Make sure we don't pick an alternate name that also
++		# overlaps.
++		newobj=lt$counter-$objbase
++		counter=`expr $counter + 1`
++		case " $oldobjs " in
++		*[\ /]"$newobj "*) ;;
++		*) if test ! -f "$gentop/$newobj"; then break; fi ;;
++		esac
++	      done
++	      $show "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj"
++	      $run ln "$obj" "$gentop/$newobj" ||
++	      $run cp "$obj" "$gentop/$newobj"
++	      oldobjs="$oldobjs $gentop/$newobj"
++	      ;;
++	    *) oldobjs="$oldobjs $obj" ;;
++	    esac
++	  done
++	fi
++
+ 	eval cmds=\"$old_archive_cmds\"
+ 
+ 	if len=`expr "X$cmds" : ".*"` &&
+ 	     test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
+-	  :
++	  cmds=$old_archive_cmds
+ 	else
+ 	  # the command line is too long to link in one step, link in parts
+ 	  $echo "using piecewise archive linking..."
+@@ -5066,31 +5520,18 @@
+ 	  objlist=
+ 	  concat_cmds=
+ 	  save_oldobjs=$oldobjs
+-	  # GNU ar 2.10+ was changed to match POSIX; thus no paths are
+-	  # encoded into archives.  This makes 'ar r' malfunction in
+-	  # this piecewise linking case whenever conflicting object
+-	  # names appear in distinct ar calls; check, warn and compensate.
+-	    if (for obj in $save_oldobjs
+-	    do
+-	      $echo "X$obj" | $Xsed -e 's%^.*/%%'
+-	    done | sort | sort -uc >/dev/null 2>&1); then
+-	    :
+-	  else
+-	    $echo "$modename: warning: object name conflicts; overriding AR_FLAGS to 'cq'" 1>&2
+-	    $echo "$modename: warning: to ensure that POSIX-compatible ar will work" 1>&2
+-	    AR_FLAGS=cq
+-	  fi
++
+ 	  # Is there a better way of finding the last object in the list?
+ 	  for obj in $save_oldobjs
+ 	  do
+ 	    last_oldobj=$obj
+-	  done  
++	  done
+ 	  for obj in $save_oldobjs
+ 	  do
+ 	    oldobjs="$objlist $obj"
+ 	    objlist="$objlist $obj"
+ 	    eval test_cmds=\"$old_archive_cmds\"
+-	    if len=`expr "X$test_cmds" : ".*"` &&
++	    if len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
+ 	       test "$len" -le "$max_cmd_len"; then
+ 	      :
+ 	    else
+@@ -5098,7 +5539,7 @@
+ 	      oldobjs=$objlist
+ 	      if test "$obj" = "$last_oldobj" ; then
+ 	        RANLIB=$save_RANLIB
+-	      fi  
++	      fi
+ 	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
+ 	      eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\"
+ 	      objlist=
+@@ -5109,12 +5550,13 @@
+ 	  if test "X$oldobjs" = "X" ; then
+ 	    eval cmds=\"\$concat_cmds\"
+ 	  else
+-	    eval cmds=\"\$concat_cmds~$old_archive_cmds\"
++	    eval cmds=\"\$concat_cmds~\$old_archive_cmds\"
+ 	  fi
+ 	fi
+       fi
+       save_ifs="$IFS"; IFS='~'
+       for cmd in $cmds; do
++        eval cmd=\"$cmd\"
+ 	IFS="$save_ifs"
+ 	$show "$cmd"
+ 	$run eval "$cmd" || exit $?
+@@ -5146,11 +5588,13 @@
+ 	fi
+       done
+       # Quote the link command for shipping.
+-      relink_command="(cd `pwd`; $SHELL $0 --mode=relink $libtool_args @inst_prefix_dir@)"
++      relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
+       relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
+       if test "$hardcode_automatic" = yes ; then
+-        relink_command=
+-      fi  
++	relink_command=
++      fi
++
++
+       # Only create the output if not a dry run.
+       if test -z "$run"; then
+ 	for installed in no yes; do
+@@ -5168,7 +5612,7 @@
+ 		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+ 		if test -z "$libdir"; then
+ 		  $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
+-		  exit 1
++		  exit $EXIT_FAILURE
+ 		fi
+ 		newdependency_libs="$newdependency_libs $libdir/$name"
+ 		;;
+@@ -5182,7 +5626,7 @@
+ 	      eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
+ 	      if test -z "$libdir"; then
+ 		$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
+-		exit 1
++		exit $EXIT_FAILURE
+ 	      fi
+ 	      newdlfiles="$newdlfiles $libdir/$name"
+ 	    done
+@@ -5193,11 +5637,30 @@
+ 	      eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
+ 	      if test -z "$libdir"; then
+ 		$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
+-		exit 1
++		exit $EXIT_FAILURE
+ 	      fi
+ 	      newdlprefiles="$newdlprefiles $libdir/$name"
+ 	    done
+ 	    dlprefiles="$newdlprefiles"
++	  else
++	    newdlfiles=
++	    for lib in $dlfiles; do
++	      case $lib in
++		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
++		*) abs=`pwd`"/$lib" ;;
++	      esac
++	      newdlfiles="$newdlfiles $abs"
++	    done
++	    dlfiles="$newdlfiles"
++	    newdlprefiles=
++	    for lib in $dlprefiles; do
++	      case $lib in
++		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
++		*) abs=`pwd`"/$lib" ;;
++	      esac
++	      newdlprefiles="$newdlprefiles $abs"
++	    done
++	    dlprefiles="$newdlprefiles"
+ 	  fi
+ 	  $rm $output
+ 	  # place dlname in correct position for cygwin
+@@ -5241,7 +5704,7 @@
+ 
+ # Directory that this library needs to be installed in:
+ libdir='$install_libdir'"
+-	  if test "$installed" = no && test "$need_relink" = yes && test "$fast_install" = no; then
++	  if test "$installed" = no && test "$need_relink" = yes; then
+ 	    $echo >> $output "\
+ relink_command=\"$relink_command\""
+ 	  fi
+@@ -5254,7 +5717,7 @@
+       $run eval '(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)' || exit $?
+       ;;
+     esac
+-    exit 0
++    exit $EXIT_SUCCESS
+     ;;
+ 
+   # libtool install mode
+@@ -5265,11 +5728,11 @@
+     # install_prog (especially on Windows NT).
+     if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
+        # Allow the use of GNU shtool's install command.
+-       $echo "X$nonopt" | $Xsed | grep shtool > /dev/null; then
++       $echo "X$nonopt" | grep shtool > /dev/null; then
+       # Aesthetically quote it.
+       arg=`$echo "X$nonopt" | $Xsed -e "$sed_quote_subst"`
+       case $arg in
+-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*)
++      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+ 	arg="\"$arg\""
+ 	;;
+       esac
+@@ -5278,14 +5741,14 @@
+       shift
+     else
+       install_prog=
+-      arg="$nonopt"
++      arg=$nonopt
+     fi
+ 
+     # The real first argument should be the name of the installation program.
+     # Aesthetically quote it.
+     arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
+     case $arg in
+-    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*)
++    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+       arg="\"$arg\""
+       ;;
+     esac
+@@ -5303,28 +5766,31 @@
+     do
+       if test -n "$dest"; then
+ 	files="$files $dest"
+-	dest="$arg"
++	dest=$arg
+ 	continue
+       fi
+ 
+       case $arg in
+       -d) isdir=yes ;;
+-      -f) prev="-f" ;;
+-      -g) prev="-g" ;;
+-      -m) prev="-m" ;;
+-      -o) prev="-o" ;;
++      -f) 
++      	case " $install_prog " in
++	*[\\\ /]cp\ *) ;;
++	*) prev=$arg ;;
++	esac
++	;;
++      -g | -m | -o) prev=$arg ;;
+       -s)
+ 	stripme=" -s"
+ 	continue
+ 	;;
+-      -*) ;;
+-
++      -*)
++	;;
+       *)
+ 	# If the previous option needed an argument, then skip it.
+ 	if test -n "$prev"; then
+ 	  prev=
+ 	else
+-	  dest="$arg"
++	  dest=$arg
+ 	  continue
+ 	fi
+ 	;;
+@@ -5333,7 +5799,7 @@
+       # Aesthetically quote the argument.
+       arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
+       case $arg in
+-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*)
++      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+ 	arg="\"$arg\""
+ 	;;
+       esac
+@@ -5343,13 +5809,13 @@
+     if test -z "$install_prog"; then
+       $echo "$modename: you must specify an install program" 1>&2
+       $echo "$help" 1>&2
+-      exit 1
++      exit $EXIT_FAILURE
+     fi
+ 
+     if test -n "$prev"; then
+       $echo "$modename: the \`$prev' option requires an argument" 1>&2
+       $echo "$help" 1>&2
+-      exit 1
++      exit $EXIT_FAILURE
+     fi
+ 
+     if test -z "$files"; then
+@@ -5359,7 +5825,7 @@
+ 	$echo "$modename: you must specify a destination" 1>&2
+       fi
+       $echo "$help" 1>&2
+-      exit 1
++      exit $EXIT_FAILURE
+     fi
+ 
+     # Strip any trailing slash from the destination.
+@@ -5380,7 +5846,7 @@
+       if test "$#" -gt 2; then
+ 	$echo "$modename: \`$dest' is not a directory" 1>&2
+ 	$echo "$help" 1>&2
+-	exit 1
++	exit $EXIT_FAILURE
+       fi
+     fi
+     case $destdir in
+@@ -5392,7 +5858,7 @@
+ 	*)
+ 	  $echo "$modename: \`$destdir' must be an absolute directory name" 1>&2
+ 	  $echo "$help" 1>&2
+-	  exit 1
++	  exit $EXIT_FAILURE
+ 	  ;;
+ 	esac
+       done
+@@ -5421,7 +5887,7 @@
+ 	else
+ 	  $echo "$modename: \`$file' is not a valid libtool archive" 1>&2
+ 	  $echo "$help" 1>&2
+-	  exit 1
++	  exit $EXIT_FAILURE
+ 	fi
+ 
+ 	library_names=
+@@ -5463,7 +5929,7 @@
+ 	  # but it's something to keep an eye on.
+ 	  if test "$inst_prefix_dir" = "$destdir"; then
+ 	    $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
+-	    exit 1
++	    exit $EXIT_FAILURE
+ 	  fi
+ 
+ 	  if test -n "$inst_prefix_dir"; then
+@@ -5478,7 +5944,7 @@
+ 	  if $run eval "$relink_command"; then :
+ 	  else
+ 	    $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
+-	    exit 1
++	    exit $EXIT_FAILURE
+ 	  fi
+ 	fi
+ 
+@@ -5502,23 +5968,36 @@
+ 
+ 	  if test "$#" -gt 0; then
+ 	    # Delete the old symlinks, and create new ones.
++	    # Try `ln -sf' first, because the `ln' binary might depend on
++	    # the symlink we replace!  Solaris /bin/ln does not understand -f,
++	    # so we also need to try rm && ln -s.
+ 	    for linkname
+ 	    do
+ 	      if test "$linkname" != "$realname"; then
+-		$show "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)"
+-		$run eval "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)"
++                $show "(cd $destdir && { $LN_S -f $realname $linkname || { $rm $linkname && $LN_S $realname $linkname; }; })"
++                $run eval "(cd $destdir && { $LN_S -f $realname $linkname || { $rm $linkname && $LN_S $realname $linkname; }; })"
+ 	      fi
+ 	    done
+ 	  fi
+ 
+ 	  # Do each command in the postinstall commands.
+ 	  lib="$destdir/$realname"
+-	  eval cmds=\"$postinstall_cmds\"
++	  cmds=$postinstall_cmds
+ 	  save_ifs="$IFS"; IFS='~'
+ 	  for cmd in $cmds; do
+ 	    IFS="$save_ifs"
++	    eval cmd=\"$cmd\"
+ 	    $show "$cmd"
+-	    $run eval "$cmd" || exit $?
++	    $run eval "$cmd" || {
++	      lt_exit=$?
++
++	      # Restore the uninstalled library and exit
++	      if test "$mode" = relink; then
++		$run eval '(cd $output_objdir && $rm ${realname}T && $mv ${realname}U $realname)'
++	      fi
++
++	      exit $lt_exit
++	    }
+ 	  done
+ 	  IFS="$save_ifs"
+ 	fi
+@@ -5556,7 +6035,7 @@
+ 	*)
+ 	  $echo "$modename: cannot copy a libtool object to \`$destfile'" 1>&2
+ 	  $echo "$help" 1>&2
+-	  exit 1
++	  exit $EXIT_FAILURE
+ 	  ;;
+ 	esac
+ 
+@@ -5574,7 +6053,7 @@
+ 	  $show "$install_prog $staticobj $staticdest"
+ 	  $run eval "$install_prog \$staticobj \$staticdest" || exit $?
+ 	fi
+-	exit 0
++	exit $EXIT_SUCCESS
+ 	;;
+ 
+       *)
+@@ -5612,23 +6091,21 @@
+ 	  notinst_deplibs=
+ 	  relink_command=
+ 
+-	  # To insure that "foo" is sourced, and not "foo.exe",
+-	  # finese the cygwin/MSYS system by explicitly sourcing "foo."
+-	  # which disallows the automatic-append-.exe behavior.
+-	  case $build in
+-	  *cygwin* | *mingw*) wrapperdot=${wrapper}. ;;
+-	  *) wrapperdot=${wrapper} ;;
+-	  esac
++	  # Note that it is not necessary on cygwin/mingw to append a dot to
++	  # foo even if both foo and FILE.exe exist: automatic-append-.exe
++	  # behavior happens only for exec(3), not for open(2)!  Also, sourcing
++	  # `FILE.' does not work on cygwin managed mounts.
++	  #
+ 	  # If there is no directory component, then add one.
+-	  case $file in
+-	  */* | *\\*) . ${wrapperdot} ;;
+-	  *) . ./${wrapperdot} ;;
++	  case $wrapper in
++	  */* | *\\*) . ${wrapper} ;;
++	  *) . ./${wrapper} ;;
+ 	  esac
+ 
+ 	  # Check the variables that should have been set.
+ 	  if test -z "$notinst_deplibs"; then
+ 	    $echo "$modename: invalid libtool wrapper script \`$wrapper'" 1>&2
+-	    exit 1
++	    exit $EXIT_FAILURE
+ 	  fi
+ 
+ 	  finalize=yes
+@@ -5650,30 +6127,21 @@
+ 	  done
+ 
+ 	  relink_command=
+-	  # To insure that "foo" is sourced, and not "foo.exe",
+-	  # finese the cygwin/MSYS system by explicitly sourcing "foo."
+-	  # which disallows the automatic-append-.exe behavior.
+-	  case $build in
+-	  *cygwin* | *mingw*) wrapperdot=${wrapper}. ;;
+-	  *) wrapperdot=${wrapper} ;;
+-	  esac
++	  # Note that it is not necessary on cygwin/mingw to append a dot to
++	  # foo even if both foo and FILE.exe exist: automatic-append-.exe
++	  # behavior happens only for exec(3), not for open(2)!  Also, sourcing
++	  # `FILE.' does not work on cygwin managed mounts.
++	  #
+ 	  # If there is no directory component, then add one.
+-	  case $file in
+-	  */* | *\\*) . ${wrapperdot} ;;
+-	  *) . ./${wrapperdot} ;;
++	  case $wrapper in
++	  */* | *\\*) . ${wrapper} ;;
++	  *) . ./${wrapper} ;;
+ 	  esac
+ 
+ 	  outputname=
+ 	  if test "$fast_install" = no && test -n "$relink_command"; then
+ 	    if test "$finalize" = yes && test -z "$run"; then
+-	      tmpdir="/tmp"
+-	      test -n "$TMPDIR" && tmpdir="$TMPDIR"
+-	      tmpdir="$tmpdir/libtool-$$"
+-	      if $mkdir "$tmpdir" && chmod 700 "$tmpdir"; then :
+-	      else
+-		$echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1>&2
+-		continue
+-	      fi
++	      tmpdir=`func_mktempdir`
+ 	      file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'`
+ 	      outputname="$tmpdir/$file"
+ 	      # Replace the output file specification.
+@@ -5697,7 +6165,7 @@
+ 	fi
+ 
+ 	# remove .exe since cygwin /usr/bin/install will append another
+-	# one anyways
++	# one anyway 
+ 	case $install_prog,$host in
+ 	*/usr/bin/install*,*cygwin*)
+ 	  case $file:$destfile in
+@@ -5729,16 +6197,17 @@
+       $show "$install_prog $file $oldlib"
+       $run eval "$install_prog \$file \$oldlib" || exit $?
+ 
+-      if test -n "$stripme" && test -n "$striplib"; then
++      if test -n "$stripme" && test -n "$old_striplib"; then
+ 	$show "$old_striplib $oldlib"
+ 	$run eval "$old_striplib $oldlib" || exit $?
+       fi
+ 
+       # Do each command in the postinstall commands.
+-      eval cmds=\"$old_postinstall_cmds\"
++      cmds=$old_postinstall_cmds
+       save_ifs="$IFS"; IFS='~'
+       for cmd in $cmds; do
+ 	IFS="$save_ifs"
++	eval cmd=\"$cmd\"
+ 	$show "$cmd"
+ 	$run eval "$cmd" || exit $?
+       done
+@@ -5752,9 +6221,9 @@
+     if test -n "$current_libdirs"; then
+       # Maybe just do a dry run.
+       test -n "$run" && current_libdirs=" -n$current_libdirs"
+-      exec_cmd='$SHELL $0 --finish$current_libdirs'
++      exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs'
+     else
+-      exit 0
++      exit $EXIT_SUCCESS
+     fi
+     ;;
+ 
+@@ -5773,10 +6242,11 @@
+       for libdir in $libdirs; do
+ 	if test -n "$finish_cmds"; then
+ 	  # Do each command in the finish commands.
+-	  eval cmds=\"$finish_cmds\"
++	  cmds=$finish_cmds
+ 	  save_ifs="$IFS"; IFS='~'
+ 	  for cmd in $cmds; do
+ 	    IFS="$save_ifs"
++	    eval cmd=\"$cmd\"
+ 	    $show "$cmd"
+ 	    $run eval "$cmd" || admincmds="$admincmds
+        $cmd"
+@@ -5793,9 +6263,9 @@
+     fi
+ 
+     # Exit here if they wanted silent mode.
+-    exit 0
++    test "$show" = : && exit $EXIT_SUCCESS
+ 
+-    $echo "----------------------------------------------------------------------"
++    $echo "X----------------------------------------------------------------------" | $Xsed
+     $echo "Libraries have been installed in:"
+     for libdir in $libdirs; do
+       $echo "   $libdir"
+@@ -5828,8 +6298,8 @@
+     $echo
+     $echo "See any operating system documentation about shared libraries for"
+     $echo "more information, such as the ld(1) and ld.so(8) manual pages."
+-    $echo "----------------------------------------------------------------------"
+-    exit 0
++    $echo "X----------------------------------------------------------------------" | $Xsed
++    exit $EXIT_SUCCESS
+     ;;
+ 
+   # libtool execute mode
+@@ -5841,7 +6311,7 @@
+     if test -z "$cmd"; then
+       $echo "$modename: you must specify a COMMAND" 1>&2
+       $echo "$help"
+-      exit 1
++      exit $EXIT_FAILURE
+     fi
+ 
+     # Handle -dlopen flags immediately.
+@@ -5849,7 +6319,7 @@
+       if test ! -f "$file"; then
+ 	$echo "$modename: \`$file' is not a file" 1>&2
+ 	$echo "$help" 1>&2
+-	exit 1
++	exit $EXIT_FAILURE
+       fi
+ 
+       dir=
+@@ -5860,7 +6330,7 @@
+ 	else
+ 	  $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
+ 	  $echo "$help" 1>&2
+-	  exit 1
++	  exit $EXIT_FAILURE
+ 	fi
+ 
+ 	# Read the libtool library.
+@@ -5887,7 +6357,7 @@
+ 	  dir="$dir/$objdir"
+ 	else
+ 	  $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
+-	  exit 1
++	  exit $EXIT_FAILURE
+ 	fi
+ 	;;
+ 
+@@ -5967,7 +6437,7 @@
+ 	$echo "export $shlibpath_var"
+       fi
+       $echo "$cmd$args"
+-      exit 0
++      exit $EXIT_SUCCESS
+     fi
+     ;;
+ 
+@@ -5995,7 +6465,7 @@
+     if test -z "$rm"; then
+       $echo "$modename: you must specify an RM program" 1>&2
+       $echo "$help" 1>&2
+-      exit 1
++      exit $EXIT_FAILURE
+     fi
+ 
+     rmdirs=
+@@ -6045,15 +6515,24 @@
+ 	    rmfiles="$rmfiles $objdir/$n"
+ 	  done
+ 	  test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library"
+-	  test "$mode" = clean && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
+ 
+-	  if test "$mode" = uninstall; then
++	  case "$mode" in
++	  clean)
++	    case "  $library_names " in
++	    # "  " in the beginning catches empty $dlname
++	    *" $dlname "*) ;;
++	    *) rmfiles="$rmfiles $objdir/$dlname" ;;
++	    esac
++	     test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
++	    ;;
++	  uninstall)
+ 	    if test -n "$library_names"; then
+ 	      # Do each command in the postuninstall commands.
+-	      eval cmds=\"$postuninstall_cmds\"
++	      cmds=$postuninstall_cmds
+ 	      save_ifs="$IFS"; IFS='~'
+ 	      for cmd in $cmds; do
+ 		IFS="$save_ifs"
++		eval cmd=\"$cmd\"
+ 		$show "$cmd"
+ 		$run eval "$cmd"
+ 		if test "$?" -ne 0 && test "$rmforce" != yes; then
+@@ -6065,10 +6544,11 @@
+ 
+ 	    if test -n "$old_library"; then
+ 	      # Do each command in the old_postuninstall commands.
+-	      eval cmds=\"$old_postuninstall_cmds\"
++	      cmds=$old_postuninstall_cmds
+ 	      save_ifs="$IFS"; IFS='~'
+ 	      for cmd in $cmds; do
+ 		IFS="$save_ifs"
++		eval cmd=\"$cmd\"
+ 		$show "$cmd"
+ 		$run eval "$cmd"
+ 		if test "$?" -ne 0 && test "$rmforce" != yes; then
+@@ -6078,7 +6558,8 @@
+ 	      IFS="$save_ifs"
+ 	    fi
+ 	    # FIXME: should reinstall the best remaining shared library.
+-	  fi
++	    ;;
++	  esac
+ 	fi
+ 	;;
+ 
+@@ -6107,7 +6588,7 @@
+ 	if test "$mode" = clean ; then
+ 	  noexename=$name
+ 	  case $file in
+-	  *.exe) 
++	  *.exe)
+ 	    file=`$echo $file|${SED} 's,.exe$,,'`
+ 	    noexename=`$echo $name|${SED} 's,.exe$,,'`
+ 	    # $file with .exe has already been added to rmfiles,
+@@ -6152,20 +6633,20 @@
+   "")
+     $echo "$modename: you must specify a MODE" 1>&2
+     $echo "$generic_help" 1>&2
+-    exit 1
++    exit $EXIT_FAILURE
+     ;;
+   esac
+ 
+   if test -z "$exec_cmd"; then
+     $echo "$modename: invalid operation mode \`$mode'" 1>&2
+     $echo "$generic_help" 1>&2
+-    exit 1
++    exit $EXIT_FAILURE
+   fi
+ fi # test -z "$show_help"
+ 
+ if test -n "$exec_cmd"; then
+   eval exec $exec_cmd
+-  exit 1
++  exit $EXIT_FAILURE
+ fi
+ 
+ # We need to display help for each of the modes.
+@@ -6201,7 +6682,7 @@
+ a more detailed description of MODE.
+ 
+ Report bugs to <bug-libtool@gnu.org>."
+-  exit 0
++  exit $EXIT_SUCCESS
+   ;;
+ 
+ clean)
+@@ -6313,6 +6794,8 @@
+   -no-undefined     declare that a library does not refer to external symbols
+   -o OUTPUT-FILE    create OUTPUT-FILE from the specified objects
+   -objectlist FILE  Use a list of object files found in FILE to specify objects
++  -precious-files-regex REGEX
++                    don't remove output files matching REGEX
+   -release RELEASE  specify package release information
+   -rpath LIBDIR     the created library will eventually be installed in LIBDIR
+   -R[ ]LIBDIR       add LIBDIR to the runtime path of programs and libraries
+@@ -6354,14 +6837,14 @@
+ *)
+   $echo "$modename: invalid operation mode \`$mode'" 1>&2
+   $echo "$help" 1>&2
+-  exit 1
++  exit $EXIT_FAILURE
+   ;;
+ esac
+ 
+ $echo
+ $echo "Try \`$modename --help' for more information about other modes."
+ 
+-exit 0
++exit $?
+ 
+ # The TAGs below are defined such that we never get into a situation
+ # in which we disable both kinds of libraries.  Given conflicting
+@@ -6375,12 +6858,11 @@
+ # configuration.  But we'll never go from static-only to shared-only.
+ 
+ # ### BEGIN LIBTOOL TAG CONFIG: disable-shared
+-build_libtool_libs=no
+-build_old_libs=yes
++disable_libs=shared
+ # ### END LIBTOOL TAG CONFIG: disable-shared
+ 
+ # ### BEGIN LIBTOOL TAG CONFIG: disable-static
+-build_old_libs=`case $build_libtool_libs in yes) $echo no;; *) $echo yes;; esac`
++disable_libs=static
+ # ### END LIBTOOL TAG CONFIG: disable-static
+ 
+ # Local Variables:
--- kdelibs-3.5.7.orig/debian/patches/common/04_am_maintainer_mode.diff
+++ kdelibs-3.5.7/debian/patches/common/04_am_maintainer_mode.diff
@@ -0,0 +1,11 @@
+--- a/admin/configure.in.min
++++ b/admin/configure.in.min
+@@ -38,6 +38,8 @@
+ dnl Automake doc recommends to do this only here. (Janos)
+ AM_INIT_AUTOMAKE(@MODULENAME@, @VERSION@) dnl searches for some needed programs
+ 
++AM_MAINTAINER_MODE
++
+ KDE_SET_PREFIX
+ 
+ dnl generate the config header
--- kdelibs-3.5.7.orig/debian/patches/common/05_pedantic-errors.diff
+++ kdelibs-3.5.7/debian/patches/common/05_pedantic-errors.diff
@@ -0,0 +1,12 @@
+--- a/admin/acinclude.m4.in
++++ b/admin/acinclude.m4.in
+@@ -2144,9 +2144,6 @@
+ save_CXXFLAGS="$CXXFLAGS"
+ kde_safe_LIBS="$LIBS"
+ LIBS="$LIBS $X_EXTRA_LIBS"
+-if test "$GXX" = "yes"; then
+-CXXFLAGS="$CXXFLAGS -pedantic-errors"
+-fi
+ AC_TRY_COMPILE([
+ $2
+ ],
--- kdelibs-3.5.7.orig/debian/patches/common/06_disable_no_undefined.diff
+++ kdelibs-3.5.7/debian/patches/common/06_disable_no_undefined.diff
@@ -0,0 +1,18 @@
+--- a/admin/acinclude.m4.in
++++ b/admin/acinclude.m4.in
+@@ -1689,15 +1689,6 @@
+        KDE_USE_CLOSURE_TRUE="#"
+        KDE_USE_CLOSURE_FALSE=""
+        KDE_NO_UNDEFINED=""
+-       case $host in 
+-         *-*-linux-gnu)
+-           KDE_CHECK_COMPILER_FLAG([Wl,--no-undefined],
+-                [KDE_CHECK_COMPILER_FLAG([Wl,--allow-shlib-undefined],
+-		[KDE_NO_UNDEFINED="-Wl,--no-undefined -Wl,--allow-shlib-undefined"],
+-		[KDE_NO_UNDEFINED=""])],
+-	    [KDE_NO_UNDEFINED=""])
+-           ;;
+-       esac
+   fi
+   AC_SUBST(KDE_USE_CLOSURE_TRUE)
+   AC_SUBST(KDE_USE_CLOSURE_FALSE)
--- kdelibs-3.5.7.orig/debian/patches/common/README
+++ kdelibs-3.5.7/debian/patches/common/README
@@ -0,0 +1,14 @@
+Common patches across KDE Debian packages
+=========================================
+
+  These directory should contain patches to the admin/ subdir of KDE
+  modules that are meant to be applied to all packaged modules. As the
+  admin/ subdir is shared across modules (and so, it's identical for all
+  modules at a certain version), I think it makes sense to have these
+  patches in a central location, and update them here.
+
+  The script update.sh takes care of automatically updating the patches
+  that update autotools and libtool. You need to pass the location of an
+  admin/ directory as the first argument.
+
+  -- Adeodato Simó, 2005-02-26
--- kdelibs-3.5.7.orig/debian/patches/common/update.sh
+++ kdelibs-3.5.7/debian/patches/common/update.sh
@@ -0,0 +1,47 @@
+#!/bin/sh
+
+ADMIN="$1"
+
+test -d "$ADMIN" || {
+    echo >&2 "Error, admin dir '$ADMIN' does not exist."
+    exit 1
+}
+
+rm -rf a b
+mkdir  a b
+
+cp -a "$ADMIN" a/admin
+
+############################################################
+PATCH=03_libtool_update.diff
+rm -rf b/admin; cp -a a/admin b
+
+cp -f /usr/share/libtool/libtool.m4 b/admin/libtool.m4.in
+cp -f /usr/share/libtool/ltmain.sh  b/admin/ltmain.sh
+
+diff -Nrua a b >$PATCH
+############################################################
+
+
+############################################################
+PATCH=02_autotools_update.diff
+AUTOMAKE_DIR=/usr/share/automake-1.9
+rm -rf b/admin; cp -a a/admin b
+
+( cd b/admin
+  for file in *; do
+      case "$file" in
+	  config.guess|config.sub)
+	      continue
+	      ;;
+      esac
+      if test -r "$AUTOMAKE_DIR/$file"; then
+	  cp -f "$AUTOMAKE_DIR/$file" "$file"
+      fi
+  done
+)
+
+diff -Nrua a b >$PATCH
+############################################################
+
+rm -rf a b
--- kdelibs-3.5.7.orig/debian/patches/common/02_autotools_update.diff
+++ kdelibs-3.5.7/debian/patches/common/02_autotools_update.diff
@@ -0,0 +1,355 @@
+diff -Nrua a/admin/install-sh b/admin/install-sh
+--- a/admin/install-sh	2006-03-17 16:38:42.000000000 -0500
++++ b/admin/install-sh	2006-03-24 19:22:40.000000000 -0500
+@@ -1,7 +1,7 @@
+ #!/bin/sh
+ # install - install a program, script, or datafile
+ 
+-scriptversion=2005-11-07.23
++scriptversion=2005-05-14.22
+ 
+ # This originates from X11R5 (mit/util/scripts/install.sh), which was
+ # later released in X11R6 (xc/config/util/install.sh) with the
+@@ -58,21 +58,7 @@
+ rmprog="${RMPROG-rm}"
+ mkdirprog="${MKDIRPROG-mkdir}"
+ 
+-posix_glob=
+-posix_mkdir=
+-
+-# Symbolic mode for testing mkdir with directories.
+-# It is the same as 755, but also tests that "u+" works.
+-test_mode=u=rwx,g=rx,o=rx,u+wx
+-
+-# Desired mode of installed file.
+-mode=0755
+-
+-# Desired mode of newly created intermediate directories.
+-# It is empty if not known yet.
+-intermediate_mode=
+-
+-chmodcmd=$chmodprog
++chmodcmd="$chmodprog 0755"
+ chowncmd=
+ chgrpcmd=
+ stripcmd=
+@@ -125,7 +111,7 @@
+ 
+     --help) echo "$usage"; exit $?;;
+ 
+-    -m) mode=$2
++    -m) chmodcmd="$chmodprog $2"
+         shift
+         shift
+         continue;;
+@@ -178,8 +164,6 @@
+   exit 0
+ fi
+ 
+-test -n "$dir_arg" || trap '(exit $?); exit' 1 2 13 15
+-
+ for src
+ do
+   # Protect names starting with `-'.
+@@ -189,11 +173,15 @@
+ 
+   if test -n "$dir_arg"; then
+     dst=$src
+-    dstdir=$dst
+-    test -d "$dstdir"
+-    dstdir_status=$?
+-  else
++    src=
+ 
++    if test -d "$dst"; then
++      mkdircmd=:
++      chmodcmd=
++    else
++      mkdircmd=$mkdirprog
++    fi
++  else
+     # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
+     # might cause directories to be created, which would be especially bad
+     # if $src (and thus $dsttmp) contains '*'.
+@@ -220,122 +208,53 @@
+ 	echo "$0: $dstarg: Is a directory" >&2
+ 	exit 1
+       fi
+-      dstdir=$dst
+-      dst=$dstdir/`basename "$src"`
+-      dstdir_status=0
+-    else
+-      # Prefer dirname, but fall back on a substitute if dirname fails.
+-      dstdir=`
+-	(dirname "$dst") 2>/dev/null ||
+-	expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+-	     X"$dst" : 'X\(//\)[^/]' \| \
+-	     X"$dst" : 'X\(//\)$' \| \
+-	     X"$dst" : 'X\(/\)' \| \
+-	     .       : '\(.\)' 2>/dev/null ||
+-	echo X"$dst" |
+-	    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+-		  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+-		  /^X\(\/\/\)$/{ s//\1/; q; }
+-		  /^X\(\/\).*/{ s//\1/; q; }
+-		  s/.*/./; q'
+-      `
+-
+-      test -d "$dstdir"
+-      dstdir_status=$?
++      dst=$dst/`basename "$src"`
+     fi
+   fi
+ 
+-  obsolete_mkdir_used=false
++  # This sed command emulates the dirname command.
++  dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'`
+ 
+-  if test $dstdir_status != 0; then
+-    case $posix_mkdir in
+-      '')
+-	posix_mkdir=false
+-	if $mkdirprog -m $test_mode -p -- / >/dev/null 2>&1; then
+-	  posix_mkdir=true
+-	else
+-	  # Remove any dirs left behind by ancient mkdir implementations.
+-	  rmdir ./-m "$test_mode" ./-p ./-- 2>/dev/null
+-	fi ;;
+-    esac
++  # Make sure that the destination directory exists.
+ 
+-    if
+-      $posix_mkdir && {
++  # Skip lots of stat calls in the usual case.
++  if test ! -d "$dstdir"; then
++    defaultIFS='
++	 '
++    IFS="${IFS-$defaultIFS}"
++
++    oIFS=$IFS
++    # Some sh's can't handle IFS=/ for some reason.
++    IFS='%'
++    set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
++    shift
++    IFS=$oIFS
+ 
+-	# With -d, create the new directory with the user-specified mode.
+-	# Otherwise, create it using the same intermediate mode that
+-	# mkdir -p would use when creating intermediate directories.
+-	# POSIX says that this mode is "$(umask -S),u+wx", so use that
+-	# if umask -S works.
+-
+-	if test -n "$dir_arg"; then
+-	  mkdir_mode=$mode
+-	else
+-	  case $intermediate_mode in
+-	    '')
+-	      if umask_S=`(umask -S) 2>/dev/null`; then
+-		intermediate_mode=$umask_S,u+wx
+-	      else
+-		intermediate_mode=$test_mode
+-	      fi ;;
+-	  esac
+-	  mkdir_mode=$intermediate_mode
+-	fi
+-
+-	$mkdirprog -m "$mkdir_mode" -p -- "$dstdir"
+-      }
+-    then :
+-    else
++    pathcomp=
+ 
+-      # mkdir does not conform to POSIX, or it failed possibly due to
+-      # a race condition.  Create the directory the slow way, step by
+-      # step, checking for races as we go.
+-
+-      case $dstdir in
+-	/*) pathcomp=/ ;;
+-	-*) pathcomp=./ ;;
+-	*)  pathcomp= ;;
+-      esac
+-
+-      case $posix_glob in
+-        '')
+-	  if (set -f) 2>/dev/null; then
+-	    posix_glob=true
+-	  else
+-	    posix_glob=false
+-	  fi ;;
+-      esac
+-
+-      oIFS=$IFS
+-      IFS=/
+-      $posix_glob && set -f
+-      set fnord $dstdir
++    while test $# -ne 0 ; do
++      pathcomp=$pathcomp$1
+       shift
+-      $posix_glob && set +f
+-      IFS=$oIFS
+-
+-      for d
+-      do
+-	test "x$d" = x && continue
+-
+-	pathcomp=$pathcomp$d
+-	if test ! -d "$pathcomp"; then
+-	  $mkdirprog "$pathcomp"
+-	  # Don't fail if two instances are running concurrently.
+-	  test -d "$pathcomp" || exit 1
+-	fi
+-	pathcomp=$pathcomp/
+-      done
+-      obsolete_mkdir_used=true
+-    fi
++      if test ! -d "$pathcomp"; then
++        $mkdirprog "$pathcomp"
++	# mkdir can fail with a `File exist' error in case several
++	# install-sh are creating the directory concurrently.  This
++	# is OK.
++	test -d "$pathcomp" || exit
++      fi
++      pathcomp=$pathcomp/
++    done
+   fi
+ 
+   if test -n "$dir_arg"; then
+-    { test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
+-    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
+-    { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
+-      test -z "$chmodcmd" || $doit $chmodcmd "$mode" "$dst"; } || exit 1
++    $doit $mkdircmd "$dst" \
++      && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \
++      && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \
++      && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \
++      && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; }
++
+   else
++    dstfile=`basename "$dst"`
+ 
+     # Make a couple of temp file names in the proper directory.
+     dsttmp=$dstdir/_inst.$$_
+@@ -343,6 +262,7 @@
+ 
+     # Trap to clean up those temp files at exit.
+     trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
++    trap '(exit $?); exit' 1 2 13 15
+ 
+     # Copy the file name to the temp name.
+     $doit $cpprog "$src" "$dsttmp" &&
+@@ -356,10 +276,10 @@
+     { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
+       && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
+       && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
+-      && { test -z "$chmodcmd" || $doit $chmodcmd "$mode" "$dsttmp"; } &&
++      && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } &&
+ 
+     # Now rename the file to the real destination.
+-    { $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null \
++    { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \
+       || {
+ 	   # The rename failed, perhaps because mv can't rename something else
+ 	   # to itself, or perhaps because mv is so ancient that it does not
+@@ -371,12 +291,11 @@
+ 	   # reasons.  In this case, the final cleanup might fail but the new
+ 	   # file should still install successfully.
+ 	   {
+-	     if test -f "$dst"; then
+-	       $doit $rmcmd -f "$dst" 2>/dev/null \
+-	       || { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null \
+-		     && { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }; }\
++	     if test -f "$dstdir/$dstfile"; then
++	       $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \
++	       || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \
+ 	       || {
+-		 echo "$0: cannot unlink or rename $dst" >&2
++		 echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
+ 		 (exit 1); exit 1
+ 	       }
+ 	     else
+@@ -385,14 +304,17 @@
+ 	   } &&
+ 
+ 	   # Now rename the file to the real destination.
+-	   $doit $mvcmd "$dsttmp" "$dst"
++	   $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
+ 	 }
+-    } || exit 1
+-
+-    trap '' 0
+-  fi
++    }
++  fi || { (exit 1); exit 1; }
+ done
+ 
++# The final little trick to "correctly" pass the exit status to the exit trap.
++{
++  (exit 0); exit 0
++}
++
+ # Local variables:
+ # eval: (add-hook 'write-file-hooks 'time-stamp)
+ # time-stamp-start: "scriptversion="
+diff -Nrua a/admin/missing b/admin/missing
+--- a/admin/missing	2006-03-17 16:38:41.000000000 -0500
++++ b/admin/missing	2006-03-24 19:22:40.000000000 -0500
+@@ -1,9 +1,9 @@
+ #! /bin/sh
+ # Common stub for a few missing GNU programs while installing.
+ 
+-scriptversion=2004-09-07.08
++scriptversion=2005-06-08.21
+ 
+-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004
++# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
+ #   Free Software Foundation, Inc.
+ # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
+ 
+@@ -19,8 +19,8 @@
+ 
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ 
+ # As a special exception to the GNU General Public License, if you
+ # distribute this file as part of a program that contains a
+@@ -87,12 +87,12 @@
+   yacc         create \`y.tab.[ch]', if possible, from existing .[ch]
+ 
+ Send bug reports to <bug-automake@gnu.org>."
+-    exit 0
++    exit $?
+     ;;
+ 
+   -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
+     echo "missing $scriptversion (GNU Automake)"
+-    exit 0
++    exit $?
+     ;;
+ 
+   -*)
+@@ -288,11 +288,18 @@
+          call might also be the consequence of using a buggy \`make' (AIX,
+          DU, IRIX).  You might want to install the \`Texinfo' package or
+          the \`GNU make' package.  Grab either from any GNU archive site."
++    # The file to touch is that specified with -o ...
+     file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+     if test -z "$file"; then
+-      file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
+-      file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file`
+-    fi
++      # ... or it is the one specified with @setfilename ...
++      infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
++      file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
++      # ... or it is derived from the source name (dir/f.texi becomes f.info)
++      test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
++    fi
++    # If the file does not exist, the user really needs makeinfo;
++    # let's fail without touching anything.
++    test -f $file || exit 1
+     touch $file
+     ;;
+ 
--- kdelibs-3.5.7.orig/debian/patches/common/kde.pot
+++ kdelibs-3.5.7/debian/patches/common/kde.pot
@@ -0,0 +1,1094 @@
+# SOME DESCRIPTIVE TITLE.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2005-11-25 22:02+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: ENCODING\n"
+
+#: common_texts.cpp:24
+msgid "Configure"
+msgstr ""
+
+#: common_texts.cpp:25
+msgid "&Configure"
+msgstr ""
+
+#: common_texts.cpp:26
+msgid "Configuration"
+msgstr ""
+
+#: common_texts.cpp:27
+msgid "Modify"
+msgstr ""
+
+#: common_texts.cpp:28
+msgid "&Modify"
+msgstr ""
+
+#: common_texts.cpp:29
+msgid "Align"
+msgstr ""
+
+#: common_texts.cpp:30
+msgid "Page"
+msgstr ""
+
+#: common_texts.cpp:31
+msgid "Border"
+msgstr ""
+
+#: common_texts.cpp:32
+msgid "Orientation"
+msgstr ""
+
+#: common_texts.cpp:33
+msgid "Width"
+msgstr ""
+
+#: common_texts.cpp:34
+msgid "&Width"
+msgstr ""
+
+#: common_texts.cpp:35
+msgid "Height"
+msgstr ""
+
+#: common_texts.cpp:36
+msgid "&Height"
+msgstr ""
+
+#: common_texts.cpp:37
+msgid "Spacing"
+msgstr ""
+
+#: common_texts.cpp:38
+msgid "Horizontal"
+msgstr ""
+
+#: common_texts.cpp:39
+msgid "Vertical"
+msgstr ""
+
+#: common_texts.cpp:40
+msgid "Right"
+msgstr ""
+
+#: common_texts.cpp:41
+msgid "Left"
+msgstr ""
+
+#: common_texts.cpp:42
+msgid "Center"
+msgstr ""
+
+#: common_texts.cpp:43
+msgid "Top"
+msgstr ""
+
+#: common_texts.cpp:44
+msgid "Bottom"
+msgstr ""
+
+#: common_texts.cpp:45
+msgid "&Bottom"
+msgstr ""
+
+#: common_texts.cpp:46
+msgid "Move"
+msgstr ""
+
+#: common_texts.cpp:47
+msgid "Select All"
+msgstr ""
+
+#: common_texts.cpp:48
+msgid "Delete All"
+msgstr ""
+
+#: common_texts.cpp:49
+msgid "Clear All"
+msgstr ""
+
+#: common_texts.cpp:50
+msgid "Export"
+msgstr ""
+
+#: common_texts.cpp:51
+msgid "Import"
+msgstr ""
+
+#: common_texts.cpp:52
+msgid "Zoom"
+msgstr ""
+
+#: common_texts.cpp:53
+msgid "&Zoom"
+msgstr ""
+
+#: common_texts.cpp:54
+msgid "Error"
+msgstr ""
+
+#: common_texts.cpp:55
+msgid "Malformed URL"
+msgstr ""
+
+#: common_texts.cpp:56
+msgid "Charset:"
+msgstr ""
+
+#: common_texts.cpp:57
+msgid "Yes"
+msgstr ""
+
+#: common_texts.cpp:58
+msgid "No"
+msgstr ""
+
+#: common_texts.cpp:59
+msgid "Warning"
+msgstr ""
+
+#: common_texts.cpp:60
+msgid "Save a file"
+msgstr ""
+
+#: common_texts.cpp:61
+msgid "Contents"
+msgstr ""
+
+#: common_texts.cpp:62
+msgid "About"
+msgstr ""
+
+#: common_texts.cpp:63 common_texts.cpp:176
+msgid "&About"
+msgstr ""
+
+#: common_texts.cpp:64
+msgid "A&bout"
+msgstr ""
+
+#: common_texts.cpp:65
+msgid "Untitled"
+msgstr ""
+
+#: common_texts.cpp:66
+msgid "OK"
+msgstr ""
+
+#: common_texts.cpp:67
+msgid "&OK"
+msgstr ""
+
+#: common_texts.cpp:68
+msgid "On"
+msgstr ""
+
+#: common_texts.cpp:69
+msgid "Off"
+msgstr ""
+
+#: common_texts.cpp:70
+msgid "Cancel"
+msgstr ""
+
+#: common_texts.cpp:71
+msgid "&Cancel"
+msgstr ""
+
+#: common_texts.cpp:72
+msgid "Apply"
+msgstr ""
+
+#: common_texts.cpp:73
+msgid "&Apply"
+msgstr ""
+
+#: common_texts.cpp:74
+msgid "File"
+msgstr ""
+
+#: common_texts.cpp:75
+msgid "&Discard"
+msgstr ""
+
+#: common_texts.cpp:76
+msgid "Discard"
+msgstr ""
+
+#: common_texts.cpp:77
+msgid "&File"
+msgstr ""
+
+#: common_texts.cpp:78
+msgid "Help"
+msgstr ""
+
+#: common_texts.cpp:79
+msgid "&Help"
+msgstr ""
+
+#: common_texts.cpp:80
+msgid "Edit"
+msgstr ""
+
+#: common_texts.cpp:81
+msgid "&Edit"
+msgstr ""
+
+#: common_texts.cpp:82
+msgid "&Options"
+msgstr ""
+
+#: common_texts.cpp:83
+msgid "View"
+msgstr ""
+
+#: common_texts.cpp:84
+msgid "&View"
+msgstr ""
+
+#: common_texts.cpp:85
+msgid "E&xit"
+msgstr ""
+
+#: common_texts.cpp:86
+msgid "Quit"
+msgstr ""
+
+#: common_texts.cpp:87
+msgid "&Quit"
+msgstr ""
+
+#: common_texts.cpp:88
+msgid "Reload"
+msgstr ""
+
+#: common_texts.cpp:89
+msgid "Back"
+msgstr ""
+
+#: common_texts.cpp:90
+msgid "Copy"
+msgstr ""
+
+#: common_texts.cpp:91
+msgid "&Copy"
+msgstr ""
+
+#: common_texts.cpp:92
+msgid "Paste"
+msgstr ""
+
+#: common_texts.cpp:93
+msgid "&Paste"
+msgstr ""
+
+#: common_texts.cpp:94
+msgid "&New Window..."
+msgstr ""
+
+#: common_texts.cpp:95
+msgid "New &Window..."
+msgstr ""
+
+#: common_texts.cpp:96
+msgid "&New Window"
+msgstr ""
+
+#: common_texts.cpp:97
+msgid "New Game"
+msgstr ""
+
+#: common_texts.cpp:98
+msgid "&New Game"
+msgstr ""
+
+#: common_texts.cpp:99
+msgid "Open"
+msgstr ""
+
+#: common_texts.cpp:100
+msgid "Open a File"
+msgstr ""
+
+#: common_texts.cpp:101
+msgid "Open..."
+msgstr ""
+
+#: common_texts.cpp:102
+msgid "&Open..."
+msgstr ""
+
+#: common_texts.cpp:103
+msgid "Cut"
+msgstr ""
+
+#: common_texts.cpp:104
+msgid "&Cut"
+msgstr ""
+
+#: common_texts.cpp:105
+msgid "C&ut"
+msgstr ""
+
+#: common_texts.cpp:106
+msgid "Font"
+msgstr ""
+
+#: common_texts.cpp:107
+msgid "&Foreground Color"
+msgstr ""
+
+#: common_texts.cpp:108
+msgid "&Background Color"
+msgstr ""
+
+#: common_texts.cpp:109
+msgid "Save"
+msgstr ""
+
+#: common_texts.cpp:110
+msgid "&Save"
+msgstr ""
+
+#: common_texts.cpp:111
+msgid "Save As"
+msgstr ""
+
+#: common_texts.cpp:112
+msgid "Save As..."
+msgstr ""
+
+#: common_texts.cpp:113
+msgid "S&ave As..."
+msgstr ""
+
+#: common_texts.cpp:114
+msgid "Close"
+msgstr ""
+
+#: common_texts.cpp:115
+msgid "&Close"
+msgstr ""
+
+#: common_texts.cpp:116
+msgid "&Print..."
+msgstr ""
+
+#: common_texts.cpp:117
+msgid "Sorry"
+msgstr ""
+
+#: common_texts.cpp:118
+msgid "Options"
+msgstr ""
+
+#: common_texts.cpp:119
+msgid "Remove"
+msgstr ""
+
+#: common_texts.cpp:120
+msgid "Add"
+msgstr ""
+
+#: common_texts.cpp:121
+msgid "Change"
+msgstr ""
+
+#: common_texts.cpp:122
+msgid "Delete"
+msgstr ""
+
+#: common_texts.cpp:123
+msgid "&Delete"
+msgstr ""
+
+#: common_texts.cpp:124
+msgid "Clear"
+msgstr ""
+
+#: common_texts.cpp:125
+msgid "Italic"
+msgstr ""
+
+#: common_texts.cpp:126
+msgid "Roman"
+msgstr ""
+
+#: common_texts.cpp:127
+msgid "Undo"
+msgstr ""
+
+#: common_texts.cpp:128
+msgid "&Undo"
+msgstr ""
+
+#: common_texts.cpp:129
+msgid "Redo"
+msgstr ""
+
+#: common_texts.cpp:130
+msgid "&Redo"
+msgstr ""
+
+#: common_texts.cpp:131
+msgid "&Game"
+msgstr ""
+
+#: common_texts.cpp:132
+msgid "Information"
+msgstr ""
+
+#: common_texts.cpp:133
+msgid "Portrait"
+msgstr ""
+
+#: common_texts.cpp:134
+msgid "Landscape"
+msgstr ""
+
+#: common_texts.cpp:135
+msgid "locally connected"
+msgstr ""
+
+#: common_texts.cpp:136
+msgid "Browse..."
+msgstr ""
+
+#: common_texts.cpp:137
+msgid "Stop"
+msgstr ""
+
+#: common_texts.cpp:138
+msgid "&Remove"
+msgstr ""
+
+#: common_texts.cpp:139
+msgid "&Properties..."
+msgstr ""
+
+#: common_texts.cpp:140
+msgid "Properties"
+msgstr ""
+
+#: common_texts.cpp:141
+msgid "&Start"
+msgstr ""
+
+#: common_texts.cpp:142
+msgid "St&op"
+msgstr ""
+
+#: common_texts.cpp:143
+msgid "Miscellaneous"
+msgstr ""
+
+#: common_texts.cpp:144
+msgid "Font Size"
+msgstr ""
+
+#: common_texts.cpp:145
+msgid "Fonts"
+msgstr ""
+
+#: common_texts.cpp:146
+msgid "&Fonts"
+msgstr ""
+
+#: common_texts.cpp:147
+msgid "&Reload"
+msgstr ""
+
+#: common_texts.cpp:148
+msgid "Files"
+msgstr ""
+
+#: common_texts.cpp:149
+msgid "Continue"
+msgstr ""
+
+#: common_texts.cpp:150
+msgid "Restore"
+msgstr ""
+
+#: common_texts.cpp:151
+msgid "Appearance"
+msgstr ""
+
+#: common_texts.cpp:152
+msgid "Print"
+msgstr ""
+
+#: common_texts.cpp:153
+msgid "Monday"
+msgstr ""
+
+#: common_texts.cpp:154
+msgid "Tuesday"
+msgstr ""
+
+#: common_texts.cpp:155
+msgid "Wednesday"
+msgstr ""
+
+#: common_texts.cpp:156
+msgid "Thursday"
+msgstr ""
+
+#: common_texts.cpp:157
+msgid "Friday"
+msgstr ""
+
+#: common_texts.cpp:158
+msgid "Saturday"
+msgstr ""
+
+#: common_texts.cpp:159
+msgid "Sunday"
+msgstr ""
+
+#: common_texts.cpp:160
+msgid "&Update"
+msgstr ""
+
+#: common_texts.cpp:163
+msgid "Highscore"
+msgstr ""
+
+#: common_texts.cpp:164
+msgid "&New View"
+msgstr ""
+
+#: common_texts.cpp:165
+msgid "&Insert"
+msgstr ""
+
+#: common_texts.cpp:168
+msgid ""
+"_: Opposite to Previous\n"
+"&Next"
+msgstr ""
+
+#: common_texts.cpp:169
+msgid "&Previous"
+msgstr ""
+
+#: common_texts.cpp:170
+msgid "Replace"
+msgstr ""
+
+#: common_texts.cpp:171
+msgid "&Replace..."
+msgstr ""
+
+#: common_texts.cpp:172
+msgid "Insert"
+msgstr ""
+
+#: common_texts.cpp:173
+msgid "Default"
+msgstr ""
+
+#: common_texts.cpp:174
+msgid "&Defaults"
+msgstr ""
+
+#: common_texts.cpp:175
+msgid "&Contents"
+msgstr ""
+
+#: common_texts.cpp:177
+msgid "Open Recent"
+msgstr ""
+
+#: common_texts.cpp:178
+msgid "Open &Recent"
+msgstr ""
+
+#: common_texts.cpp:179
+msgid "&Find..."
+msgstr ""
+
+#: common_texts.cpp:180
+msgid "Find &Next"
+msgstr ""
+
+#: common_texts.cpp:181
+msgid "Bookmarks"
+msgstr ""
+
+#: common_texts.cpp:182
+msgid "&Bookmarks"
+msgstr ""
+
+#: common_texts.cpp:183
+msgid "&Add Bookmark"
+msgstr ""
+
+#: common_texts.cpp:184
+msgid "&Edit Bookmarks..."
+msgstr ""
+
+#: common_texts.cpp:185
+msgid "&Tools"
+msgstr ""
+
+#: common_texts.cpp:186
+msgid "&Spelling..."
+msgstr ""
+
+#: common_texts.cpp:187
+msgid "Show &Menubar"
+msgstr ""
+
+#: common_texts.cpp:188
+msgid "Show &Toolbar"
+msgstr ""
+
+#: common_texts.cpp:189
+msgid "Show &Statusbar"
+msgstr ""
+
+#: common_texts.cpp:190
+msgid "Configure &Key Bindings..."
+msgstr ""
+
+#: common_texts.cpp:191
+msgid "&Preferences..."
+msgstr ""
+
+#: common_texts.cpp:192
+msgid "&Settings"
+msgstr ""
+
+#: common_texts.cpp:193
+msgid "Do not show this message again"
+msgstr ""
+
+#: common_texts.cpp:194
+msgid ""
+"_: QAccel\n"
+"Escape"
+msgstr ""
+
+#: common_texts.cpp:195
+msgid ""
+"_: QAccel\n"
+"Tab"
+msgstr ""
+
+#: common_texts.cpp:196
+msgid ""
+"_: QAccel\n"
+"Backtab"
+msgstr ""
+
+#: common_texts.cpp:197
+msgid ""
+"_: QAccel\n"
+"Backspace"
+msgstr ""
+
+#: common_texts.cpp:198
+msgid ""
+"_: QAccel\n"
+"Return"
+msgstr ""
+
+#: common_texts.cpp:199
+msgid ""
+"_: QAccel\n"
+"Enter"
+msgstr ""
+
+#: common_texts.cpp:200
+msgid ""
+"_: QAccel\n"
+"Insert"
+msgstr ""
+
+#: common_texts.cpp:201
+msgid ""
+"_: QAccel\n"
+"Delete"
+msgstr ""
+
+#: common_texts.cpp:202
+msgid ""
+"_: QAccel\n"
+"Pause"
+msgstr ""
+
+#: common_texts.cpp:203
+msgid ""
+"_: QAccel\n"
+"Print"
+msgstr ""
+
+#: common_texts.cpp:204
+msgid ""
+"_: QAccel\n"
+"SysReq"
+msgstr ""
+
+#: common_texts.cpp:205
+msgid ""
+"_: QAccel\n"
+"Home"
+msgstr ""
+
+#: common_texts.cpp:206
+msgid ""
+"_: QAccel\n"
+"End"
+msgstr ""
+
+#: common_texts.cpp:207
+msgid ""
+"_: QAccel\n"
+"Left"
+msgstr ""
+
+#: common_texts.cpp:208
+msgid ""
+"_: QAccel\n"
+"Up"
+msgstr ""
+
+#: common_texts.cpp:209
+msgid ""
+"_: QAccel\n"
+"Right"
+msgstr ""
+
+#: common_texts.cpp:210
+msgid ""
+"_: QAccel\n"
+"Down"
+msgstr ""
+
+#: common_texts.cpp:211
+msgid ""
+"_: QAccel\n"
+"Prior"
+msgstr ""
+
+#: common_texts.cpp:212
+msgid ""
+"_: QAccel\n"
+"Next"
+msgstr ""
+
+#: common_texts.cpp:213
+msgid ""
+"_: QAccel\n"
+"Shift"
+msgstr ""
+
+#: common_texts.cpp:214
+msgid ""
+"_: QAccel\n"
+"Control"
+msgstr ""
+
+#: common_texts.cpp:215
+msgid ""
+"_: QAccel\n"
+"Meta"
+msgstr ""
+
+#: common_texts.cpp:216
+msgid ""
+"_: QAccel\n"
+"Alt"
+msgstr ""
+
+#: common_texts.cpp:217
+msgid ""
+"_: QAccel\n"
+"CapsLock"
+msgstr ""
+
+#: common_texts.cpp:218
+msgid ""
+"_: QAccel\n"
+"NumLock"
+msgstr ""
+
+#: common_texts.cpp:219
+msgid ""
+"_: QAccel\n"
+"ScrollLock"
+msgstr ""
+
+#: common_texts.cpp:220
+msgid ""
+"_: QAccel\n"
+"Space"
+msgstr ""
+
+#: common_texts.cpp:221
+msgid ""
+"_: QAccel\n"
+"ParenLeft"
+msgstr ""
+
+#: common_texts.cpp:222
+msgid ""
+"_: QAccel\n"
+"ParenRight"
+msgstr ""
+
+#: common_texts.cpp:223
+msgid ""
+"_: QAccel\n"
+"Asterisk"
+msgstr ""
+
+#: common_texts.cpp:224
+msgid ""
+"_: QAccel\n"
+"Plus"
+msgstr ""
+
+#: common_texts.cpp:225
+msgid ""
+"_: QAccel\n"
+"Comma"
+msgstr ""
+
+#: common_texts.cpp:226
+msgid ""
+"_: QAccel\n"
+"Minus"
+msgstr ""
+
+#: common_texts.cpp:227
+msgid ""
+"_: QAccel\n"
+"Period"
+msgstr ""
+
+#: common_texts.cpp:228
+msgid ""
+"_: QAccel\n"
+"Slash"
+msgstr ""
+
+#: common_texts.cpp:229
+msgid ""
+"_: QAccel\n"
+"Colon"
+msgstr ""
+
+#: common_texts.cpp:230
+msgid ""
+"_: QAccel\n"
+"Semicolon"
+msgstr ""
+
+#: common_texts.cpp:231
+msgid ""
+"_: QAccel\n"
+"Less"
+msgstr ""
+
+#: common_texts.cpp:232
+msgid ""
+"_: QAccel\n"
+"Equal"
+msgstr ""
+
+#: common_texts.cpp:233
+msgid ""
+"_: QAccel\n"
+"Greater"
+msgstr ""
+
+#: common_texts.cpp:234
+msgid ""
+"_: QAccel\n"
+"Question"
+msgstr ""
+
+#: common_texts.cpp:235
+msgid ""
+"_: QAccel\n"
+"BracketLeft"
+msgstr ""
+
+#: common_texts.cpp:236
+msgid ""
+"_: QAccel\n"
+"Backslash"
+msgstr ""
+
+#: common_texts.cpp:237
+msgid ""
+"_: QAccel\n"
+"BracketRight"
+msgstr ""
+
+#: common_texts.cpp:238
+msgid ""
+"_: QAccel\n"
+"AsciiCircum"
+msgstr ""
+
+#: common_texts.cpp:239
+msgid ""
+"_: QAccel\n"
+"Underscore"
+msgstr ""
+
+#: common_texts.cpp:240
+msgid ""
+"_: QAccel\n"
+"QuoteLeft"
+msgstr ""
+
+#: common_texts.cpp:241
+msgid ""
+"_: QAccel\n"
+"BraceLeft"
+msgstr ""
+
+#: common_texts.cpp:242
+msgid ""
+"_: QAccel\n"
+"BraceRight"
+msgstr ""
+
+#: common_texts.cpp:243
+msgid ""
+"_: QAccel\n"
+"AsciiTilde"
+msgstr ""
+
+#: common_texts.cpp:244
+msgid ""
+"_: QAccel\n"
+"PgUp"
+msgstr ""
+
+#: common_texts.cpp:245
+msgid ""
+"_: QAccel\n"
+"PgDown"
+msgstr ""
+
+#: common_texts.cpp:246
+msgid ""
+"_: QAccel\n"
+"Apostrophe"
+msgstr ""
+
+#: common_texts.cpp:247
+msgid ""
+"_: QAccel\n"
+"Ampersand"
+msgstr ""
+
+#: common_texts.cpp:248
+msgid ""
+"_: QAccel\n"
+"Exclam"
+msgstr ""
+
+#: common_texts.cpp:249
+msgid ""
+"_: QAccel\n"
+"Dollar"
+msgstr ""
+
+#: common_texts.cpp:250
+msgid ""
+"_: QAccel\n"
+"Percent"
+msgstr ""
+
+#: common_texts.cpp:251
+msgid ""
+"_: QAccel\n"
+"Menu"
+msgstr ""
+
+#: common_texts.cpp:252
+msgid ""
+"_: QAccel\n"
+"Help"
+msgstr ""
+
+#: common_texts.cpp:253
+msgid ""
+"_: QAccel\n"
+"NumberSign"
+msgstr ""
+
+#: common_texts.cpp:254
+msgid "Main Toolbar"
+msgstr ""
+
+#: common_texts.cpp:257 common_texts.cpp:261
+msgid ""
+"_: font style\n"
+"Demi-bold"
+msgstr ""
+
+#: common_texts.cpp:258
+msgid ""
+"_: font style\n"
+"Light"
+msgstr ""
+
+#: common_texts.cpp:259
+msgid ""
+"_: font style\n"
+"Light Italic"
+msgstr ""
+
+#: common_texts.cpp:260 common_texts.cpp:262
+msgid ""
+"_: font style\n"
+"Demi-bold Italic"
+msgstr ""
+
+#: common_texts.cpp:263
+msgid ""
+"_: font style\n"
+"Oblique"
+msgstr ""
+
+#: common_texts.cpp:264
+msgid ""
+"_: font style\n"
+"Book"
+msgstr ""
+
+#: common_texts.cpp:265
+msgid ""
+"_: font style\n"
+"Book Oblique"
+msgstr ""
+
+#: common_texts.cpp:268
+msgid ""
+"_: window operation\n"
+"Sticky"
+msgstr ""
+
+#: common_texts.cpp:269
+msgid ""
+"_: window operation\n"
+"Un-Sticky"
+msgstr ""
--- kdelibs-3.5.7.orig/debian/patches/common/kubuntu_01_kdepot.diff
+++ kdelibs-3.5.7/debian/patches/common/kubuntu_01_kdepot.diff
@@ -0,0 +1,26 @@
+--- kde/admin/cvs.sh	2005-11-19 09:19:55.000000000 +0000
++++ kde/admin/cvs.sh	2005-11-25 22:08:37.000000000 +0000
+@@ -537,6 +537,8 @@
+ if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi
+ export EXTRACTRC PREPARETIPS
+ 
++kdepotpath=`pwd`/debian/patches/common/kde.pot
++
+ for subdir in $dirs; do
+   test -z "$VERBOSE" || echo "Making messages in $subdir"
+   (cd $subdir
+@@ -554,10 +556,10 @@
+    fi
+    perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile
+ 
+-   kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot
+-   if ! test -f $kdepotpath; then
+-	kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot
+-   fi
++#   kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot
++#   if ! test -f $kdepotpath; then
++#	kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot
++#   fi
+ 
+    $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \
+ 	XGETTEXT="${XGETTEXT:-xgettext} --foreign-user -C -ci18n -ki18n -ktr2i18n -kI18N_NOOP -kI18N_NOOP2 -kaliasLocale -x $kdepotpath" messages
--- kdelibs-3.5.7.orig/debian/patches/kubuntu_52_xinerama.diff
+++ kdelibs-3.5.7/debian/patches/kubuntu_52_xinerama.diff
@@ -0,0 +1,539 @@
+diff -u -p -N -r kdelibs.sav/kdecore/kstartupinfo.cpp kdelibs/kdecore/kstartupinfo.cpp
+--- kdelibs.sav/kdecore/kstartupinfo.cpp	2006-08-23 17:19:58.000000000 +0200
++++ kdelibs/kdecore/kstartupinfo.cpp	2006-09-01 13:26:45.000000000 +0200
+@@ -1105,7 +1105,7 @@ unsigned long KStartupInfoId::timestamp(
+ struct KStartupInfoDataPrivate
+     {
+     KStartupInfoDataPrivate() : desktop( 0 ), wmclass( "" ), hostname( "" ),
+-	silent( KStartupInfoData::Unknown ), timestamp( -1U ), screen( -1 ) {};
++	silent( KStartupInfoData::Unknown ), timestamp( -1U ), screen( -1 ), xinerama( -1 ), launched_by( 0 ) {};
+     QString bin;
+     QString name;
+     QString description;
+@@ -1117,6 +1117,8 @@ struct KStartupInfoDataPrivate
+     KStartupInfoData::TriState silent;
+     unsigned long timestamp;
+     int screen;
++    int xinerama;
++    WId launched_by;
+     };
+ 
+ QString KStartupInfoData::to_text() const
+@@ -1147,6 +1149,10 @@ QString KStartupInfoData::to_text() cons
+         ret += QString::fromLatin1( " TIMESTAMP=%1" ).arg( d->timestamp );
+     if( d->screen != -1 )
+         ret += QString::fromLatin1( " SCREEN=%1" ).arg( d->screen );
++    if( d->xinerama != -1 )
++        ret += QString::fromLatin1( " XINERAMA=%1" ).arg( d->xinerama );
++    if( d->launched_by != 0 )
++        ret += QString::fromLatin1( " LAUNCHED_BY=%1" ).arg( d->launched_by );
+     return ret;
+     }
+ 
+@@ -1165,6 +1171,8 @@ KStartupInfoData::KStartupInfoData( cons
+     const QString silent_str = QString::fromLatin1( "SILENT=" );
+     const QString timestamp_str = QString::fromLatin1( "TIMESTAMP=" );
+     const QString screen_str = QString::fromLatin1( "SCREEN=" );
++    const QString xinerama_str = QString::fromLatin1( "XINERAMA=" );
++    const QString launched_by_str = QString::fromLatin1( "LAUNCHED_BY=" );
+     for( QStringList::Iterator it = items.begin();
+          it != items.end();
+          ++it )
+@@ -1195,6 +1203,10 @@ KStartupInfoData::KStartupInfoData( cons
+             d->timestamp = get_unum( *it );
+         else if( ( *it ).startsWith( screen_str ))
+             d->screen = get_num( *it );
++        else if( ( *it ).startsWith( xinerama_str ))
++            d->xinerama = get_num( *it );
++        else if( ( *it ).startsWith( launched_by_str ))
++            d->launched_by = get_num( *it );
+         }
+     }
+ 
+@@ -1238,6 +1250,10 @@ void KStartupInfoData::update( const KSt
+         d->timestamp = data_P.timestamp();
+     if( data_P.screen() != -1 )
+         d->screen = data_P.screen();
++    if( data_P.xinerama() != -1 && xinerama() != -1 ) // don't overwrite
++        d->xinerama = data_P.xinerama();
++    if( data_P.launchedBy() != 0 && launchedBy() != 0 ) // don't overwrite
++        d->launched_by = data_P.launchedBy();
+     }
+ 
+ KStartupInfoData::KStartupInfoData()
+@@ -1408,6 +1424,26 @@ int KStartupInfoData::screen() const
+     return d->screen;
+     }
+ 
++void KStartupInfoData::setXinerama( int xinerama )
++    {
++    d->xinerama = xinerama;
++    }
++
++int KStartupInfoData::xinerama() const
++    {
++    return d->xinerama;
++    }
++
++void KStartupInfoData::setLaunchedBy( WId window )
++    {
++    d->launched_by = window;
++    }
++
++WId KStartupInfoData::launchedBy() const
++    {
++    return d->launched_by;
++    }
++
+ static
+ long get_num( const QString& item_P )
+     {
+diff -u -p -N -r kdelibs.sav/kdecore/kstartupinfo.h kdelibs/kdecore/kstartupinfo.h
+--- kdelibs.sav/kdecore/kstartupinfo.h	2005-05-04 13:02:22.000000000 +0200
++++ kdelibs/kdecore/kstartupinfo.h	2006-09-01 13:26:45.000000000 +0200
+@@ -635,6 +635,30 @@ class KDECORE_EXPORT KStartupInfoData
+          * This is usually not necessary to set, as it's set by default to qt_xscreen().
+          */
+         void setScreen( int screen );
++        
++        /**
++         * The Xinerama screen for the startup notification, -1 if unknown.
++         */
++        int xinerama() const;
++
++        /**        
++	 * Sets the Xinerama screen for the startup notification ( i.e. the screeen on which
++	 * the starting application should appear ).
++	 * @param xinerama the Xinerama screen for the startup notification
++         */
++        void setXinerama( int xinerama );
++
++        /**
++         * The toplevel window of the application that caused this startup notification,
++         * 0 if unknown.
++         */
++        WId launchedBy() const;
++        
++        /**
++	 * Sets the toplevel window of the application that caused this startup notification.
++	 * @param window window ID of the toplevel window that is responsible for this startup
++         */
++        void setLaunchedBy( WId window );
+ 
+ 	/**
+ 	 * Updates the notification data from the given data. Some data, such as the desktop
+diff -u -p -N -r kdelibs.sav/kdecore/netwm.cpp kdelibs/kdecore/netwm.cpp
+--- kdelibs.sav/kdecore/netwm.cpp	2006-08-25 16:10:16.000000000 +0200
++++ kdelibs/kdecore/netwm.cpp	2006-09-01 13:26:14.000000000 +0200
+@@ -138,6 +138,9 @@ static Atom net_wm_state_stays_on_top = 
+ // used to determine whether application window is managed or not
+ static Atom xa_wm_state = 0;
+ 
++// ability flags
++static Atom net_wm_full_placement = 0;
++
+ static Bool netwm_atoms_created      = False;
+ const unsigned long netwm_sendevent_mask = (SubstructureRedirectMask|
+ 					     SubstructureNotifyMask);
+@@ -229,7 +232,7 @@ static int wcmp(const void *a, const voi
+ }
+ 
+ 
+-static const int netAtomCount = 83;
++static const int netAtomCount = 84;
+ static void create_atoms(Display *d) {
+     static const char * const names[netAtomCount] =
+     {
+@@ -316,7 +319,9 @@ static void create_atoms(Display *d) {
+             "_KDE_NET_WM_TEMPORARY_RULES",
+ 
+ 	    "WM_STATE",
+-	    "WM_PROTOCOLS"
++	    "WM_PROTOCOLS",
++            
++            "_NET_WM_FULL_PLACEMENT"
+ 	    };
+ 
+     Atom atoms[netAtomCount], *atomsp[netAtomCount] =
+@@ -404,7 +409,9 @@ static void create_atoms(Display *d) {
+             &kde_net_wm_temporary_rules,
+ 
+ 	    &xa_wm_state,
+-	    &wm_protocols
++	    &wm_protocols,
++            
++            &net_wm_full_placement
+ 	    };
+ 
+     assert( !netwm_atoms_created );
+@@ -1309,6 +1316,8 @@ void NETRootInfo::setSupported() {
+ 
+     if (p->properties[ PROTOCOLS2 ] & WM2KDETemporaryRules)
+ 	atoms[pnum++] = kde_net_wm_temporary_rules;
++    if (p->properties[ PROTOCOLS2 ] & WM2FullPlacement)
++	atoms[pnum++] = net_wm_full_placement;
+ 
+     XChangeProperty(p->display, p->root, net_supported, XA_ATOM, 32,
+ 		    PropModeReplace, (unsigned char *) atoms, pnum);
+@@ -1526,6 +1535,8 @@ void NETRootInfo::updateSupportedPropert
+ 
+     else if( atom == kde_net_wm_temporary_rules )
+         p->properties[ PROTOCOLS2 ] |= WM2KDETemporaryRules;
++    else if( atom == net_wm_full_placement )
++        p->properties[ PROTOCOLS2 ] |= WM2FullPlacement;
+ }
+ 
+ extern Time qt_x_user_time;
+diff -u -p -N -r kdelibs.sav/kdecore/netwm_def.h kdelibs/kdecore/netwm_def.h
+--- kdelibs.sav/kdecore/netwm_def.h	2006-08-01 17:35:25.000000000 +0200
++++ kdelibs/kdecore/netwm_def.h	2006-09-01 13:26:14.000000000 +0200
+@@ -581,7 +581,8 @@ public:
+         WM2WindowClass         = 1<<10, ///< @since 3.3
+         WM2WindowRole          = 1<<11, ///< @since 3.3
+         WM2ClientMachine       = 1<<12, ///< @since 3.3
+-        WM2ShowingDesktop      = 1<<13  ///< @since 3.5
++        WM2ShowingDesktop      = 1<<13, ///< @since 3.5
++        WM2FullPlacement       = 1<<14
+     };
+ 
+     /**
+diff -u -p -N -r kdelibs.sav/kio/kio/krun.cpp kdelibs/kio/kio/krun.cpp
+--- kdelibs.sav/kio/kio/krun.cpp	2006-08-23 17:19:56.000000000 +0200
++++ kdelibs/kio/kio/krun.cpp	2006-09-01 13:26:54.000000000 +0200
+@@ -77,6 +77,7 @@ public:
+     QString m_localPath;
+     QString m_suggestedFileName;
+     QGuardedPtr <QWidget> m_window;
++    QCString m_asn;
+ };
+ 
+ pid_t KRun::runURL( const KURL& u, const QString& _mimetype )
+@@ -109,14 +110,20 @@ bool KRun::isExecutableFile( const KURL&
+   return false;
+ }
+ 
+-// This is called by foundMimeType, since it knows the mimetype of the URL
+ pid_t KRun::runURL( const KURL& u, const QString& _mimetype, bool tempFile, bool runExecutables, const QString& suggestedFileName )
+ {
++    return runURL( u, _mimetype, NULL, "", tempFile, runExecutables, suggestedFileName );
++}
++
++// This is called by foundMimeType, since it knows the mimetype of the URL
++pid_t KRun::runURL( const KURL& u, const QString& _mimetype, QWidget* window, const QCString& asn,
++    bool tempFile, bool runExecutables, const QString& suggestedFileName )
++{
+   bool noRun = false;
+   bool noAuth = false;
+   if ( _mimetype == "inode/directory-locked" )
+   {
+-    KMessageBoxWrapper::error( 0L,
++    KMessageBoxWrapper::error( window,
+             i18n("<qt>Unable to enter <b>%1</b>.\nYou do not have access rights to this location.</qt>").arg(u.htmlURL()) );
+     return 0;
+   }
+@@ -133,7 +140,7 @@ pid_t KRun::runURL( const KURL& u, const
+       {
+         QString path = u.path();
+         shellQuote( path );
+-        return (KRun::runCommand(path)); // just execute the url as a command
++        return (KRun::runCommand(path, QString::null, QString::null, window, asn)); // just execute the url as a command
+         // ## TODO implement deleting the file if tempFile==true
+       }
+       else
+@@ -155,14 +162,14 @@ pid_t KRun::runURL( const KURL& u, const
+ 
+   if ( noRun )
+   {
+-    KMessageBox::sorry( 0L,
++    KMessageBox::sorry( window,
+         i18n("<qt>The file <b>%1</b> is an executable program. "
+              "For safety it will not be started.</qt>").arg(u.htmlURL()));
+     return 0;
+   }
+   if ( noAuth )
+   {
+-    KMessageBoxWrapper::error( 0L,
++    KMessageBoxWrapper::error( window,
+         i18n("<qt>You do not have permission to run <b>%1</b>.</qt>").arg(u.htmlURL()) );
+     return 0;
+   }
+@@ -182,7 +189,7 @@ pid_t KRun::runURL( const KURL& u, const
+     return displayOpenWithDialog( lst, tempFile, suggestedFileName );
+   }
+ 
+-  return KRun::run( *offer, lst, 0 /*window*/, tempFile, suggestedFileName );
++  return KRun::run( *offer, lst, window, asn, tempFile, suggestedFileName );
+ }
+ 
+ bool KRun::displayOpenWithDialog( const KURL::List& lst )
+@@ -536,13 +543,13 @@ QString KRun::binaryName( const QString 
+ }
+ 
+ static pid_t runCommandInternal( KProcess* proc, const KService* service, const QString& binName,
+-    const QString &execName, const QString & iconName )
++    const QString &execName, const QString & iconName, QWidget* window, QCString asn )
+ {
+   if (service && !service->desktopEntryPath().isEmpty()
+       && !KDesktopFile::isAuthorizedDesktopFile( service->desktopEntryPath() ))
+   {
+      kdWarning() << "No authorization to execute " << service->desktopEntryPath() << endl;
+-     KMessageBox::sorry(0, i18n("You are not authorized to execute this file."));
++     KMessageBox::sorry(window, i18n("You are not authorized to execute this file."));
+      return 0;
+   }
+   QString bin = KRun::binaryName( binName, true );
+@@ -550,10 +557,10 @@ static pid_t runCommandInternal( KProces
+   bool silent;
+   QCString wmclass;
+   KStartupInfoId id;
+-  bool startup_notify = KRun::checkStartupNotify( binName, service, &silent, &wmclass );
++  bool startup_notify = ( asn != "0" && KRun::checkStartupNotify( binName, service, &silent, &wmclass ));
+   if( startup_notify )
+   {
+-      id.initId();
++      id.initId( asn );
+       id.setupStartupEnv();
+       KStartupInfoData data;
+       data.setHostname();
+@@ -572,6 +579,8 @@ static pid_t runCommandInternal( KProces
+       if( silent )
+           data.setSilent( KStartupInfoData::Yes );
+       data.setDesktop( KWin::currentDesktop());
++      if( window )
++          data.setLaunchedBy( window->winId());
+       KStartupInfo::sendStartup( id, data );
+   }
+   pid_t pid = KProcessRunner::run( proc, binName, id );
+@@ -629,7 +638,8 @@ bool KRun::checkStartupNotify( const QSt
+   return true;
+ }
+ 
+-static pid_t runTempService( const KService& _service, const KURL::List& _urls, bool tempFiles, const QString& suggestedFileName )
++static pid_t runTempService( const KService& _service, const KURL::List& _urls, QWidget* window,
++    const QCString& asn, bool tempFiles, const QString& suggestedFileName )
+ {
+   if (!_urls.isEmpty()) {
+     kdDebug(7010) << "runTempService: first url " << _urls.first().url() << endl;
+@@ -648,7 +658,7 @@ static pid_t runTempService( const KServ
+       {
+          KURL::List singleUrl;
+          singleUrl.append(*it);
+-         runTempService( _service, singleUrl, tempFiles, suggestedFileName );
++         runTempService( _service, singleUrl, window, "", tempFiles, suggestedFileName );
+       }
+       KURL::List singleUrl;
+       singleUrl.append(_urls.first());
+@@ -667,7 +677,7 @@ static pid_t runTempService( const KServ
+      proc->setWorkingDirectory(_service.path());
+ 
+   return runCommandInternal( proc, &_service, KRun::binaryName( _service.exec(), false ),
+-                             _service.name(), _service.icon() );
++                             _service.name(), _service.icon(), window, asn );
+ }
+ 
+ // WARNING: don't call this from processDesktopExec, since klauncher uses that too...
+@@ -728,11 +738,22 @@ pid_t KRun::run( const KService& _servic
+ 
+ pid_t KRun::run( const KService& _service, const KURL::List& _urls, QWidget* window, bool tempFiles )
+ {
+-    return run( _service, _urls, window, tempFiles, QString::null );
++    return run( _service, _urls, window, "", tempFiles, QString::null );
++}
++
++pid_t KRun::run( const KService& _service, const KURL::List& _urls, QWidget* window, const QCString& asn, bool tempFiles )
++{
++    return run( _service, _urls, window, asn, tempFiles, QString::null );
+ }
+ 
+ pid_t KRun::run( const KService& _service, const KURL::List& _urls, QWidget* window, bool tempFiles, const QString& suggestedFileName )
+ {
++    return run( _service, _urls, window, "", tempFiles, suggestedFileName );
++}
++
++pid_t KRun::run( const KService& _service, const KURL::List& _urls, QWidget* window, const QCString& asn,
++    bool tempFiles, const QString& suggestedFileName )
++{
+   if (!_service.desktopEntryPath().isEmpty() &&
+       !KDesktopFile::isAuthorizedDesktopFile( _service.desktopEntryPath()))
+   {
+@@ -753,7 +774,7 @@ pid_t KRun::run( const KService& _servic
+ 
+   if ( tempFiles || _service.desktopEntryPath().isEmpty() || !suggestedFileName.isEmpty() )
+   {
+-     return runTempService(_service, _urls, tempFiles, suggestedFileName);
++     return runTempService(_service, _urls, window, asn, tempFiles, suggestedFileName);
+   }
+ 
+   kdDebug(7010) << "KRun::run " << _service.desktopEntryPath() << endl;
+@@ -767,9 +788,25 @@ pid_t KRun::run( const KService& _servic
+ 
+   QString error;
+   int pid = 0;
+-
++  
++  QCString myasn = asn;
++  // startServiceByDesktopPath() doesn't take QWidget*, add it to the startup info now
++  if( window != NULL )
++  {
++    if( myasn.isEmpty())
++        myasn = KStartupInfo::createNewStartupId();
++    if( myasn != "0" )
++    {
++        KStartupInfoId id;
++        id.initId( myasn );
++        KStartupInfoData data;
++        data.setLaunchedBy( window->winId());
++        KStartupInfo::sendChange( id, data );
++    }
++  }
++  
+   int i = KApplication::startServiceByDesktopPath(
+-        _service.desktopEntryPath(), urls.toStringList(), &error, 0L, &pid
++        _service.desktopEntryPath(), urls.toStringList(), &error, 0L, &pid, myasn
+         );
+ 
+   if (i != 0)
+@@ -794,33 +831,47 @@ pid_t KRun::run( const QString& _exec, c
+ 
+ pid_t KRun::runCommand( QString cmd )
+ {
+-  return KRun::runCommand( cmd, QString::null, QString::null );
++  return KRun::runCommand( cmd, QString::null, QString::null, NULL, "" );
+ }
+ 
+ pid_t KRun::runCommand( const QString& cmd, const QString &execName, const QString & iconName )
+ {
++  return KRun::runCommand( cmd, execName, iconName, NULL, "" );
++}
++
++pid_t KRun::runCommand( const QString& cmd, const QString &execName, const QString & iconName,
++    QWidget* window, const QCString& asn )
++{
+   kdDebug(7010) << "runCommand " << cmd << "," << execName << endl;
+   KProcess * proc = new KProcess;
+   proc->setUseShell(true);
+   *proc << cmd;
+   KService::Ptr service = KService::serviceByDesktopName( binaryName( execName, true ) );
+-  return runCommandInternal( proc, service.data(), binaryName( execName, false ), execName, iconName );
++  return runCommandInternal( proc, service.data(), binaryName( execName, false ), execName, iconName,
++      window, asn );
+ }
+ 
+ KRun::KRun( const KURL& url, mode_t mode, bool isLocalFile, bool showProgressInfo )
+      :m_timer(0,"KRun::timer")
+ {
+-  init (url, 0, mode, isLocalFile, showProgressInfo);
++  init (url, 0, "", mode, isLocalFile, showProgressInfo);
+ }
+ 
+ KRun::KRun( const KURL& url, QWidget* window, mode_t mode, bool isLocalFile,
+             bool showProgressInfo )
+      :m_timer(0,"KRun::timer")
+ {
+-  init (url, window, mode, isLocalFile, showProgressInfo);
++  init (url, window, "", mode, isLocalFile, showProgressInfo);
++}
++
++KRun::KRun( const KURL& url, QWidget* window, const QCString& asn, mode_t mode, bool isLocalFile,
++            bool showProgressInfo )
++     :m_timer(0,"KRun::timer")
++{
++  init (url, window, asn, mode, isLocalFile, showProgressInfo);
+ }
+ 
+-void KRun::init ( const KURL& url, QWidget* window, mode_t mode, bool isLocalFile,
++void KRun::init ( const KURL& url, QWidget* window, const QCString& asn, mode_t mode, bool isLocalFile,
+                   bool showProgressInfo )
+ {
+   m_bFault = false;
+@@ -836,6 +887,7 @@ void KRun::init ( const KURL& url, QWidg
+   d = new KRunPrivate;
+   d->m_runExecutables = true;
+   d->m_window = window;
++  d->m_asn = asn;
+   setEnableExternalBrowser(true);
+ 
+   // Start the timer. This means we will return to the event
+@@ -936,7 +988,7 @@ void KRun::init()
+        KService::Ptr service = KService::serviceByStorageId( exec );
+        if (service)
+        {
+-          run( *service, urls );
++          run( *service, urls, d->m_window, d->m_asn );
+           ok = true;
+        }
+     }
+@@ -1229,7 +1281,7 @@ void KRun::foundMimeType( const QString&
+       {
+           KURL::List lst;
+           lst.append( m_strURL );
+-          m_bFinished = KRun::run( *serv, lst );
++          m_bFinished = KRun::run( *serv, lst, d->m_window, d->m_asn );
+           /// Note: the line above means that if that service failed, we'll
+           /// go to runURL to maybe find another service, even though a dialog
+           /// box was displayed. That's good if runURL tries another service,
+@@ -1244,7 +1296,7 @@ void KRun::foundMimeType( const QString&
+     m_strURL.setPath( d->m_localPath );
+   }
+ 
+-  if (!m_bFinished && KRun::runURL( m_strURL, type, false, d->m_runExecutables, d->m_suggestedFileName )){
++  if (!m_bFinished && KRun::runURL( m_strURL, type, d->m_window, d->m_asn, false, d->m_runExecutables, d->m_suggestedFileName )){
+     m_bFinished = true;
+   }
+   else{
+diff -u -p -N -r kdelibs.sav/kio/kio/krun.h kdelibs/kio/kio/krun.h
+--- kdelibs.sav/kio/kio/krun.h	2006-05-24 18:34:50.000000000 +0200
++++ kdelibs/kio/kio/krun.h	2006-09-01 13:26:54.000000000 +0200
+@@ -111,6 +111,8 @@ public:
+    */
+   KRun( const KURL& url, QWidget* window, mode_t mode = 0,
+ 	bool isLocalFile = false, bool showProgressInfo = true );
++  KRun( const KURL& url, QWidget* window, const QCString& asn, mode_t mode = 0,
++	bool isLocalFile = false, bool showProgressInfo = true );
+ 
+   /**
+    * Destructor. Don't call it yourself, since a KRun object auto-deletes
+@@ -210,6 +212,8 @@ public:
+    * @since 3.5.2
+    */
+   static pid_t run( const KService& _service, const KURL::List& _urls, QWidget* window, bool tempFiles = false );
++  static pid_t run( const KService& _service, const KURL::List& _urls, QWidget* window,
++      const QCString& asn, bool tempFiles = false );
+   /**
+    * Open a list of URLs with a certain service (application).
+    *
+@@ -226,6 +230,8 @@ public:
+   /// @since 3.5.3
+   /// @internal
+   static pid_t run( const KService& _service, const KURL::List& _urls, QWidget* window, bool tempFiles, const QString& suggestedFileName );
++  static pid_t run( const KService& _service, const KURL::List& _urls, QWidget* window,
++      const QCString& asn, bool tempFiles, const QString& suggestedFileName );
+ 
+   /**
+    * Open a list of URLs with.
+@@ -269,6 +275,7 @@ public:
+   static pid_t runURL( const KURL& _url, const QString& _mimetype );
+   /// @since 3.5.3
+   /// @internal
++  static pid_t runURL( const KURL& _url, const QString& _mimetype, QWidget* window, const QCString& asn, bool tempFile, bool runExecutables, const QString& suggestedFileName );
+   static pid_t runURL( const KURL& _url, const QString& _mimetype, bool tempFile, bool runExecutables, const QString& suggestedFileName );
+ 
+   /**
+@@ -299,6 +306,8 @@ public:
+    * of running command) if command was unsafe for map notification.
+    */
+   static pid_t runCommand( const QString& cmd, const QString & execName, const QString & icon );
++  static pid_t runCommand( const QString& cmd, const QString & execName, const QString & icon,
++      QWidget* window, const QCString& asn );
+ 
+   /**
+    * Display the Open-With dialog for those URLs, and run the chosen application.
+@@ -438,7 +447,7 @@ protected:
+   virtual void virtual_hook( int id, void* data );
+ 
+ private:
+-  void init (const KURL& url, QWidget* window, mode_t mode,
++  void init (const KURL& url, QWidget* window, const QCString& asn, mode_t mode,
+              bool isLocalFile, bool showProgressInfo);
+ private:
+   class KRunPrivate;
--- kdelibs-3.5.7.orig/debian/patches/45_gmail_spoof.diff
+++ kdelibs-3.5.7/debian/patches/45_gmail_spoof.diff
@@ -0,0 +1,16 @@
+--- kdelibs-3.5.7.dfsg.1/khtml/html/html_elementimpl.cpp.orig	2007-05-20 18:47:02.000000000 +0200
++++ kdelibs-3.5.7.dfsg.1/khtml/html/html_elementimpl.cpp	2007-05-20 18:48:47.000000000 +0200
+@@ -562,6 +562,13 @@
+ 
+ void HTMLElementImpl::setInnerHTML( const DOMString &html, int &exceptioncode )
+ {
++    // Works line innerText in Gecko
++    // ### test if needed for ID_SCRIPT as well.
++    if ( id() == ID_STYLE ) {
++        setInnerText(html, exceptioncode);
++        return;
++    }
++
+     DocumentFragment fragment = createContextualFragment( html );
+     if ( fragment.isNull() ) {
+         exceptioncode = DOMException::NO_MODIFICATION_ALLOWED_ERR;
--- kdelibs-3.5.7.orig/debian/patches/kubuntu_69_applications_merged.diff
+++ kdelibs-3.5.7/debian/patches/kubuntu_69_applications_merged.diff
@@ -0,0 +1,11 @@
+diff -Nur kdelibs-3.5.7/kded/applications.menu kdelibs-3.5.7.new/kded/applications.menu
+--- kdelibs-3.5.7/kded/applications.menu	2007-05-22 17:06:58.000000000 +0100
++++ kdelibs-3.5.7.new/kded/applications.menu	2007-05-22 17:08:28.000000000 +0100
+@@ -412,6 +412,7 @@
+ 		</And>
+ 	</Include>
+ 	<DefaultMergeDirs/>
++	<MergeDir>applications-merged</MergeDir>
+ 	<MergeFile>applications-kmenuedit.menu</MergeFile>
+ 
+ 	<Menu>
--- kdelibs-3.5.7.orig/debian/patches/23_libtool_workaround_buildfix.diff
+++ kdelibs-3.5.7/debian/patches/23_libtool_workaround_buildfix.diff
@@ -0,0 +1,11 @@
+--- kde.orig/kdoctools/Makefile.am
++++ kde.patched/kdoctools/Makefile.am
+@@ -24,7 +24,7 @@
+ kdelnkdir = $(kde_servicesdir)
+ 
+ bin_PROGRAMS = meinproc 
+-meinproc_LDADD = xslt_pure.o libkbzipfilter_dummy.la $(LIBXSLT_LIBS) $(LIBXML_LIBS) $(LIB_KIO) $(LIBBZ2)
++meinproc_LDADD = xslt_pure.o libkbzipfilter_dummy.la $(LIBXSLT_LIBS) $(LIBXML_LIBS) $(LIB_KIO) $(LIBBZ2) $(LIB_KDECORE)
+ meinproc_SOURCES = meinproc.cpp
+ 
+ xslt_pure.o: xslt.cpp
--- kdelibs-3.5.7.orig/debian/patches/17_kdelibs_rubberband.diff
+++ kdelibs-3.5.7/debian/patches/17_kdelibs_rubberband.diff
@@ -0,0 +1,103 @@
+--- kde.orig/kdefx/kstyle.cpp
++++ kde.patched/kdefx/kstyle.cpp
+@@ -154,6 +154,7 @@
+ 	bool  menuAltKeyNavigation     : 1;
+ 	bool  menuDropShadow           : 1;
+ 	bool  sloppySubMenus           : 1;
++	bool  semiTransparentRubberband : 1;
+ 	int   popupMenuDelay;
+ 	float menuOpacity;
+ 
+@@ -187,6 +188,7 @@
+ 	d->menuAltKeyNavigation = settings.readBoolEntry("/KStyle/Settings/MenuAltKeyNavigation", true);
+ 	d->scrollablePopupmenus = settings.readBoolEntry("/KStyle/Settings/ScrollablePopupMenus", false);
+ 	d->menuDropShadow       = settings.readBoolEntry("/KStyle/Settings/MenuDropShadow", false);
++	d->semiTransparentRubberband = settings.readBoolEntry("/KStyle/Settings/SemiTransparentRubberband", false);
+ 	d->menuHandler = NULL;
+ 
+ 	if (useMenuTransparency) {
+@@ -553,7 +555,57 @@
+ 		else
+ 			// General handle, probably a kicker applet handle.
+ 			drawKStylePrimitive( KPE_GeneralHandle, p, widget, r, cg, flags, opt );
++#if QT_VERSION >= 0x030300
++#ifdef HAVE_XRENDER
++	} else if ( d->semiTransparentRubberband && pe == QStyle::PE_RubberBand ) {
++			QRect rect = r.normalize();
++			QPoint point;
++			point = p->xForm( point );
++	
++			static XRenderColor clr = { 0, 0, 0, 0 };
++			static unsigned long fillColor = 0;
++			if ( fillColor != cg.highlight().rgb() ) {
++				fillColor = cg.highlight().rgb();
++				
++				unsigned long color = fillColor << 8 | 0x40;
+ 
++				int red = (color >> 24) & 0xff;
++				int green = (color >> 16) & 0xff;
++				int blue = (color >> 8) & 0xff;
++				int alpha = (color >> 0) & 0xff;
++
++				red = red * alpha / 255;
++				green = green * alpha / 255;
++				blue = blue * alpha / 255;
++
++				clr.red = (red << 8) + red;
++				clr.green = (green << 8) + green;
++				clr.blue = (blue << 8) + blue;
++				clr.alpha = (alpha << 8) + alpha;
++			}
++		
++			XRenderFillRectangle(
++					p->device()->x11Display(),
++					PictOpOver,
++					p->device()->x11RenderHandle(),
++					&clr,
++					rect.x() + point.x(),
++					rect.y() + point.y(),
++					rect.width(),
++					rect.height() );
++
++			p->save();
++			p->setRasterOp( Qt::CopyROP );
++			p->setPen( QPen( cg.highlight().dark( 160 ), 1 ) );
++			p->setBrush( NoBrush );
++			p->drawRect(
++					rect.x() + point.x(),
++					rect.y() + point.y(),
++					rect.width(),
++					rect.height() );
++			p->restore();
++#endif
++#endif
+ 	} else
+ 		QCommonStyle::drawPrimitive( pe, p, r, cg, flags, opt );
+ }
+--- kde.orig/kdeui/kiconview.cpp
++++ kde.patched/kdeui/kiconview.cpp
+@@ -548,7 +548,7 @@
+     r = m_wordWrap->boundingRect();
+ 
+     int realWidth = QMAX( QMIN( r.width() + 4, tw ), fm->width( "X" ) );
+-    itemTextRect.setWidth( realWidth );
++    itemTextRect.setWidth( realWidth + 2);
+     itemTextRect.setHeight( r.height() );
+ 
+     int w = 0;    int h = 0;    int y = 0;
+@@ -699,11 +699,13 @@
+ 
+ void KIconViewItem::paintText( QPainter *p, const QColorGroup &cg )
+ {
+-    int textX = textRect( false ).x() + 2;
++    int textX = textRect( false ).x() + 4;
+     int textY = textRect( false ).y();
+ 
+     if ( isSelected() ) {
+-        p->fillRect( textRect( false ), cg.highlight() );
++	p->setBrush(QBrush(cg.highlight()));
++	p->setPen(QPen(cg.highlight()));
++	p->drawRoundRect( textRect( false ) ,1000/textRect(false).width(),1000/textRect(false).height() );		
+         p->setPen( QPen( cg.highlightedText() ) );
+     } else {
+         if ( iconView()->itemTextBackground() != NoBrush )
--- kdelibs-3.5.7.orig/debian/patches/11_applications_menu.diff
+++ kdelibs-3.5.7/debian/patches/11_applications_menu.diff
@@ -0,0 +1,14 @@
+--- kdelibs-orig/kded/applications.menu
++++ kdelibs-patched/kded/applications.menu
+@@ -466,4 +466,11 @@
+ 	</Include>
+ 	<DefaultMergeDirs/>
+ 	<MergeFile>applications-kmenuedit.menu</MergeFile>
++
++	<Menu>
++		<Name>Debian</Name>
++		<Directory>debian.directory</Directory>
++		<MergeFile>debian-menu.menu</MergeFile>
++	</Menu>
++
+ </Menu>
--- kdelibs-3.5.7.orig/debian/patches/04_am_maintainer_mode_extra.diff
+++ kdelibs-3.5.7/debian/patches/04_am_maintainer_mode_extra.diff
@@ -0,0 +1,11 @@
+--- kdelibs-orig/configure.in.in
++++ kdelibs-patched/configure.in.in
+@@ -19,6 +19,8 @@
+ dnl Automake doc recommends to do this only here. (Janos)
+ AM_INIT_AUTOMAKE(@MODULENAME@, @VERSION@) dnl searches for some needed programs
+ 
++AM_MAINTAINER_MODE
++
+ AC_PROG_INSTALL
+ 
+ dnl generate the config header
--- kdelibs-3.5.7.orig/debian/patches/21_kfreebsd_support.diff
+++ kdelibs-3.5.7/debian/patches/21_kfreebsd_support.diff
@@ -0,0 +1,97 @@
+--- kde.orig/configure.in.in	2005-05-23 14:17:19.000000000 +0200
++++ kde.patched/configure.in.in	2005-08-27 23:48:59.000000000 +0200
+@@ -48,7 +48,7 @@
+ KDE_CHECK_STL
+ AC_HEADER_DIRENT
+ AC_HEADER_STDC
+-AC_CHECK_HEADERS(sys/param.h sys/mman.h sys/time.h sysent.h strings.h sys/stat.h sys/select.h paths.h malloc.h limits.h sys/soundcard.h dlfcn.h termios.h)
++AC_CHECK_HEADERS(sys/param.h sys/mman.h sys/time.h sysent.h strings.h sys/stat.h sys/select.h paths.h malloc.h limits.h sys/soundcard.h dlfcn.h termios.h sys/prctl.h)
+ 
+ AC_ARG_WITH(acl,
+   [AC_HELP_STRING(--with-acl,
+@@ -164,7 +164,7 @@
+ AC_CHECK_MKSTEMPS
+ AC_CHECK_MKSTEMP
+ AC_CHECK_MKDTEMP
+-AC_CHECK_FUNCS(strtoll socket seteuid setegid strfmon stpcpy gettimeofday readdir_r setpriority)
++AC_CHECK_FUNCS(strtoll socket seteuid setegid strfmon stpcpy gettimeofday readdir_r setpriority tcgetattr tcsetattr)
+ 
+ AH_BOTTOM([
+ /* provide a definition for a 32 bit entity, usable as a typedef, possibly
+--- kde.orig/kdecore/kpty.cpp	2005-05-23 14:16:21.000000000 +0200
++++ kde.patched/kdecore/kpty.cpp	2005-08-27 15:15:37.000000000 +0200
+@@ -95,24 +95,24 @@
+ # endif
+ #endif
+ 
+-#if defined (__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__) || defined (__bsdi__) || defined(__APPLE__) || defined (__DragonFly__)
++#if defined(HAVE_TCGETATTR)
++# define _tcgetattr(fd, ttmode) tcgetattr(fd, ttmode)
++#elif defined(TIOCGETA)
+ # define _tcgetattr(fd, ttmode) ioctl(fd, TIOCGETA, (char *)ttmode)
++#elif defined(TCGETS)
++# define _tcgetattr(fd, ttmode) ioctl(fd, TCGETS, (char *)ttmode)
+ #else
+-# if defined(_HPUX_SOURCE) || defined(__Lynx__) || defined (__CYGWIN__)
+-#  define _tcgetattr(fd, ttmode) tcgetattr(fd, ttmode)
+-# else
+-#  define _tcgetattr(fd, ttmode) ioctl(fd, TCGETS, (char *)ttmode)
+-# endif
++# error
+ #endif
+ 
+-#if defined (__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__) || defined (__bsdi__) || defined(__APPLE__) || defined (__DragonFly__)
++#if defined(HAVE_TCSETATTR) && defined(TCSANOW)
++# define _tcsetattr(fd, ttmode) tcsetattr(fd, TCSANOW, ttmode)
++#elif defined(TIOCSETA)
+ # define _tcsetattr(fd, ttmode) ioctl(fd, TIOCSETA, (char *)ttmode)
++#elif defined(TCSETS)
++# define _tcsetattr(fd, ttmode) ioctl(fd, TCSETS, (char *)ttmode)
+ #else
+-# if defined(_HPUX_SOURCE) || defined(__CYGWIN__)
+-#  define _tcsetattr(fd, ttmode) tcsetattr(fd, TCSANOW, ttmode) 
+-# else
+-#  define _tcsetattr(fd, ttmode) ioctl(fd, TCSETS, (char *)ttmode)
+-# endif
++# error
+ #endif
+ 
+ #if defined (_HPUX_SOURCE)
+--- kde.orig/kinit/kinit.cpp	2005-07-20 11:19:21.000000000 +0200
++++ kde.patched/kinit/kinit.cpp	2005-08-27 15:15:37.000000000 +0200
+@@ -60,7 +60,7 @@
+ #include <kapplication.h>
+ #include <klocale.h>
+ 
+-#ifdef Q_OS_LINUX
++#ifdef HAVE_SYS_PRCTL_H
+ #include <sys/prctl.h>
+ #ifndef PR_SET_NAME
+ #define PR_SET_NAME 15
+@@ -571,7 +571,7 @@
+        d.argv[argc] = 0;
+ 
+        /** Give the process a new name **/
+-#ifdef Q_OS_LINUX
++#ifdef HAVE_SYS_PRCTL_H
+        /* set the process name, so that killall works like intended */
+        r = prctl(PR_SET_NAME, (unsigned long) name.data(), 0, 0, 0);
+        if ( r == 0 )
+--- kde.orig/kio/kfile/kpropertiesdialog.cpp
++++ kde.patched/kio/kfile/kpropertiesdialog.cpp
+@@ -1864,7 +1864,14 @@
+     fileSystemSupportsACLs = ( statfs( pathCString.data(), &buf ) == 0 ) && ( buf.f_flags & MNT_ACLS );
+ #else
+     fileSystemSupportsACLs =
+-      getxattr( pathCString.data(), "system.posix_acl_access", NULL, 0 ) >= 0 || errno == ENODATA;
++      getxattr( pathCString.data(), "system.posix_acl_access", NULL, 0 ) >= 0 
++#ifdef ENODATA      
++			|| (errno == ENODATA)
++#endif
++#ifdef ENOATTR      
++			|| (errno == ENOATTR)
++#endif
++			;
+ #endif
+     return fileSystemSupportsACLs;
+ }
--- kdelibs-3.5.7.orig/debian/patches/43_hardcode_xdgMenuPrefix.diff
+++ kdelibs-3.5.7/debian/patches/43_hardcode_xdgMenuPrefix.diff
@@ -0,0 +1,14 @@
+diff -Nur kdelibs-3.5.5a.dfsg.1/kded/vfolder_menu.cpp kdelibs-3.5.5a.dfsg.1.new/kded/vfolder_menu.cpp
+--- kdelibs-3.5.5a.dfsg.1/kded/vfolder_menu.cpp	2006-11-08 17:51:51.000000000 +0100
++++ kdelibs-3.5.5a.dfsg.1.new/kded/vfolder_menu.cpp	2006-11-08 17:57:37.000000000 +0100
+@@ -774,7 +774,9 @@
+ 
+    QString result;
+ 
+-   QString xdgMenuPrefix = QString::fromLocal8Bit(getenv("XDG_MENU_PREFIX"));
++   //QString xdgMenuPrefix = QString::fromLocal8Bit(getenv("XDG_MENU_PREFIX"));
++   // hardcode xdgMenuPrefix to "kde-" string until proper upstream fix
++   QString xdgMenuPrefix = "kde-";
+    if (!xdgMenuPrefix.isEmpty())
+    {
+       QFileInfo fileInfo(fileName);
--- kdelibs-3.5.7.orig/debian/patches/14_kaccel.diff
+++ kdelibs-3.5.7/debian/patches/14_kaccel.diff
@@ -0,0 +1,13 @@
+--- kdelibs-orig/kdecore/kaccel.cpp
++++ kdelibs-patched/kdecore/kaccel.cpp
+@@ -127,7 +127,10 @@
+ 	        return false;
+ 
+ 	if( pEvent->type == XKeyPress ) {
++		unsigned int tmp = pEvent->xkey.state;
++		pEvent->xkey.state &= ~0x2000;
+ 		KKeyNative keyNative( pEvent );
++		pEvent->xkey.state = tmp;
+ 		KKey key( keyNative );
+ 		key.simplify();
+ 		int keyCodeQt = key.keyCodeQt();
--- kdelibs-3.5.7.orig/debian/patches/20_no_libadd_in_convenience_libs.diff
+++ kdelibs-3.5.7/debian/patches/20_no_libadd_in_convenience_libs.diff
@@ -0,0 +1,62 @@
+--- kdelibs-3.4.2/kdoctools/Makefile.am
++++ kdelibs-3.4.2/kdoctools/Makefile.am
+@@ -5,18 +5,17 @@
+ noinst_LTLIBRARIES = libkbzipfilter_dummy.la
+ 
+ libkbzipfilter_dummy_la_SOURCES = kbzip2filter.cpp
+-libkbzipfilter_dummy_la_LIBADD = $(LIB_KIO) $(LIBBZ2)
+ 
+ ####### Files
+ 
+ kde_module_LTLIBRARIES = kio_help.la kio_ghelp.la
+ 
+ kio_help_la_SOURCES = kio_help.cpp main.cpp xslt.cpp
+-kio_help_la_LIBADD = $(LIBXSLT_LIBS) $(LIBXML_LIBS)  libkbzipfilter_dummy.la
++kio_help_la_LIBADD = $(LIBXSLT_LIBS) $(LIBXML_LIBS)  libkbzipfilter_dummy.la $(LIB_KIO) $(LIBBZ2)
+ kio_help_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+ 
+ kio_ghelp_la_SOURCES = kio_help.cpp main_ghelp.cpp xslt.cpp
+-kio_ghelp_la_LIBADD = $(LIBXSLT_LIBS) $(LIBXML_LIBS) libkbzipfilter_dummy.la
++kio_ghelp_la_LIBADD = $(LIBXSLT_LIBS) $(LIBXML_LIBS) libkbzipfilter_dummy.la $(LIB_KIO) $(LIBBZ2)
+ kio_ghelp_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+ 
+ noinst_HEADERS = kio_help.h
+@@ -25,7 +24,7 @@
+ kdelnkdir = $(kde_servicesdir)
+ 
+ bin_PROGRAMS = meinproc 
+-meinproc_LDADD = xslt_pure.o libkbzipfilter_dummy.la $(LIBXSLT_LIBS) $(LIBXML_LIBS) 
++meinproc_LDADD = xslt_pure.o libkbzipfilter_dummy.la $(LIBXSLT_LIBS) $(LIBXML_LIBS) $(LIB_KIO) $(LIBBZ2)
+ meinproc_SOURCES = meinproc.cpp
+ 
+ xslt_pure.o: xslt.cpp
+--- kdelibs-3.4.2/kspell2/Makefile.am	2005-05-23 14:16:10.000000000 +0200
++++ kdelibs-3.4.2/kspell2/Makefile.am	2005-08-18 13:13:22.000000000 +0200
+@@ -17,7 +17,6 @@
+ 	defaultdictionary.cpp 
+ 
+ libkspell2base_la_LDFLAGS = -no-undefined $(all_libraries)
+-libkspell2base_la_LIBADD  = $(LIB_KPARTS) ../kutils/libkutils.la 
+ 
+ servicetype_DATA = kspellclient.desktop
+ servicetypedir = $(kde_servicetypesdir)
+--- kdelibs-3.4.2/kspell2/ui/Makefile.am	2005-07-20 11:19:24.000000000 +0200
++++ kdelibs-3.4.2/kspell2/ui/Makefile.am	2005-08-18 13:11:02.000000000 +0200
+@@ -18,4 +18,4 @@
+ 
+ libkspell2_la_SOURCES = dialog.cpp
+ libkspell2_la_LDFLAGS = -no-undefined -version-info 1:0:0 $(all_libraries)
+-libkspell2_la_LIBADD = libkspell2_noinst.la ../libkspell2base.la
++libkspell2_la_LIBADD = libkspell2_noinst.la ../libkspell2base.la $(LIB_KPARTS) ../../kutils/libkutils.la 
+--- kdelibs-3.4.2/kspell2/tests/Makefile.am	2005-07-20 11:19:24.000000000 +0200
++++ kdelibs-3.4.2/kspell2/tests/Makefile.am	2005-08-18 13:12:01.000000000 +0200
+@@ -18,7 +18,7 @@
+ test_dialog_LDADD = ../ui/libkspell2.la $(LIB_KDECORE)
+ 
+ test_highlighter_SOURCES = test_highlighter.cpp
+-test_highlighter_LDADD = ../ui/libkspell2_noinst.la ../libkspell2base.la $(LIB_KDECORE)
++test_highlighter_LDADD = ../ui/libkspell2_noinst.la ../libkspell2base.la $(LIB_KDECORE) $(LIB_KPARTS) ../../kutils/libkutils.la
+ 
+ test_configdialog_SOURCES = test_configdialog.cpp
+-test_configdialog_LDADD = ../ui/libkspell2_noinst.la ../libkspell2base.la $(LIB_KDECORE)
++test_configdialog_LDADD = ../ui/libkspell2_noinst.la ../libkspell2base.la $(LIB_KDECORE) $(LIB_KPARTS) ../../kutils/libkutils.la
--- kdelibs-3.5.7.orig/debian/patches/13_cups_sysgroup.diff
+++ kdelibs-3.5.7/debian/patches/13_cups_sysgroup.diff
@@ -0,0 +1,50 @@
+--- kdelibs-orig/kdeprint/cups/cupsdconf2/cupsd.conf.template
++++ kdelibs-patched/kdeprint/cups/cupsdconf2/cupsd.conf.template
+@@ -272,12 +272,12 @@
+ # <b>Group (Group)</b>
+ # <p>
+ # The group the server runs under.  Normally this
+-# must be <b>sys</b>, however you can configure things for another
++# must be <b>lpadmin</b>, however you can configure things for another
+ # group as needed.</p>
+ # <p>
+-# <i>ex</i>: sys</p>
++# <i>ex</i>: lpadmin</p>
+ $$
+-#Group sys
++#Group lpadmin
+ @@
+ 
+ %%ripcache
+@@ -592,9 +592,9 @@
+ # access.  The default varies depending on the operating system, but
+ # will be <b>sys</b>, <b>system</b>, or <b>root</b> (checked for in that order).</p>
+ # <p>
+-# <i>ex</i>: sys</p>
++# <i>ex</i>: lpadmin</p>
+ $$
+-#SystemGroup sys
++#SystemGroup lpadmin
+ @@
+ 
+ %%servercertificate
+--- kdelibs-orig/kdeprint/cups/cupsdconf2/cupsdconf.cpp
++++ kdelibs-patched/kdeprint/cups/cupsdconf2/cupsdconf.cpp
+@@ -90,7 +90,7 @@
+ 	printcap_ = "/etc/printcap";
+ 	printcapformat_ = PRINTCAP_BSD;
+ 	remoteroot_ = "remroot";
+-	systemgroup_ = "sys";
++	systemgroup_ = "lpadmin";
+ 	encryptcert_ = serverfiles_+"/ssl/server.crt";
+ 	encryptkey_ = serverfiles_+"/ssl/server.key";
+ 	hostnamelookup_ = HOSTNAME_OFF;
+@@ -115,7 +115,7 @@
+ 	maxjobsperprinter_ = 0;
+ 	maxjobsperuser_ = 0;
+ 	user_ = "lp";
+-	group_ = "sys";
++	group_ = "lpadmin";
+ 	ripcache_ = "8m";
+ 	filterlimit_ = 0;
+ 	browsing_ = true;
--- kdelibs-3.5.7.orig/debian/patches/34_cups12_init_script.diff
+++ kdelibs-3.5.7/debian/patches/34_cups12_init_script.diff
@@ -0,0 +1,24 @@
+--- kde.orig/kdeprint/cups/cupsdconf2/cupsddialog.cpp
++++ kde.patched/kdeprint/cups/cupsdconf2/cupsddialog.cpp
+@@ -204,18 +204,13 @@ bool CupsdDialog::restartServer(QString&
+ 		msg = i18n("Unable to find a running CUPS server");
+ 	}
+ 	else
+ 	{
+                 bool success = false;
+-                if (getuid() == 0 )
+-                        success = (::kill(serverPid, SIGHUP) == 0);
+-                else
+-                {
+-                        KProcess proc;
+-                        proc << "kdesu" << "-c" << "kill -SIGHUP " + QString::number( serverPid );
+-                        success = proc.start( KProcess::Block ) && proc.normalExit();
+-                }
++		KProcess proc;
++		proc << "kdesu" << "-c" << "/etc/init.d/cupsys restart";
++		success = proc.start( KProcess::Block ) && proc.normalExit();
+                 if( !success )    
+ 			msg = i18n("Unable to restart CUPS server (pid = %1)").arg(serverPid);
+ 	}
+         return (msg.isEmpty());
+ }
--- kdelibs-3.5.7.orig/debian/patches/16_qtmotifplus.diff
+++ kdelibs-3.5.7/debian/patches/16_qtmotifplus.diff
@@ -0,0 +1,8 @@
+--- kde.orig/kstyles/themes/qtmotifplus.themerc
++++ kde.patched/kstyles/themes/qtmotifplus.themerc
+@@ -91,5 +91,3 @@
+ Comment[zu]=Isitayela se-Mofit esenziwe ngcono
+ [KDE]
+ WidgetStyle=MotifPlus
+-[Desktop Entry]
+-Hidden=true
--- kdelibs-3.5.7.orig/debian/patches/10_kstandarddirs.diff
+++ kdelibs-3.5.7/debian/patches/10_kstandarddirs.diff
@@ -0,0 +1,32 @@
+diff -urN kdelibs-3.3.91.orig/kdecore/kstandarddirs.cpp kdelibs-3.3.91/kdecore/kstandarddirs.cpp
+--- kdelibs-3.3.91.orig/kdecore/kstandarddirs.cpp	2005-01-14 21:46:57.964666000 -0800
++++ kdelibs-3.3.91/kdecore/kstandarddirs.cpp	2005-01-14 21:49:53.043136983 -0800
+@@ -834,6 +834,10 @@
+                     if ((local || testdir.exists()) && !candidates->contains(path))
+                         candidates->append(path);
+                 }
++		// UGLY HACK - Chris CHeney
++		if (local && (!strcmp("config", type)))
++		  candidates->append("/etc/kde3/");
++		//
+                 local = false;
+             }
+         }
+@@ -1021,7 +1025,7 @@
+     if (!strcmp(type, "data"))
+ 	return "share/apps/";
+     if (!strcmp(type, "html"))
+-	return "share/doc/HTML/";
++	return "share/doc/kde/HTML/";
+     if (!strcmp(type, "icon"))
+ 	return "share/icons/";
+     if (!strcmp(type, "config"))
+@@ -1041,7 +1045,7 @@
+     if (!strcmp(type, "mime"))
+ 	return "share/mimelnk/";
+     if (!strcmp(type, "cgi"))
+-	return "cgi-bin/";
++	return "lib/cgi-bin/";
+     if (!strcmp(type, "wallpaper"))
+ 	return "share/wallpapers/";
+     if (!strcmp(type, "templates"))
--- kdelibs-3.5.7.orig/debian/patches/44_sync_kwallet_changes.diff
+++ kdelibs-3.5.7/debian/patches/44_sync_kwallet_changes.diff
@@ -0,0 +1,106 @@
+--- kdelibs-3.5.5a.dfsg.1/kio/misc/kwalletd/kwalletd.cpp	2006-10-01 13:33:33.000000000 -0400
++++ kdelibs-3.5.5a.dfsg.1/kio/misc/kwalletd/kwalletd.cpp	2007-01-17 09:50:00.000000000 -0500
+@@ -829,6 +829,12 @@
+ 
+ 	if ((b = getWallet(friendlyDCOPPeerName(), handle))) {
+ 		bool rc = b->removeFolder(f);
++		// write changes to disk immediately
++		QByteArray p;
++		QString wallet = b->walletName();
++		p.duplicate(_passwords[wallet].data(), _passwords[wallet].length());
++		b->sync(p);
++		p.fill(0);
+ 		QByteArray data;
+ 		QDataStream ds(data, IO_WriteOnly);
+ 		ds << b->walletName();
+@@ -845,6 +851,12 @@
+ 
+ 	if ((b = getWallet(friendlyDCOPPeerName(), handle))) {
+ 		bool rc = b->createFolder(f);
++		// write changes to disk immediately
++		QByteArray p;
++		QString wallet = b->walletName();
++		p.duplicate(_passwords[wallet].data(), _passwords[wallet].length());
++		b->sync(p);
++		p.fill(0);
+ 		QByteArray data;
+ 		QDataStream ds(data, IO_WriteOnly);
+ 		ds << b->walletName();
+@@ -987,6 +999,12 @@
+ 		e.setValue(value);
+ 		e.setType(KWallet::Wallet::Map);
+ 		b->writeEntry(&e);
++		// write changes to disk immediately
++		QByteArray p;
++		QString wallet = b->walletName();
++		p.duplicate(_passwords[wallet].data(), _passwords[wallet].length());
++		b->sync(p);
++		p.fill(0);
+ 		emitFolderUpdated(b->walletName(), folder);
+ 		return 0;
+ 	}
+@@ -1005,6 +1023,12 @@
+ 		e.setValue(value);
+ 		e.setType(KWallet::Wallet::EntryType(entryType));
+ 		b->writeEntry(&e);
++		// write changes to disk immediately
++		QByteArray p;
++		QString wallet = b->walletName();
++		p.duplicate(_passwords[wallet].data(), _passwords[wallet].length());
++		b->sync(p);
++		p.fill(0);
+ 		emitFolderUpdated(b->walletName(), folder);
+ 		return 0;
+ 	}
+@@ -1023,6 +1047,12 @@
+ 		e.setValue(value);
+ 		e.setType(KWallet::Wallet::Stream);
+ 		b->writeEntry(&e);
++		// write changes to disk immediately
++		QByteArray p;
++		QString wallet = b->walletName();
++		p.duplicate(_passwords[wallet].data(), _passwords[wallet].length());
++		b->sync(p);
++		p.fill(0);
+ 		emitFolderUpdated(b->walletName(), folder);
+ 		return 0;
+ 	}
+@@ -1041,6 +1071,12 @@
+ 		e.setValue(value);
+ 		e.setType(KWallet::Wallet::Password);
+ 		b->writeEntry(&e);
++		// write changes to disk immediately
++		QByteArray p;
++		QString wallet = b->walletName();
++		p.duplicate(_passwords[wallet].data(), _passwords[wallet].length());
++		b->sync(p);
++		p.fill(0);
+ 		emitFolderUpdated(b->walletName(), folder);
+ 		return 0;
+ 	}
+@@ -1090,6 +1126,12 @@
+ 		}
+ 		b->setFolder(folder);
+ 		bool rc = b->removeEntry(key);
++		// write changes to disk immediately
++		QByteArray p;
++		QString wallet = b->walletName();
++		p.duplicate(_passwords[wallet].data(), _passwords[wallet].length());
++		b->sync(p);
++		p.fill(0);
+ 		emitFolderUpdated(b->walletName(), folder);
+ 		return rc ? 0 : -3;
+ 	}
+@@ -1183,6 +1225,12 @@
+ 	if ((b = getWallet(friendlyDCOPPeerName(), handle))) {
+ 		b->setFolder(folder);
+ 		int rc = b->renameEntry(oldName, newName);
++		// write changes to disk immediately
++		QByteArray p;
++		QString wallet = b->walletName();
++		p.duplicate(_passwords[wallet].data(), _passwords[wallet].length());
++		b->sync(p);
++		p.fill(0);
+ 		emitFolderUpdated(b->walletName(), folder);
+ 		return rc;
+ 	}
--- kdelibs-3.5.7.orig/debian/patches/24_libkdefakes_pic.diff
+++ kdelibs-3.5.7/debian/patches/24_libkdefakes_pic.diff
@@ -0,0 +1,24 @@
+--- kde.orig/kdecore/Makefile.am
++++ kde.patched/kdecore/Makefile.am
+@@ -34,7 +34,7 @@
+ AM_LDFLAGS = $(LDFLAGS_AS_NEEDED) $(LDFLAGS_NEW_DTAGS)
+ 
+ lib_LTLIBRARIES = libkdefakes.la libkdecore.la
+-lib_LIBRARIES = libkdefakes_nonpic.a
++lib_LIBRARIES = libkdefakes_nonpic.a libkdefakes_pic.a
+ 
+ include_HEADERS = kconfig.h kconfigskeleton.h \
+ 	kconfigdata.h ksimpleconfig.h kconfigdialogmanager.h \
+@@ -75,6 +75,12 @@
+ 	-rm -f vsnprintf_nonpic.c
+ 	$(LN_S) $(srcdir)/vsnprintf.c vsnprintf_nonpic.c
+ 
++libkdefakes_pic.a: libkdefakes.la
++	-rm -f libkdefakes_pic.a fakes_pic.o vsnprintf_pic.o
++	cp -f .libs/fakes.o fakes_pic.o; cp -f .libs/vsnprintf.o vsnprintf_pic.o
++	ar cru libkdefakes_pic.a fakes_pic.o vsnprintf_pic.o
++	ranlib libkdefakes_pic.a
++
+ noinst_HEADERS = kaccelaction.h kaccelbase.h kaccelprivate.h kckey.h \
+ 	kcompletion_private.h netwm_p.h \
+ 	kglobalaccel_x11.h kglobalaccel_win.h kkeyserver_x11.h kkeyserver.h \
--- kdelibs-3.5.7.orig/debian/patches/12_cups_docroot.diff
+++ kdelibs-3.5.7/debian/patches/12_cups_docroot.diff
@@ -0,0 +1,25 @@
+--- kdelibs-orig/kdeprint/cups/cupsdconf2/cupsd.conf.template
++++ kdelibs-patched/kdeprint/cups/cupsdconf2/cupsd.conf.template
+@@ -100,9 +100,9 @@
+ # The root directory for HTTP documents that are served.
+ # By default the compiled-in directory.</p>
+ # <p>
+-# <i>ex</i>: /usr/share/cups/doc</p>
++# <i>ex</i>: /usr/share/cups/doc-root</p>
+ $$
+-#DocumentRoot /usr/share/cups/doc
++#DocumentRoot /usr/share/cups/doc-root
+ @@
+ 
+ %%errorlog
+--- kdelibs-orig/kdeprint/cups/cupsdconf2/cupsdconf.cpp
++++ kdelibs-patched/kdeprint/cups/cupsdconf2/cupsdconf.cpp
+@@ -66,7 +66,7 @@
+ 			<< "/usr/local/share/cups"
+ 			<< "/opt/share/cups"
+ 			<< "/opt/local/share/cups");
+-	documentdir_ = findDir(QStringList(datadir_+"/doc")
++	documentdir_ = findDir(QStringList(datadir_+"/doc-root")
+ 			<< datadir_.left(datadir_.length()-5)+"/doc/cups");
+ 	//fontpath_ << (datadir_+"/fonts");
+ 	requestdir_ = findDir(QStringList("/var/spool/cups")
--- kdelibs-3.5.7.orig/debian/patches/27_kdnssd_avahi.diff
+++ kdelibs-3.5.7/debian/patches/27_kdnssd_avahi.diff
@@ -0,0 +1,1180 @@
+--- kde.orig/dnssd/configure.in.in	2006-02-01 21:14:02.000000000 -0500
++++ kde.patched/dnssd/configure.in.in	2006-01-24 13:54:50.000000000 -0500
+@@ -1,38 +1,17 @@
+ #MIN_CONFIG
+ 
+-AC_ARG_ENABLE(dnssd, [  --disable-dnssd     don't require libdns_sd (browsing and publishing DNS-SD services will not be possible) ],  with_dnssd=$enableval, with_dnssd=yes)
+-if test "$with_dnssd" = "yes"; then
+-AC_MSG_CHECKING(for DNS-SD support)
+-save_dnssdtest_LIBS="$LIBS"
+-save_dnssdtest_LDFLAGS="$LDFLAGS"
+-save_dnssdtest_CPPFLAGS="$CPPFLAGS"
+-LDFLAGS="$all_libraries $LDFLAGS"
+-CPPFLAGS="$CPPFLAGS $all_includes"
+-case $host_os in
+-  darwin*) LIBS="" ;;
+-  *) LIBS="-ldns_sd" ;;
+-esac
+-have_libdns_sd="no"
+-AC_TRY_LINK(	[
+-			#include <dns_sd.h>
+-		],[
+-			DNSServiceRefDeallocate( (DNSServiceRef) 0);
+-			TXTRecordDeallocate( (TXTRecordRef*) 0);
+-		],[
+-			AC_DEFINE(HAVE_DNSSD,1,[Define if dns-sd is available])
+-			case $host_os in
+-				darwin*) LIB_DNSSD="" ;;
+-				*) LIB_DNSSD="-ldns_sd" ;;
+-			esac
+-			have_libdns_sd="yes"
+-			AC_MSG_RESULT(yes)
+-		],[
+-			AC_MSG_RESULT(no)
+-                        LIB_DNSSD=""
+-])
+-CPPFLAGS=$save_dnssdtest_CPPFLAGS
+-LDFLAGS=$save_dnssdtest_LDFLAGS
+-LIBS=$save_dnssdtest_LIBS
++# Check for pkg-config manually first, as if its not installed the
++# PKG_PROG_PKG_CONFIG macro won't be defined.
++m4_pattern_allow(PKG_CONFIG_MIN_VERSION)
++AC_CHECK_PROG(have_pkg_config, pkg-config, yes, no)
++
++if test x"$have_pkg_config" == xno; then
++    AC_MSG_ERROR(pkg-config is required to install this program)
+ fi
+-AC_SUBST(LIB_DNSSD)
+-AM_CONDITIONAL(HAVE_DNSSD, test "$have_libdns_sd" = "yes")
++
++PKG_PROG_PKG_CONFIG
++
++PKG_CHECK_MODULES( AVAHI, [ avahi-qt3 >= 0.4 , avahi-client >= 0.4 ])
++AC_SUBST(AVAHI_CFLAGS)
++AC_SUBST(AVAHI_LIBS)
++PKG_CHECK_EXISTS( [ avahi-client >= 0.6], AC_DEFINE(AVAHI_API_0_6,1,[Avahi API 0.6] ) )
+--- kde.orig/dnssd/domainbrowser.cpp	2006-02-01 21:14:02.000000000 -0500
++++ kde.patched/dnssd/domainbrowser.cpp	2005-12-15 15:28:03.000000000 -0500
+@@ -27,46 +27,56 @@
+ #include "query.h"
+ #include "servicebrowser.h"
+ #include <kapplication.h>
++#ifdef AVAHI_API_0_6
++#include <avahi-client/lookup.h>
++#endif
+ 
+ namespace DNSSD
+ {
+ 
+-#ifdef HAVE_DNSSD
+-void domain_callback(DNSServiceRef, DNSServiceFlags flags, uint32_t, DNSServiceErrorType errorCode, 
+-	const char *replyDomain, void *context);
++#ifdef AVAHI_API_0_6
++void domains_callback(AvahiDomainBrowser*,  AvahiIfIndex, AvahiProtocol, AvahiBrowserEvent event, const char* replyDomain,
++     AvahiLookupResultFlags, void* context);
++#else
++void domains_callback(AvahiDomainBrowser*,  AvahiIfIndex, AvahiProtocol, AvahiBrowserEvent event, const char* replyDomain,
++     void* context);
+ #endif
+ 
+-class DomainBrowserPrivate : public Responder
++
++class DomainBrowserPrivate 
+ {
+ public:
+-	DomainBrowserPrivate(DomainBrowser* owner) : Responder(), m_browseLAN(false), m_started(false), m_owner(owner) {}
++	DomainBrowserPrivate(DomainBrowser* owner) : m_browseLAN(false), m_started(false), 
++	    m_browser(0), m_owner(owner) {}
++	~DomainBrowserPrivate() { if (m_browser) avahi_domain_browser_free(m_browser); }
+ 	QStringList m_domains;
+ 	virtual void customEvent(QCustomEvent* event);
+ 	bool m_browseLAN;
+ 	bool m_started;
++	AvahiDomainBrowser* m_browser;
+ 	DomainBrowser* m_owner;
+ };		
+ 
+ void DomainBrowserPrivate::customEvent(QCustomEvent* event)
+ {
+-	if (event->type()==QEvent::User+SD_ERROR) stop();
+ 	if (event->type()==QEvent::User+SD_ADDREMOVE) {
+ 		AddRemoveEvent *aev = static_cast<AddRemoveEvent*>(event);
+ 		if (aev->m_op==AddRemoveEvent::Add) m_owner->gotNewDomain(aev->m_domain);
+ 			else m_owner->gotRemoveDomain(aev->m_domain);
+ 	}
+ }
++
+ 	
+ DomainBrowser::DomainBrowser(QObject *parent) : QObject(parent)
+ {
+ 	d = new DomainBrowserPrivate(this);
+-	d->m_domains = Configuration::domainList();
++ 	d->m_domains = Configuration::domainList();
+ 	if (Configuration::browseLocal()) {
+ 		d->m_domains+="local.";
+ 		d->m_browseLAN=true;
+ 	}
+-	connect(KApplication::kApplication(),SIGNAL(kipcMessage(int,int)),this,
+-	        SLOT(domainListChanged(int,int)));
++ 	connect(KApplication::kApplication(),SIGNAL(kipcMessage(int,int)),this,
++ 	        SLOT(domainListChanged(int,int)));
+ }
+ 
+ DomainBrowser::DomainBrowser(const QStringList& domains, bool recursive, QObject *parent) : QObject(parent)
+@@ -88,14 +98,15 @@
+ 	if (d->m_started) return;
+ 	d->m_started=true;
+ 	if (ServiceBrowser::isAvailable()!=ServiceBrowser::Working) return;
+-	QStringList::const_iterator itEnd = d->m_domains.end();
++ 	QStringList::const_iterator itEnd = d->m_domains.end();
+ 	for (QStringList::const_iterator it=d->m_domains.begin(); it!=itEnd; ++it ) emit domainAdded(*it);
+-#ifdef HAVE_DNSSD		
+-	if (d->m_browseLAN) {
+-		DNSServiceRef ref;
+-		if (DNSServiceEnumerateDomains(&ref,kDNSServiceFlagsBrowseDomains,0,domain_callback,
+-		reinterpret_cast<void*>(d))==kDNSServiceErr_NoError) d->setRef(ref);
+-	}
++	if (d->m_browseLAN) 
++#ifdef AVAHI_API_0_6
++	    d->m_browser = avahi_domain_browser_new(Responder::self().client(), AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC,
++		"local.", AVAHI_DOMAIN_BROWSER_BROWSE, (AvahiLookupFlags)0, domains_callback, this);
++#else
++	    d->m_browser = avahi_domain_browser_new(Responder::self().client(), AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC,
++		"local.", AVAHI_DOMAIN_BROWSER_BROWSE, domains_callback, this);
+ #endif
+ }
+ 
+@@ -115,9 +126,14 @@
+ void DomainBrowser::domainListChanged(int message,int)
+ {
+ 	if (message!=KIPCDomainsChanged) return;
++
+ 	bool was_started = d->m_started;
+-	if (d->isRunning()) d->stop(); // LAN query
++	if (d->m_browser) { 
++	    avahi_domain_browser_free(d->m_browser);  // LAN query
++	    d->m_browser=0;
++	}
+ 	d->m_started = false;
++
+ 	// remove all domains and resolvers
+ 	if (was_started) {
+ 		QStringList::const_iterator itEnd = d->m_domains.end();
+@@ -129,7 +145,7 @@
+ 	Configuration::self()->readConfig();
+ 	d->m_browseLAN = Configuration::browseLocal();
+ 	d->m_domains = Configuration::domainList();
+-	if (Configuration::browseLocal()) d->m_domains+="local.";
++	if (Configuration::browseLocal()) d->m_domains+="local";
+ 	// this will emit domainAdded() for every domain if necessary
+ 	if (was_started) startBrowse();
+ }
+@@ -147,22 +163,21 @@
+ void DomainBrowser::virtual_hook(int, void*)
+ {}
+ 
+-#ifdef HAVE_DNSSD
+-void domain_callback(DNSServiceRef, DNSServiceFlags flags, uint32_t, DNSServiceErrorType errorCode, 
+-	const char *replyDomain, void *context)
++#ifdef AVAHI_API_0_6
++void domains_callback(AvahiDomainBrowser*,  AvahiIfIndex, AvahiProtocol, AvahiBrowserEvent event, const char* replyDomain,
++     AvahiLookupResultFlags,void* context)
++#else
++void domains_callback(AvahiDomainBrowser*,  AvahiIfIndex, AvahiProtocol, AvahiBrowserEvent event, const char* replyDomain,
++     void* context)
++#endif
+ {
+ 	QObject *obj = reinterpret_cast<QObject*>(context);
+-	if (errorCode != kDNSServiceErr_NoError) {
+-		ErrorEvent err;
+-		QApplication::sendEvent(obj, &err);
+-	} else {
+-		AddRemoveEvent arev((flags & kDNSServiceFlagsAdd) ? AddRemoveEvent::Add :
++	AddRemoveEvent* arev=new AddRemoveEvent((event==AVAHI_BROWSER_NEW) ? AddRemoveEvent::Add :
+ 			AddRemoveEvent::Remove, QString::null, QString::null, 
+-			DNSToDomain(replyDomain), !(flags & kDNSServiceFlagsMoreComing));
+-		QApplication::sendEvent(obj, &arev);
+-	}
++			DNSToDomain(replyDomain));
++		QApplication::postEvent(obj, arev);
+ }
+-#endif
++
+ 
+ }
+ #include "domainbrowser.moc"
+--- kde.orig/dnssd/Makefile.am	2006-02-01 21:14:02.000000000 -0500
++++ kde.patched/dnssd/Makefile.am	2006-01-25 11:05:03.000000000 -0500
+@@ -1,5 +1,5 @@
+ # set the include path for X, qt and KDE
+-INCLUDES = -I$(top_srcdir) $(all_includes)
++INCLUDES = -I$(top_srcdir) $(all_includes) $(AVAHI_CFLAGS)
+ 
+ # these are the headers for your project
+ noinst_HEADERS = sdevent.h
+@@ -14,7 +14,7 @@
+ dnssdincludedir = $(includedir)/dnssd
+ dnssdinclude_HEADERS = domainbrowser.h query.h remoteservice.h \
+ 	publicservice.h servicebase.h servicebrowser.h settings.h
+-libkdnssd_la_LIBADD = ../kdecore/libkdecore.la $(LIB_DNSSD)
++libkdnssd_la_LIBADD = ../kdecore/libkdecore.la $(AVAHI_LIBS)
+ libkdnssd_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -version-info 1:0
+ 
+ #kde_kcfg_DATA = kcm_kdnssd.kcfg
+--- kde.orig/dnssd/publicservice.cpp	2006-02-01 21:14:02.000000000 -0500
++++ kde.patched/dnssd/publicservice.cpp	2006-01-24 17:31:34.000000000 -0500
+@@ -30,6 +30,12 @@
+ #include <network/ksocketaddress.h>
+ #include <kurl.h>
+ #include <unistd.h>
++#include <avahi-client/client.h>
++#ifdef AVAHI_API_0_6
++#include <avahi-client/publish.h>
++#endif
++#include <avahi-common/alternative.h>
++#include <avahi-common/strlst.h>
+ #include "sdevent.h"
+ #include "responder.h"
+ #include "servicebrowser.h"
+@@ -38,16 +44,23 @@
+ namespace DNSSD
+ {
+ static unsigned long publicIP();
+-#ifdef HAVE_DNSSD
+-void publish_callback (DNSServiceRef, DNSServiceFlags, DNSServiceErrorType errorCode, const char *name,
+-		       const char*, const char*, void *context);
+-#endif
+-class PublicServicePrivate : public Responder
++
++void publish_callback (AvahiEntryGroup*, AvahiEntryGroupState s,  void *context);
++
++class PublicServicePrivate 
+ {
+ public:
+-	PublicServicePrivate() : m_published(false)
++	PublicServicePrivate() : m_published(false), m_running(false), m_collision(false), m_group(false)
+ 	{}
+ 	bool m_published;
++	bool m_running;
++	bool m_collision;
++	AvahiEntryGroup* m_group;
++	void commit()
++	{
++	    if (!m_collision) avahi_entry_group_commit(m_group);
++	}    
++	
+ };
+ 
+ PublicService::PublicService(const QString& name, const QString& type, unsigned int port,
+@@ -55,6 +68,10 @@
+   		: QObject(), ServiceBase(name, type, QString::null, domain, port)
+ {
+ 	d = new PublicServicePrivate;
++	if (Responder::self().client()) { 
++		d->m_group = avahi_entry_group_new(Responder::self().client(), publish_callback,this);
++		connect(&Responder::self(),SIGNAL(stateChanged(AvahiClientState)),this,SLOT(clientState(AvahiClientState)));
++	}
+ 	if (domain.isNull())
+ 		if (Configuration::publishType()==Configuration::EnumPublishType::LAN) m_domain="local.";
+ 		else m_domain=Configuration::publishDomain();
+@@ -63,114 +80,148 @@
+ 
+ PublicService::~PublicService()
+ {
+-	stop();
++	if (d->m_group) avahi_entry_group_free(d->m_group);
+ 	delete d;
+ }
+ 
++void PublicService::tryApply()
++{
++    if (fillEntryGroup()) d->commit();
++    else {
++	stop();
++	emit published(false);
++    }
++}
++
+ void PublicService::setServiceName(const QString& serviceName)
+ {
+ 	m_serviceName = serviceName;
+-	if (d->isRunning()) {
+-		stop();
+-		publishAsync();
+-	}
++	if (d->m_running) {
++	    avahi_entry_group_reset(d->m_group);
++	    tryApply();
++	} 
+ }
+ 
+ void PublicService::setDomain(const QString& domain)
+ {
+ 	m_domain = domain;
+-	if (d->isRunning()) {
+-	stop();
+-	publishAsync();
+-	}
++	if (d->m_running) {
++	    avahi_entry_group_reset(d->m_group);
++	    tryApply();
++	} 
+ }
+ 
+ 
+ void PublicService::setType(const QString& type)
+ {
+ 	m_type = type;
+-	if (d->isRunning()) {
+-		stop();
+-		publishAsync();
+-	}
++	if (d->m_running) {
++	    avahi_entry_group_reset(d->m_group);
++	    tryApply();
++	} 
+ }
+ 
+ void PublicService::setPort(unsigned short port)
+ {
+ 	m_port = port;
+-	if (d->isRunning()) {
+-		stop();
+-		publishAsync();
+-	}
++	if (d->m_running) {
++	    avahi_entry_group_reset(d->m_group);
++	    tryApply();
++    	} 
+ }
+ 
+-bool PublicService::isPublished() const
++void PublicService::setTextData(const QMap<QString,QString>& textData)
+ {
+-	return d->m_published;
++	m_textData = textData;
++	if (d->m_running) {
++	    avahi_entry_group_reset(d->m_group);
++	    tryApply();
++	} 
+ }
+ 
+-void PublicService::setTextData(const QMap<QString,QString>& textData)
++bool PublicService::isPublished() const
+ {
+-	m_textData = textData;
+-	if (d->isRunning()) {
+-		stop();
+-		publishAsync();
+-	}
++	return d->m_published;
+ }
+ 
+ bool PublicService::publish()
+ {
+ 	publishAsync();
+-	while (d->isRunning() && !d->m_published) d->process();
++	while (d->m_running && !d->m_published) Responder::self().process();
+ 	return d->m_published;
+ }
+ 
+ void PublicService::stop()
+ {
+-	d->stop();
+-	d->m_published = false;
++    if (d->m_group) avahi_entry_group_reset(d->m_group);
++    d->m_published = false;
++}
++bool PublicService::fillEntryGroup()
++{
++    AvahiStringList *s=0;
++    QMap<QString,QString>::ConstIterator itEnd = m_textData.end();
++    for (QMap<QString,QString>::ConstIterator it = m_textData.begin(); it!=itEnd ; ++it) 
++	s = avahi_string_list_add_pair(s, it.key().utf8(),it.data().utf8());
++#ifdef AVAHI_API_0_6
++    bool res = (!avahi_entry_group_add_service_strlst(d->m_group, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, (AvahiPublishFlags)0, 
++	m_serviceName.isNull() ? avahi_client_get_host_name(Responder::self().client()) : m_serviceName.utf8().data(),
++	m_type.ascii(),domainToDNS(m_domain),m_hostName.utf8(),m_port,s));
++#else
++    bool res = (!avahi_entry_group_add_service_strlst(d->m_group, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, 
++	m_serviceName.isNull() ? avahi_client_get_host_name(Responder::self().client()) : m_serviceName.utf8().data(),
++	m_type.ascii(),m_domain.utf8(),m_hostName.utf8(),m_port,s));
++#endif
++    avahi_string_list_free(s);
++    return res;
+ }
+ 
+-void PublicService::publishAsync()
++void PublicService::clientState(AvahiClientState s)
+ {
+-	if (d->isRunning()) stop();
+-#ifdef HAVE_DNSSD
+-	if (ServiceBrowser::isAvailable()==ServiceBrowser::Working) {
+-		TXTRecordRef txt;
+-		TXTRecordCreate(&txt,0,0);
+-		QMap<QString,QString>::ConstIterator itEnd = m_textData.end();
+-		for (QMap<QString,QString>::ConstIterator it = m_textData.begin(); it!=itEnd ; ++it) {
+-			QCString value = it.data().utf8();
+-			if (TXTRecordSetValue(&txt,it.key().utf8(),value.length(),value)!=kDNSServiceErr_NoError) {
+-				TXTRecordDeallocate(&txt);
+-				emit published(false);
+-				return;
+-			}
+-		}
+-		DNSServiceRef ref;
+-		if (DNSServiceRegister(&ref,0,0,m_serviceName.utf8(),m_type.ascii(),domainToDNS(m_domain),NULL,
+-		    htons(m_port),TXTRecordGetLength(&txt),TXTRecordGetBytesPtr(&txt),publish_callback,
+-		    reinterpret_cast<void*>(this)) == kDNSServiceErr_NoError) d->setRef(ref);
+-		TXTRecordDeallocate(&txt);
+-	}
++    if (!d->m_running) return;
++    switch (s) {
++#ifdef AVAHI_API_0_6
++	case AVAHI_CLIENT_FAILURE:
++#else
++	case AVAHI_CLIENT_S_INVALID:
++	case AVAHI_CLIENT_DISCONNECTED:
+ #endif
+-	if (!d->isRunning()) emit published(false);
++	    stop();
++	    emit published(false);
++	    break;
++	case AVAHI_CLIENT_S_REGISTERING:
++	case AVAHI_CLIENT_S_COLLISION:
++	    avahi_entry_group_reset(d->m_group);
++	    d->m_collision=true;
++	    break;
++	case AVAHI_CLIENT_S_RUNNING:
++	    if (d->m_collision) {
++		d->m_collision=false;
++		tryApply();
++	    }
++    }
++}				    
++
++void PublicService::publishAsync()
++{
++	if (d->m_running) stop();
++	
++	if (!d->m_group) {
++	    emit published(false);
++	    return;
++	}
++	AvahiClientState s=Responder::self().state();
++	d->m_running=true; 
++	d->m_collision=true; // make it look like server is getting out of collision to force registering
++	clientState(s);
+ }
+ 
+-#ifdef HAVE_DNSSD
+-void publish_callback (DNSServiceRef, DNSServiceFlags, DNSServiceErrorType errorCode, const char *name,
+-		       const char*, const char*, void *context)
++void publish_callback (AvahiEntryGroup*, AvahiEntryGroupState s,  void *context)
+ {
+ 	QObject *obj = reinterpret_cast<QObject*>(context);
+-	if (errorCode != kDNSServiceErr_NoError) {
+-		ErrorEvent err;
+-		QApplication::sendEvent(obj, &err);
+-	} else {
+-		PublishEvent pev(QString::fromUtf8(name));
+-		QApplication::sendEvent(obj, &pev);
+-	}
++	if (s!=AVAHI_ENTRY_GROUP_ESTABLISHED && s!=AVAHI_ENTRY_GROUP_COLLISION) return;
++	PublishEvent* pev=new PublishEvent(s==AVAHI_ENTRY_GROUP_ESTABLISHED);
++	QApplication::postEvent(obj, pev);
+ }
+-#endif
+ 
+ const KURL PublicService::toInvitation(const QString& host)
+ {
+@@ -194,14 +245,13 @@
+ 
+ void PublicService::customEvent(QCustomEvent* event)
+ {
+-	if (event->type()==QEvent::User+SD_ERROR) {
+-		stop();
+-		emit published(false);
+-	}
+ 	if (event->type()==QEvent::User+SD_PUBLISH) {
++		if (!static_cast<PublishEvent*>(event)->m_ok) {
++		    setServiceName(QString::fromUtf8(avahi_alternative_service_name(m_serviceName.utf8())));
++		    return;
++		}
+ 		d->m_published=true;
+ 		emit published(true);
+-		m_serviceName = static_cast<PublishEvent*>(event)->m_name;
+ 	}
+ }
+ 
+--- kde.orig/dnssd/publicservice.h	2006-02-01 21:14:02.000000000 -0500
++++ kde.patched/dnssd/publicservice.h	2005-10-14 05:00:19.000000000 -0400
+@@ -23,6 +23,7 @@
+ 
+ #include <qobject.h>
+ #include <dnssd/servicebase.h>
++#include <avahi-client/client.h>
+ 
+ class KURL;
+ namespace DNSSD
+@@ -137,6 +138,10 @@
+ 	void published(bool);
+ private:
+ 	PublicServicePrivate *d;
++	bool fillEntryGroup();
++	void tryApply();
++private slots:
++	void clientState(AvahiClientState);
+ 
+ protected:
+ 	virtual void customEvent(QCustomEvent* event);
+--- kde.orig/dnssd/query.cpp	2006-02-01 21:14:02.000000000 -0500
++++ kde.patched/dnssd/query.cpp	2005-12-15 15:28:03.000000000 -0500
+@@ -22,26 +22,46 @@
+ #include "responder.h"
+ #include "remoteservice.h"
+ #include "sdevent.h"
+-#include <kdebug.h>
++#include <qdatetime.h>
+ #include <qapplication.h>
+ #include <qtimer.h>
+ 
+-#define TIMEOUT_WAN 2000
++#include <avahi-client/client.h>
++#ifdef AVAHI_API_0_6
++#include <avahi-client/lookup.h>
++#endif
++
+ #define TIMEOUT_LAN 200
+ 
+ namespace DNSSD
+ {
+-#ifdef HAVE_DNSSD  
+-void query_callback (DNSServiceRef, DNSServiceFlags flags, uint32_t, DNSServiceErrorType errorCode,
+-		     const char *serviceName, const char *regtype, const char *replyDomain, void *context);
++#ifdef AVAHI_API_0_6
++
++void services_callback(AvahiServiceBrowser*, AvahiIfIndex, AvahiProtocol, AvahiBrowserEvent event, const char* name,
++    const char* regtype, const char* domain, AvahiLookupResultFlags, void* context);
++void types_callback(AvahiServiceTypeBrowser*, AvahiIfIndex, AvahiProtocol, AvahiBrowserEvent event, const char* regtype,
++    const char* replyDomain, AvahiLookupResultFlags, void* context);
++#else
++void services_callback(AvahiServiceBrowser*, AvahiIfIndex, AvahiProtocol, AvahiBrowserEvent event, const char* name,
++    const char* regtype, const char* domain, void* context);
++void types_callback(AvahiServiceTypeBrowser*, AvahiIfIndex, AvahiProtocol, AvahiBrowserEvent event, const char* regtype,
++    const char* replyDomain, void* context);
++void domains_callback(AvahiDomainBrowser*,  AvahiIfIndex, AvahiProtocol, AvahiBrowserEvent event, const char* replyDomain,
++     void* context);
+ #endif
+-class QueryPrivate : public Responder
++
++enum BrowserType { Types, Services };
++
++class QueryPrivate 
+ {
+ public:
+-	QueryPrivate(const QString& type, const QString& domain) : Responder(), m_finished(false),
+-	m_domain(domain), m_type(type)
+-	{};
++	QueryPrivate(const QString& type, const QString& domain) : m_finished(false), m_browser(0),
++	m_running(false), m_domain(domain), m_type(type) {}
++
+ 	bool m_finished;
++	BrowserType m_browserType;
++	void* m_browser;
++	bool m_running;
+ 	QString m_domain;
+ 	QTimer timeout;
+ 	QString m_type;
+@@ -56,12 +76,18 @@
+ 
+ Query::~Query()
+ {
++	if (d->m_browser) {
++	    switch (d->m_browserType) {
++		case Services: avahi_service_browser_free((AvahiServiceBrowser*)d->m_browser); break;
++		case Types: avahi_service_type_browser_free((AvahiServiceTypeBrowser*)d->m_browser); break;
++	    }
++	}		    
+ 	delete d;
+ }
+ 
+ bool Query::isRunning() const
+ {
+-	return d->isRunning();
++	return d->m_running;
+ }
+ 
+ bool Query::isFinished() const
+@@ -76,16 +102,31 @@
+ 
+ void Query::startQuery()
+ {
+-	if (d->isRunning()) return;
++	if (d->m_running) return;
+ 	d->m_finished = false;
+-#ifdef HAVE_DNSSD
+-	DNSServiceRef ref;
+-	if (DNSServiceBrowse(&ref,0,0, d->m_type.ascii(), 
+-	    domainToDNS(d->m_domain),query_callback,reinterpret_cast<void*>(this))
+-		   == kDNSServiceErr_NoError) d->setRef(ref);
++	if (d->m_type=="_services._dns-sd._udp") {
++	    d->m_browserType = Types;
++#ifdef AVAHI_API_0_6
++	    d->m_browser = avahi_service_type_browser_new(Responder::self().client(), AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC,
++		domainToDNS(d->m_domain), (AvahiLookupFlags)0, types_callback, this);
++#else
++	    d->m_browser = avahi_service_type_browser_new(Responder::self().client(), AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC,
++		d->m_domain.utf8(), types_callback, this);
+ #endif
+-	if (!d->isRunning()) emit finished();
+-		else d->timeout.start(domainIsLocal(d->m_domain) ? TIMEOUT_LAN : TIMEOUT_WAN,true);
++	} else {
++	    d->m_browserType = Services;
++#ifdef AVAHI_API_0_6
++	    d->m_browser = avahi_service_browser_new(Responder::self().client(), AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC,
++	    d->m_type.ascii(),domainToDNS(d->m_domain),  (AvahiLookupFlags)0, services_callback,this);
++#else
++	    d->m_browser = avahi_service_browser_new(Responder::self().client(), AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC,
++	    d->m_type.ascii(),d->m_domain.utf8(),services_callback,this);
++#endif
++	}
++	if (d->m_browser) {
++		d->m_running=true;
++		d->timeout.start(TIMEOUT_LAN,true);
++	} else emit finished();
+ }
+ void Query::virtual_hook(int, void*)
+ {
+@@ -93,24 +134,15 @@
+ 
+ void Query::customEvent(QCustomEvent* event)
+ {
+-	if (event->type()==QEvent::User+SD_ERROR) {
+-		d->stop();
+-		d->m_finished=false;
+-		emit finished();
+-	}
+ 	if (event->type()==QEvent::User+SD_ADDREMOVE) {
+-		RemoteService* svr;
++		d->timeout.start(TIMEOUT_LAN,true);
++		d->m_finished=false;
+ 		AddRemoveEvent *aev = static_cast<AddRemoveEvent*>(event);
+ 		// m_type has useless trailing dot
+-		QString type=aev->m_type.left(aev->m_type.length()-1);
+-		// label is badly splitted here - _http   _tcp.local. . - rely on decode()
+-		if (d->m_type=="_services._dns-sd._udp") svr = new RemoteService(aev->m_name+"."+
+-			type+"."+aev->m_domain);
+-		else svr = new RemoteService(aev->m_name, type, aev->m_domain);
++		RemoteService*  svr = new RemoteService(aev->m_name,
++		    	aev->m_type,aev->m_domain);
+ 		if (aev->m_op==AddRemoveEvent::Add) emit serviceAdded(svr);
+ 			else emit serviceRemoved(svr);
+-		d->m_finished = aev->m_last;
+-		if (d->m_finished) emit finished();
+ 	}
+ }
+ 
+@@ -119,22 +151,36 @@
+ 	d->m_finished=true;
+ 	emit finished();
+ }
+-#ifdef HAVE_DNSSD
+-void query_callback (DNSServiceRef, DNSServiceFlags flags, uint32_t, DNSServiceErrorType errorCode,
+-		     const char *serviceName, const char *regtype, const char *replyDomain,
+-		     void *context)
++
++#ifdef AVAHI_API_0_6
++void services_callback (AvahiServiceBrowser*, AvahiIfIndex, AvahiProtocol, AvahiBrowserEvent event, 
++    const char* serviceName, const char* regtype, const char* replyDomain, AvahiLookupResultFlags, void* context)
++#else
++void services_callback (AvahiServiceBrowser*, AvahiIfIndex, AvahiProtocol, AvahiBrowserEvent event, 
++    const char* serviceName, const char* regtype, const char* replyDomain, void* context)
++#endif
+ {
+ 	QObject *obj = reinterpret_cast<QObject*>(context);
+-	if (errorCode != kDNSServiceErr_NoError) {
+-		ErrorEvent err;
+-		QApplication::sendEvent(obj, &err);
+-	} else {
+-		AddRemoveEvent arev((flags & kDNSServiceFlagsAdd) ? AddRemoveEvent::Add :
++	AddRemoveEvent* arev = new AddRemoveEvent((event==AVAHI_BROWSER_NEW) ? AddRemoveEvent::Add :
+ 			AddRemoveEvent::Remove, QString::fromUtf8(serviceName), regtype, 
+-			DNSToDomain(replyDomain), !(flags & kDNSServiceFlagsMoreComing));
+-		QApplication::sendEvent(obj, &arev);
+-	}
++			DNSToDomain(replyDomain));
++		QApplication::postEvent(obj, arev);
+ }
++
++#ifdef AVAHI_API_0_6
++void types_callback(AvahiServiceTypeBrowser*, AvahiIfIndex, AvahiProtocol, AvahiBrowserEvent event, const char* regtype,
++    const char* replyDomain, AvahiLookupResultFlags, void* context)
++#else
++void types_callback(AvahiServiceTypeBrowser*, AvahiIfIndex, AvahiProtocol, AvahiBrowserEvent event, const char* regtype,
++    const char* replyDomain, void* context)
+ #endif
++{
++	QObject *obj = reinterpret_cast<QObject*>(context);
++	AddRemoveEvent* arev = new AddRemoveEvent((event==AVAHI_BROWSER_NEW) ? AddRemoveEvent::Add :
++			AddRemoveEvent::Remove, QString::null, regtype, 
++			DNSToDomain(replyDomain));
++		QApplication::postEvent(obj, arev);
++}
++
+ }
+ #include "query.moc"
+--- kde.orig/dnssd/README	2006-02-01 21:14:02.000000000 -0500
++++ kde.patched/dnssd/README	2005-09-01 08:58:05.000000000 -0400
+@@ -1,12 +1,11 @@
+ Checklist to ensure that zeroconf will work:
+ 
+-1) Install Apple's mdnsd, at least version 85
+-2) kdelibs (and kdebase for ksysguard) should be configured and compiled with dns_sd sdk (part
+-of mdnsd installation) present - config.h should contain '#define HAVE_DNSSD 1'
++1) Install Avahi, at least version 0.3
++2) compile kdnssd-avahi and install it to replace 'stub' libkdnssd.so provided by kdelibs
+ 3) check /etc/nsswitch.conf and ensure that there is 'mdns' before 'dns' in
+ line starting with 'host:'. It should be something like:
+ host: files mdns dns
+-4) ensure that mdnsd is being started in initscripts
++4) ensure that avahi-daemon is being started in initscripts
+ 5) for testing: use kpf kicker applet to publish a directory, then open 'zeroconf:/'
+ URL in konqueror. You should be able to see a local webserver with that published dir.
+ 
+--- kde.orig/dnssd/remoteservice.cpp	2006-02-01 21:14:02.000000000 -0500
++++ kde.patched/dnssd/remoteservice.cpp	2005-12-15 15:28:03.000000000 -0500
+@@ -27,33 +27,39 @@
+ #include <sys/types.h>
+ #endif
+ #include <netinet/in.h>
++#include <avahi-client/client.h>
++#include <avahi-common/strlst.h>
++#ifdef AVAHI_API_0_6
++#include <avahi-client/lookup.h>
++#endif
+ #include "remoteservice.h"
+ #include "responder.h"
+ #include "sdevent.h"
+-#include <kdebug.h>
+ 
+ namespace DNSSD
+ {
+-#ifdef HAVE_DNSSD
+-void resolve_callback    (    DNSServiceRef,
+-				DNSServiceFlags,
+-				uint32_t,
+-				DNSServiceErrorType                 errorCode,
+-				const char*,
+-				const char                          *hosttarget,
+-				uint16_t                            port,
+-				uint16_t                            txtLen,
+-				const unsigned char                 *txtRecord,
+-				void                                *context
+-			 );
+-
++#ifdef AVAHI_API_0_6
++void resolve_callback(AvahiServiceResolver*, AvahiIfIndex, AvahiProtocol proto, AvahiResolverEvent e,
++    const char* name, const char* type, const char* domain, const char* hostname, const AvahiAddress* a,
++    uint16_t port, AvahiStringList* txt, AvahiLookupResultFlags, void* context);
++#else
++void resolve_callback(AvahiServiceResolver*, AvahiIfIndex, AvahiProtocol proto, AvahiResolverEvent e,
++    const char* name, const char* type, const char* domain, const char* hostname, const AvahiAddress* a,
++    uint16_t port, AvahiStringList* txt, void* context);
+ #endif
++
+ class RemoteServicePrivate : public Responder
+ {
+ public:
+-	RemoteServicePrivate() : Responder(), m_resolved(false)
+-	{};
++	RemoteServicePrivate() :  m_resolved(false), m_running(false), m_resolver(0) {}
+ 	bool m_resolved;
++	bool m_running;
++	AvahiServiceResolver* m_resolver;
++	void stop() {
++	    m_running = false;
++	    if (m_resolver) avahi_service_resolver_free(m_resolver);
++	    m_resolver=0;
++	}
+ };
+ 
+ RemoteService::RemoteService(const QString& label)
+@@ -83,29 +89,33 @@
+ 
+ RemoteService::~RemoteService()
+ {
++	if (d->m_resolver) avahi_service_resolver_free(d->m_resolver);
+ 	delete d;
+ }
+ 
+ bool RemoteService::resolve()
+ {
+ 	resolveAsync();
+-	while (d->isRunning() && !d->m_resolved) d->process();
++	while (d->m_running && !d->m_resolved) Responder::self().process();
+ 	d->stop();
+ 	return d->m_resolved;
+ }
+ 
+ void RemoteService::resolveAsync()
+ {
+-	if (d->isRunning()) return;
++	if (d->m_running) return;
+ 	d->m_resolved = false;
+-	kdDebug() << this << ":Starting resolve of : " << m_serviceName << " " << m_type << " " << m_domain << "\n";
+-#ifdef HAVE_DNSSD
+-	DNSServiceRef ref;
+-	if (DNSServiceResolve(&ref,0,0,m_serviceName.utf8(), m_type.ascii(), 
+-		domainToDNS(m_domain),(DNSServiceResolveReply)resolve_callback,reinterpret_cast<void*>(this))
+-		== kDNSServiceErr_NoError) d->setRef(ref);
++	// FIXME: first protocol should be set?
++#ifdef AVAHI_API_0_6
++	d->m_resolver = avahi_service_resolver_new(Responder::self().client(),AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC,
++	    m_serviceName.utf8(), m_type.ascii(), domainToDNS(m_domain), AVAHI_PROTO_UNSPEC, AVAHI_LOOKUP_NO_ADDRESS,
++	    resolve_callback, this);
++#else
++	d->m_resolver = avahi_service_resolver_new(Responder::self().client(),AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC,
++	    m_serviceName.utf8(), m_type.ascii(), m_domain.utf8(), AVAHI_PROTO_UNSPEC, resolve_callback, this);
+ #endif
+-	if (!d->isRunning()) emit resolved(false);
++	if (d->m_resolver) d->m_running=true;
++	    else  emit resolved(false);
+ }
+ 
+ bool RemoteService::isResolved() const
+@@ -154,42 +164,33 @@
+ 	return s;
+ }
+ 
+-
+-#ifdef HAVE_DNSSD
+-void resolve_callback    (    DNSServiceRef,
+-			      DNSServiceFlags,
+-			      uint32_t,
+-			      DNSServiceErrorType                 errorCode,
+-			      const char*,
+-			      const char                          *hosttarget,
+-			      uint16_t                            port,
+-			      uint16_t                            txtLen,
+-			      const unsigned char                 *txtRecord,
+-			      void                                *context
+-			 )
++#ifdef AVAHI_API_0_6
++void resolve_callback(AvahiServiceResolver*, AvahiIfIndex, AvahiProtocol, AvahiResolverEvent e,
++    const char*, const char*, const char*, const char* hostname, const AvahiAddress*,
++    uint16_t port, AvahiStringList* txt, AvahiLookupResultFlags, void* context)
++#else
++void resolve_callback(AvahiServiceResolver*, AvahiIfIndex, AvahiProtocol, AvahiResolverEvent e,
++    const char*, const char*, const char*, const char* hostname, const AvahiAddress*,
++    uint16_t port, AvahiStringList* txt, void* context)
++#endif
+ {
+ 	QObject *obj = reinterpret_cast<QObject*>(context);
+-	if (errorCode != kDNSServiceErr_NoError) {
++	if (e != AVAHI_RESOLVER_FOUND) {
+ 		ErrorEvent err;
+ 		QApplication::sendEvent(obj, &err);	
+ 		return;
+ 	}
+-	char key[256];
+-	int index=0;
+-	unsigned char valueLen;
+-	kdDebug() << "Resolve callback\n";
+ 	QMap<QString,QString> map;
+-        const void *voidValue = 0;
+-	while (TXTRecordGetItemAtIndex(txtLen,txtRecord,index++,256,key,&valueLen,
+-		&voidValue) == kDNSServiceErr_NoError)  
+-        {
+-		if (voidValue) map[QString::fromUtf8(key)]=QString::fromUtf8((const char*)voidValue,valueLen);
+-			else map[QString::fromUtf8(key)]=QString::null;
+-        }
+-	ResolveEvent rev(DNSToDomain(hosttarget),ntohs(port),map);
++	while (txt) {
++	    char *key, *value;
++	    size_t size;
++	    if (avahi_string_list_get_pair(txt,&key,&value,&size)) break;
++	    map[QString::fromUtf8(key)]=(value) ? QString::fromUtf8(value) : QString::null;
++	    txt = txt->next;
++	}
++	ResolveEvent rev(DNSToDomain(hostname),port,map);
+ 	QApplication::sendEvent(obj, &rev);
+ }
+-#endif
+ 
+ 
+ }
+--- kde.orig/dnssd/responder.cpp	2006-02-01 21:14:02.000000000 -0500
++++ kde.patched/dnssd/responder.cpp	2005-12-15 15:28:03.000000000 -0500
+@@ -20,62 +20,61 @@
+ 
+ #include "responder.h"
+ #include <qapplication.h>
++#include <qeventloop.h>
++#include <kstaticdeleter.h>
+ #include <kidna.h>
++#include <kdebug.h>
++#include <avahi-qt3/qt-watch.h>
+ 
+-// dns_sd.h API should care about proper encoding of non-latin1 characters
+-// but for now it does not
+-#define IDN_BROKEN_IN_MDNSRESPONDER
+ 
+ namespace DNSSD
+ {
+ 
+-Responder::Responder(DNSServiceRef ref,QObject *parent, const char *name)
+-		: QObject(parent, name), m_ref(0), m_socket(0)
++static KStaticDeleter<Responder> responder_sd;
++Responder* Responder::m_self = 0;
++
++void client_callback(AvahiClient *, AvahiClientState s, void* u) 
+ {
+-	setRef(ref);
++    Responder *r = reinterpret_cast<Responder*>(u);    
++    emit (r->stateChanged(s));
+ }
+- 
+-void Responder::setRef(DNSServiceRef ref)
++
++
++Responder::Responder()
+ {
+-	if (m_socket || m_ref) stop();	
+-	m_running = false;
+-	m_ref = ref;
+-	if (m_ref == 0 ) return;
+-#ifdef HAVE_DNSSD
+-	int fd = DNSServiceRefSockFD(ref);
+-	if (fd == -1) return;
+-	m_socket = new QSocketNotifier(fd,QSocketNotifier::Read,this);
+-	connect(m_socket,SIGNAL(activated(int)),this,SLOT(process()));
+-	m_running = true;
++    int error;
++    const AvahiPoll* poll = avahi_qt_poll_get();
++#ifdef AVAHI_API_0_6
++    m_client = avahi_client_new(poll, AVAHI_CLIENT_IGNORE_USER_CONFIG,client_callback, this,  &error);
++#else
++    m_client = avahi_client_new(poll, client_callback, this,  &error);
+ #endif
++    if (!m_client) kdWarning() << "Failed to create avahi client" << endl;
+ }
++ 
+ Responder::~Responder()
+ {
+-	stop();
++    if (m_client) avahi_client_free(m_client);
+ }
+ 
+-void Responder::stop()
++Responder& Responder::self()
+ {
+-	if (m_socket) delete m_socket;
+-	m_socket = 0;
+-#ifdef HAVE_DNSSD
+-	if (m_ref) DNSServiceRefDeallocate(m_ref);
+-#endif
+-	m_ref = 0;
+-	m_running = false;
+-}	
+-
++    if (!m_self) responder_sd.setObject(m_self, new Responder);
++    return *m_self;
++}
+ 
+ void Responder::process()
+ {
+-#ifdef HAVE_DNSSD
+-	if ( DNSServiceProcessResult(m_ref) != kDNSServiceErr_NoError) stop();
+-#endif
++    qApp->eventLoop()->processEvents(QEventLoop::ExcludeUserInput);
+ }
+ 
+-bool Responder::isRunning() const
++AvahiClientState Responder::state() const
+ {
+-	return m_running;
++#ifdef AVAHI_API_0_6
++	return (m_client) ? (avahi_client_get_state(m_client)) : AVAHI_CLIENT_FAILURE;
++#else
++	return (m_client) ? (avahi_client_get_state(m_client)) : AVAHI_CLIENT_DISCONNECTED;
++#endif
+ }
+ 
+ bool domainIsLocal(const QString& domain)
+@@ -85,22 +84,14 @@
+ 
+ QCString domainToDNS(const QString &domain)
+ {
+-#ifdef IDN_BROKEN_IN_MDNSRESPONDER
+ 	if (domainIsLocal(domain)) return domain.utf8();
+ 		else return KIDNA::toAsciiCString(domain);
+-#else
+-	return domain.utf8();       
+-#endif
+ }
+ 
+ QString DNSToDomain(const char* domain)
+ {
+-#ifdef IDN_BROKEN_IN_MDNSRESPONDER
+ 	if (domainIsLocal(domain)) return QString::fromUtf8(domain);
+ 		else return KIDNA::toUnicode(domain);
+-#else
+-	return QString::fromUtf8(domain);
+-#endif
+ }
+ 
+ 
+--- kde.orig/dnssd/responder.h	2006-02-01 21:14:02.000000000 -0500
++++ kde.patched/dnssd/responder.h	2005-12-15 15:28:03.000000000 -0500
+@@ -25,12 +25,7 @@
+ #include <qsocketnotifier.h>
+ #include <qsignal.h>
+ #include <config.h>
+-#ifdef HAVE_DNSSD
+-#include <dns_sd.h>
+-#else
+-#define DNSServiceRef void*
+-#endif
+-
++#include <avahi-client/client.h>
+ namespace DNSSD
+ {
+ 
+@@ -38,30 +33,28 @@
+ This class should not be used directly.
+  
+ @author Jakub Stachowski
+-@short Internal class wrapping dns_sd.h interface
++@short Internal class wrapping avahi client
+  */
+ class Responder : public QObject
+ {
+ 	Q_OBJECT
+ 
+ public:
+-	Responder(DNSServiceRef ref=0,QObject *parent = 0, const char *name = 0);
++	Responder();
+ 
+ 	~Responder();
+ 
+-	/**
+-	Returns true if it is possible to use mDNS service publishing and discovery. 
+-	It needs mDNSResponder running.
+-	 */
+-	bool isRunning() const;
+-	void setRef(DNSServiceRef ref);
+-	void stop();
+-public slots:
++	static Responder& self();
++	AvahiClientState state() const;
++	AvahiClient* client() const { return m_client; }
+ 	void process();
+-protected:
+-	DNSServiceRef m_ref;
+-	bool m_running;
+-	QSocketNotifier *m_socket;
++signals:
++	void stateChanged(AvahiClientState);
++private:
++	AvahiClient* m_client;
++	static Responder* m_self;
++	friend void client_callback(AvahiClient*, AvahiClientState, void*);
++
+ };
+ 
+ /* Utils functions */
+@@ -71,6 +64,7 @@
+ QCString domainToDNS(const QString &domain);
+ QString DNSToDomain(const char* domain);
+ 
++
+ }
+ 
+ #endif
+--- kde.orig/dnssd/sdevent.h	2006-02-01 21:14:02.000000000 -0500
++++ kde.patched/dnssd/sdevent.h	2005-10-14 05:00:19.000000000 -0400
+@@ -41,24 +41,23 @@
+ public:
+ 	enum Operation { Add, Remove };
+ 	AddRemoveEvent(Operation op,const QString& name,const QString& type,
+-		const QString& domain, bool last) : QCustomEvent(QEvent::User+SD_ADDREMOVE),
+-	m_op(op), m_name(name), m_type(type), m_domain(domain), m_last(last) 
++		const QString& domain) : QCustomEvent(QEvent::User+SD_ADDREMOVE),
++	m_op(op), m_name(name), m_type(type), m_domain(domain) 
+ 	{}
+ 
+ 	const Operation m_op;
+ 	const QString m_name;
+ 	const QString m_type;
+ 	const QString m_domain;
+-	const bool m_last;
+ };
+ 
+ class PublishEvent : public QCustomEvent
+ {
+ public:
+-	PublishEvent(const QString& name) : QCustomEvent(QEvent::User+SD_PUBLISH), m_name(name)
++	PublishEvent(bool ok) : QCustomEvent(QEvent::User+SD_PUBLISH), m_ok(ok)
+ 	{}
+ 
+-	const QString m_name;
++	bool m_ok;
+ };
+ 
+ class ResolveEvent : public QCustomEvent
+--- kde.orig/dnssd/servicebase.cpp	2006-02-01 21:14:02.000000000 -0500
++++ kde.patched/dnssd/servicebase.cpp	2005-10-14 05:00:19.000000000 -0400
+@@ -34,7 +34,7 @@
+ 
+ QString ServiceBase::encode()
+ {
+-	return  m_serviceName.replace("\\","\\\\").replace(".","\\.") + QString(".") + m_type +
++	return  m_serviceName.replace(".","\\.").replace("\\","\\\\") + QString(".") + m_type +
+ 			 QString(".") + m_domain;
+ }
+ 
+--- kde.orig/dnssd/servicebrowser.cpp	2006-02-01 21:14:02.000000000 -0500
++++ kde.patched/dnssd/servicebrowser.cpp	2005-11-18 15:34:40.000000000 -0500
+@@ -23,14 +23,11 @@
+ #include <qstringlist.h>
+ #include <qfile.h>
+ #include "domainbrowser.h"
++#include "responder.h"
+ #include "query.h"
+ #include "servicebrowser.h"
++#include <avahi-client/client.h>
+ #include <config.h>
+-#ifdef HAVE_DNSSD
+-#include <dns_sd.h>
+-#endif
+-
+-#define MDNSD_PID "/var/run/mdnsd.pid"
+ 
+ namespace DNSSD
+ {
+@@ -85,20 +82,12 @@
+ 
+ const ServiceBrowser::State ServiceBrowser::isAvailable()
+ {
+-#ifdef HAVE_DNSSD
+-	QFile f(MDNSD_PID);
+-	if (!f.open(IO_ReadOnly)) return Stopped; // no pidfile
+-	QString line;
+-	if (f.readLine(line,16)<1) return Stopped;
+-	unsigned int pid = line.toUInt();
+-	if (pid==0) return Stopped;           // not a pid
+-	return (kill(pid,0)==0 || errno==EPERM) ? Working : Stopped; 
+-	// signal 0 only checks if process is running, mdnsd is probably owned by 'nobody' so we will
+-	// get EPERM, if mdnsd is not running error will be ESRCH
+-	
++	AvahiClientState s = Responder::self().state();
++#ifdef AVAHI_API_0_6
++	return (s==AVAHI_CLIENT_FAILURE) ? Stopped : Working;
+ #else
+-	return Unsupported;
+-#endif
++	return (s==AVAHI_CLIENT_S_INVALID || s==AVAHI_CLIENT_DISCONNECTED) ? Stopped : Working;
++#endif 
+ }
+ ServiceBrowser::~ ServiceBrowser()
+ {
--- kdelibs-3.5.7.orig/debian/patches/15_dcopidlng_jfs-patch.diff
+++ kdelibs-3.5.7/debian/patches/15_dcopidlng_jfs-patch.diff
@@ -0,0 +1,22 @@
+--- kdelibs.orig/dcop/dcopidlng/dcopidlng
++++ kdelibs/dcop/dcopidlng/dcopidlng
+@@ -1,15 +1,16 @@
+ #!/bin/sh
+ 
+-trap "rm -f dcopidlng.stderr.$$" 0 1 2 15
++tmpfile=`mktemp -t dcopidlng.XXXXXX` || { echo "$0: Cannot create temporary file" >&2; exit 1;  }
++trap " [ -f \"$tmpfile\" ] && /bin/rm -f -- \"$tmpfile\"" 0 1 2 3 13 15
+ 
+ if test -z "$KDECONFIG"; then
+     KDECONFIG=kde-config
+ fi
+ LIBDIR="`$KDECONFIG --install data --expandvars`/dcopidlng"
+-perl -I"$LIBDIR" "$LIBDIR/kalyptus" --allow_k_dcop_accessors -f dcopidl $1 2> dcopidlng.stderr.$$
++perl -I"$LIBDIR" "$LIBDIR/kalyptus" --allow_k_dcop_accessors -f dcopidl $1 2> $tmpfile
+ RET=$?
+ if [ $RET -ne 0 ]
+ then
+-   cat dcopidlng.stderr.$$ >&2
++   cat $tmpfile >&2
+ fi
+ exit $RET
--- kdelibs-3.5.7.orig/debian/patches/kubuntu_03_applications_menu_entries_move.diff
+++ kdelibs-3.5.7/debian/patches/kubuntu_03_applications_menu_entries_move.diff
@@ -0,0 +1,95 @@
+--- kdelibs/kded/applications.menu	2006-05-04 12:08:56.000000000 -0400
++++ kdelibs/kded/applications.menu	2006-05-04 12:09:13.000000000 -0400
+@@ -248,6 +248,7 @@
+ 			<And>
+ 			<Category>Graphics</Category>
+ 			<Not><Category>X-KDE-More</Category></Not>
++			<Not><Filename>ooo-draw.desktop</Filename></Not>
+ 			</And>
+ 		</Include>
+ 		<Menu>
+@@ -376,74 +377,20 @@
+ 		<Name>Utilities</Name>
+ 		<Directory>kde-utilities.directory</Directory>
+ 		<Include>
+-			<And>
++                      <And>
++			<Or>
+ 			<Category>Utility</Category>
+-			<Not><Category>Accessibility</Category></Not>
+-			<Not><Category>X-KDE-Utilities-Desktop</Category></Not>
+-			<Not><Category>X-KDE-Utilities-File</Category></Not>
+-			<Not><Category>X-KDE-Utilities-Peripherals</Category></Not>
+-			<Not><Category>X-KDE-Utilities-PIM</Category></Not>
++                        <Category>TextEditor</Category>
++                        <Category>X-KDE-Utilities-File</Category>
++			<Category>X-KDE-Utilities-Desktop</Category>
++			<Category>X-KDE-Utilities-Peripherals</Category>
++			<Category>X-KDE-Utilities-PIM</Category>
++			<Category>Accessibility</Category>
++			</Or>
+ 			<Not><Category>X-KDE-More</Category></Not>
+-			</And>
++                     </And>
+ 		</Include>
+ 		<Menu>
+-			<Name>Accessibility</Name>
+-			<Directory>kde-utilities-accessibility.directory</Directory>
+-			<Include>
+-				<And>
+-				<Category>Utility</Category>
+-				<Category>Accessibility</Category>
+-				</And>
+-			</Include>
+-		</Menu>
+-		<Menu>
+-			<Name>Desktop</Name>
+-			<Directory>kde-utilities-desktop.directory</Directory>
+-			<Include>
+-				<And>
+-				<Category>Utility</Category>
+-				<Category>X-KDE-Utilities-Desktop</Category>
+-				</And>
+-			</Include>
+-		</Menu>
+-                <Menu>
+-                        <Name>Editors</Name>
+-                        <Directory>kde-editors.directory</Directory>
+-                        <Include>
+-                                <Category>TextEditor</Category>
+-                        </Include>
+-                </Menu>
+-		<Menu>
+-			<Name>File</Name>
+-			<Directory>kde-utilities-file.directory</Directory>
+-			<Include>
+-				<And>
+-				<Category>Utility</Category>
+-				<Category>X-KDE-Utilities-File</Category>
+-				</And>
+-			</Include>
+-		</Menu>
+-		<Menu>
+-			<Name>Peripherals</Name>
+-			<Directory>kde-utilities-peripherals.directory</Directory>
+-			<Include>
+-				<And>
+-				<Category>Utility</Category>
+-				<Category>X-KDE-Utilities-Peripherals</Category>
+-				</And>
+-			</Include>
+-		</Menu>
+-		<Menu>
+-			<Name>PIM</Name>
+-			<Directory>kde-utilities-pim.directory</Directory>
+-			<Include>
+-				<And>
+-				<Category>Utility</Category>
+-				<Category>X-KDE-Utilities-PIM</Category>
+-				</And>
+-			</Include>
+-		</Menu>
+-		<Menu>
+ 			<Name>XUtilities</Name>
+ 			<Directory>kde-utilities-xutils.directory</Directory>
+ 		</Menu>
--- kdelibs-3.5.7.orig/debian/patches/kubuntu_04_add_langpack_path.diff
+++ kdelibs-3.5.7/debian/patches/kubuntu_04_add_langpack_path.diff
@@ -0,0 +1,11 @@
+--- kdelibs/kdecore/kstandarddirs.cpp	2005-07-04 11:48:07.427260976 +0000
++++ kdelibs/kdecore/kstandarddirs.cpp	2005-07-04 11:51:53.685864440 +0000
+@@ -1416,6 +1416,8 @@
+     }
+ 
+     addResourceDir("home", QDir::homeDirPath());
++
++    addResourceDir("locale", "/usr/share/locale-langpack/", true);
+ }
+ 
+ void KStandardDirs::checkConfig() const
--- kdelibs-3.5.7.orig/debian/patches/kubuntu_05_icon_scale.diff
+++ kdelibs-3.5.7/debian/patches/kubuntu_05_icon_scale.diff
@@ -0,0 +1,11 @@
+--- kdelibs/kdecore/kicontheme.cpp	2005-07-04 15:15:19.000000000 +0000
++++ kdelibs/kdecore/kicontheme.cpp	2005-07-04 16:05:36.130701072 +0000
+@@ -390,7 +390,7 @@
+              it's a downscale, and we only had upscales befores.
+              This is to avoid scaling up unless we have to,
+              since that looks very ugly */
+-          if ((abs(dw) >= abs(delta)) ||
++          if (/*(abs(dw) >= abs(delta)) ||*/
+               (delta > 0 && dw < 0))
+             continue;
+         }
--- kdelibs-3.5.7.orig/debian/patches/kubuntu_06_kwallet_simplify_string.diff
+++ kdelibs-3.5.7/debian/patches/kubuntu_06_kwallet_simplify_string.diff
@@ -0,0 +1,21 @@
+--- kdelibs/khtml/html/html_formimpl.cpp~	2005-12-15 14:31:48.000000000 +0000
++++ kdelibs/khtml/html/html_formimpl.cpp	2005-12-15 14:33:38.000000000 +0000
+@@ -611,17 +611,7 @@
+ 
+                 bool checkboxResult = false;
+                 const int savePassword = KMessageBox::createKMessageBox(dialog, QMessageBox::Information,
+-                                                                            formUrl.host().isEmpty() ? // e.g. local file
+-                                                                            i18n("Konqueror has the ability to store the password "
+-                                                                                 "in an encrypted wallet. When the wallet is unlocked, it "
+-                                                                                 "can then automatically restore the login information "
+-                                                                                 "next time you submit this form. Do you want to store "
+-                                                                                 "the information now?") :
+-                                                                            i18n("Konqueror has the ability to store the password "
+-                                                                                 "in an encrypted wallet. When the wallet is unlocked, it "
+-                                                                                 "can then automatically restore the login information "
+-                                                                                 "next time you visit %1. Do you want to store "
+-                                                                                 "the information now?").arg(formUrl.host()),
++									i18n("Store passwords on this page?"),
+                                                                             QStringList(), QString::null, &checkboxResult, KMessageBox::Notify);
+ 
+                 if ( savePassword == KDialogBase::Yes ) {
--- kdelibs-3.5.7.orig/debian/patches/kubuntu_28_fix_sudo.diff
+++ kdelibs-3.5.7/debian/patches/kubuntu_28_fix_sudo.diff
@@ -0,0 +1,17 @@
+--- kdelibs/kdecore/kapplication.cpp	2006-08-01 16:58:45.000000000 +0000
++++ kdelibs/kdecore/kapplication.cpp	2006-08-01 16:58:58.000000000 +0000
+@@ -774,6 +774,14 @@
+ 
+ void KApplication::init(bool GUIenabled)
+ {
++  // stop KDE programs run with sudo changing permissions on ~/.kde and /.ICEauthority
++  int uid = getuid();
++  if (uid == 0) {
++    setenv("ICEAUTHORITY", "/root/.ICEauthority", 0);
++    setenv("KDEROOTHOME", "/root/.kde", 0);
++    setenv("HOME", "/root", 1);
++  }
++
+   d->guiEnabled = GUIenabled;
+   if ((getuid() != geteuid()) ||
+       (getgid() != getegid()))
--- kdelibs-3.5.7.orig/debian/patches/kubuntu_29_quiet_kbuildsycoca.diff
+++ kdelibs-3.5.7/debian/patches/kubuntu_29_quiet_kbuildsycoca.diff
@@ -0,0 +1,11 @@
+--- kdelibs/kded/kbuildservicefactory.cpp	2005-10-10 16:06:29.000000000 +0100
++++ kdelibs/kded/kbuildservicefactory.cpp	2006-01-20 14:44:38.000000000 +0000
+@@ -158,7 +158,7 @@
+          KServiceType::Ptr serviceType = KServiceType::serviceType(*it);
+          if (!serviceType)
+          {
+-           kdWarning() << "'"<< service->desktopEntryPath() << "' specifies undefined mimetype/servicetype '"<< (*it) << "'" << endl;
++           // kdWarning() << "'"<< service->desktopEntryPath() << "' specifies undefined mimetype/servicetype '"<< (*it) << "'" << endl;
+            continue;
+          }
+          serviceTypes.append(serviceType);
--- kdelibs-3.5.7.orig/debian/patches/kubuntu_38_no_generate_kdepot.diff
+++ kdelibs-3.5.7/debian/patches/kubuntu_38_no_generate_kdepot.diff
@@ -0,0 +1,14 @@
+--- kdelibs/Makefile.am.in	2006-06-26 16:14:54.000000000 +0000
++++ kdelibs/Makefile.am.in	2006-06-26 16:16:33.000000000 +0000
+@@ -54,10 +54,8 @@
+ 	find $$dirs -maxdepth 1 -name "*.cc" -print >> files ;\
+ 	find $$dirs -maxdepth 1 -name "*.h" -print >> files ;\
+ 	echo ./kdecore/kde-config.cpp.in >> files ;\
+-	$(EXTRACTRC) `find $$dirs -maxdepth 1 \( -name "*.rc" -o -name "*.ui" \) ` ./dnssd/kcm_kdnssd.kcfg > rc.cpp; \
+-	: > kde.pot ;\
++	$(EXTRACTRC) `find $$dirs -maxdepth 1 \( -name "*.rc" -o -name "*.ui" \) ` ./dnssd/kcm_kdnssd.kcfg > rc.cpp;
+ 	$(XGETTEXT) -ktranslate -x qt-messages.pot rc.cpp `cat files` && cat messages.po qt-messages.pot > $(podir)/kdelibs.pot
+-	$(XGETTEXT) common_texts.cpp -o kde.pot
+ 	rm -f dirs
+ 
+ EXTRA_DIST = admin kde.pot \
--- kdelibs-3.5.7.orig/debian/patches/kubuntu_45_kcmoduleinfo.diff
+++ kdelibs-3.5.7/debian/patches/kubuntu_45_kcmoduleinfo.diff
@@ -0,0 +1,14 @@
+diff -Nur kdelibs-3.5.2/kutils/kcmoduleinfo.cpp kdelibs-3.5.2.new/kutils/kcmoduleinfo.cpp
+--- kdelibs-3.5.2/kutils/kcmoduleinfo.cpp	2005-10-10 17:05:54.000000000 +0200
++++ kdelibs-3.5.2.new/kutils/kcmoduleinfo.cpp	2006-04-24 00:15:08.000000000 +0200
+@@ -53,7 +53,9 @@
+ 
+ KCModuleInfo::KCModuleInfo(const QString& desktopFile)
+ {
+-  init( KService::serviceByStorageId(desktopFile) );
++  KService::Ptr service = KService::serviceByStorageId(desktopFile);
++  if(!service) setName(desktopFile);
++  init(service);
+ }
+ 
+ KCModuleInfo::KCModuleInfo( KService::Ptr moduleInfo )
--- kdelibs-3.5.7.orig/debian/patches/kubuntu_46_lisa_error.diff
+++ kdelibs-3.5.7/debian/patches/kubuntu_46_lisa_error.diff
@@ -0,0 +1,30 @@
+diff -Nur kdelibs-3.5.2/kutils/kcmoduleloader.cpp kdelibs-3.5.2.new/kutils/kcmoduleloader.cpp
+--- kdelibs-3.5.2/kutils/kcmoduleloader.cpp	2005-10-10 17:05:54.000000000 +0200
++++ kdelibs-3.5.2.new/kutils/kcmoduleloader.cpp	2006-04-24 01:31:46.000000000 +0200
+@@ -127,9 +127,23 @@
+ 
+   if ( !mod.service() )
+   {
+-    return reportError( report,
+-        i18n("The module %1 could not be found.")
+-        .arg( mod.moduleName() ), i18n("<qt><p>The diagnostics is:<br>The desktop file %1 could not be found.</qt>").arg(mod.fileName()), parent );
++    if ( mod.moduleName() == "kcmlisa" || mod.moduleName() == "kcmkiolan" )
++    {
++      return reportError( report,
++          i18n("The module %1 could not be found.")
++          .arg( mod.moduleName() ),
++          i18n("<qt><p>The Lisa and lan:/ ioslave modules "
++            "are not installed by default in Kubuntu, because they are obsolete "
++            "and replaced by zeroconf.<br> If you still wish to use them, you "
++            "should install the lisa package from the Universe repository.</p></qt>"),
++          parent );
++    } else { 
++      return reportError( report,
++          i18n("The module %1 could not be found.")
++          .arg( mod.moduleName() ),
++          i18n("<qt><p>The diagnostics is:<br>The desktop file %1 could not be found.</p></qt>").arg(mod.fileName()),
++          parent );
++    }
+   }
+ 
+   if (!mod.library().isEmpty())
--- kdelibs-3.5.7.orig/debian/patches/kubuntu_51_launchpad_integration.diff
+++ kdelibs-3.5.7/debian/patches/kubuntu_51_launchpad_integration.diff
@@ -0,0 +1,127 @@
+--- kdelibs-3.5.3/kdeui/khelpmenu.cpp	2005-10-10 16:06:38.000000000 +0100
++++ kdelibs-3.5.3/kdeui/khelpmenu.cpp	2006-07-12 16:27:47.000000000 +0100
+@@ -41,6 +41,7 @@
+ #include <kpopupmenu.h>
+ #include <kstdaccel.h>
+ #include <kstdaction.h>
++#include <kprocess.h>
+ 
+ #include "config.h"
+ #include <qxembed.h>
+@@ -90,6 +91,8 @@
+     KStdAction::reportBug(this, SLOT(reportBug()), actions);
+     KStdAction::aboutApp(this, SLOT(aboutApplication()), actions);
+     KStdAction::aboutKDE(this, SLOT(aboutKDE()), actions);
++    KStdAction::kubuntuTranslate(this, SLOT(kubuntuTranslate()), actions);
++    KStdAction::kubuntuGetHelpOnline(this, SLOT(kubuntuGetHelpOnline()), actions);
+   }
+ }
+ 
+@@ -150,6 +153,10 @@
+     if (need_separator)
+       mMenu->insertSeparator();
+ 
++    mMenu->insertItem( SmallIcon("launchpad"), i18n( "&Get Help Online" ), this, SLOT(kubuntuGetHelpOnline()) );
++    mMenu->insertItem( SmallIcon("locale"), i18n( "&Translate this Application" ), this, SLOT(kubuntuTranslate()) );
++    mMenu->insertSeparator();
++
+     if (kapp->authorizeKAction("help_about_app"))
+     {
+       mMenu->insertItem( kapp->miniIcon(),
+@@ -219,6 +226,24 @@
+ }
+ 
+ 
++void KHelpMenu::kubuntuGetHelpOnline()
++{
++  const KAboutData *aboutData = KGlobal::instance()->aboutData();
++  QString path = KStandardDirs::findExe( aboutData->appName() );
++  KProcess *proc = new KProcess;
++  *proc << "launchpad-integration" << "--file" << path << "--info";
++  proc->start(KProcess::DontCare);
++}
++
++void KHelpMenu::kubuntuTranslate()
++{
++  const KAboutData *aboutData = KGlobal::instance()->aboutData();
++  QString path = KStandardDirs::findExe( aboutData->appName() );
++  KProcess *proc = new KProcess;
++  *proc << "launchpad-integration" << "--file" << path << "--translate";
++  proc->start(KProcess::DontCare);
++}
++
+ void KHelpMenu::aboutKDE()
+ {
+   if( !mAboutKDE )
+--- kdelibs-3.5.3/kdeui/khelpmenu.h	2005-10-10 16:06:38.000000000 +0100
++++ kdelibs-3.5.3/kdeui/khelpmenu.h	2006-07-12 14:59:03.000000000 +0100
+@@ -218,6 +218,9 @@
+      */
+     void aboutKDE();
+ 
++    void kubuntuTranslate();
++    void kubuntuGetHelpOnline();
++
+     /**
+      * Opens the standard "Report Bugs" dialog box.
+      */
+--- kdelibs-3.5.3/kdeui/kstdaction.cpp	2006-01-19 17:07:18.000000000 +0000
++++ kdelibs-3.5.3/kdeui/kstdaction.cpp	2006-07-12 14:46:03.000000000 +0100
+@@ -315,5 +315,9 @@
+ 	{ return KStdAction::create( AboutApp, name, recvr, slot, parent ); }
+ KAction *aboutKDE( const QObject *recvr, const char *slot, KActionCollection* parent, const char *name )
+ 	{ return KStdAction::create( AboutKDE, name, recvr, slot, parent ); }
++KAction *kubuntuTranslate( const QObject *recvr, const char *slot, KActionCollection* parent, const char *name )
++	{ return KStdAction::create( KubuntuTranslate, name, recvr, slot, parent ); }
++KAction *kubuntuGetHelpOnline( const QObject *recvr, const char *slot, KActionCollection* parent, const char *name )
++	{ return KStdAction::create( KubuntuGetHelpOnline, name, recvr, slot, parent ); }
+ 
+ }
+--- kdelibs-3.5.3/kdeui/kstdaction.h	2005-10-10 16:06:38.000000000 +0100
++++ kdelibs-3.5.3/kdeui/kstdaction.h	2006-07-12 14:46:47.000000000 +0100
+@@ -157,7 +157,8 @@
+ 		ConfigureNotifications,
+ 		FullScreen, ///< @since 3.2
+ 		Clear, ///< @since 3.2
+-        PasteText ///< @since 3.2
++		PasteText, ///< @since 3.2
++		KubuntuGetHelpOnline, KubuntuTranslate
+ 	};
+ 
+ 	/**
+@@ -601,6 +602,12 @@
+ 	*/
+ 	KDEUI_EXPORT KAction *aboutKDE(const QObject *recvr, const char *slot,
+ 				KActionCollection* parent, const char *name = 0 );
++
++	KDEUI_EXPORT KAction *kubuntuTranslate(const QObject *recvr, const char *slot,
++				KActionCollection* parent, const char *name = 0 );
++
++	KDEUI_EXPORT KAction *kubuntuGetHelpOnline(const QObject *recvr, const char *slot,
++				KActionCollection* parent, const char *name = 0 );
+ }
+ 
+ #endif // KSTDACTION_H
+--- kdelibs-3.5.3/kdeui/kstdaction_p.h	2006-01-19 17:07:18.000000000 +0000
++++ kdelibs-3.5.3/kdeui/kstdaction_p.h	2006-07-12 16:34:50.000000000 +0100
+@@ -111,6 +111,8 @@
+ 	{ ReportBug,     KStdAccel::AccelNone, "help_report_bug", I18N_NOOP("&Report Bug..."), 0, 0 },
+ 	{ AboutApp,      KStdAccel::AccelNone, "help_about_app", I18N_NOOP("&About %1"), 0, 0 },
+ 	{ AboutKDE,      KStdAccel::AccelNone, "help_about_kde", I18N_NOOP("About &KDE"), 0,"about_kde" },
++	{ KubuntuGetHelpOnline,      KStdAccel::AccelNone, "kubuntu_get_help_online", I18N_NOOP("&Get Help Online"), 0, "launchpad" },
++	{ KubuntuTranslate,      KStdAccel::AccelNone, "kubuntu_translate", I18N_NOOP("&Translate This Application"), 0, "locale" },
+ 	{ ActionNone, KStdAccel::AccelNone, 0, 0, 0, 0 }
+ };
+ 
+--- kdelibs-3.5.3/kdeui/ui_standards.rc	2005-09-10 09:27:48.000000000 +0100
++++ kdelibs-3.5.3/kdeui/ui_standards.rc	2006-07-12 14:44:08.000000000 +0100
+@@ -176,6 +176,9 @@
+     <Separator/>
+     <Action name="help_report_bug"/>
+     <Separator/>
++    <Action name="kubuntu_get_help_online"/>
++    <Action name="kubuntu_translate"/>
++    <Separator/>
+     <MergeLocal name="about_merge"/>
+     <Action name="help_about_app"/>
+     <Action name="help_about_kde"/>
--- kdelibs-3.5.7.orig/debian/patches/kubuntu_53_tabs_hover_close_delaying.diff
+++ kdelibs-3.5.7/debian/patches/kubuntu_53_tabs_hover_close_delaying.diff
@@ -0,0 +1,12 @@
+diff -Nur kdelibs-3.5.3/kdeui/ktabwidget.cpp kdelibs-3.5.3.new/kdeui/ktabwidget.cpp
+--- kdelibs-3.5.3/kdeui/ktabwidget.cpp	2005-11-19 10:06:19.000000000 +0100
++++ kdelibs-3.5.3.new/kdeui/ktabwidget.cpp	2006-07-22 00:14:14.000000000 +0200
+@@ -56,6 +56,8 @@
+     setTabBar( new KTabBar(this, "tabbar") );
+     setAcceptDrops( true );
+ 
++    setHoverCloseButtonDelayed(false);
++
+     connect(tabBar(), SIGNAL(contextMenu( int, const QPoint & )), SLOT(contextMenu( int, const QPoint & )));
+     connect(tabBar(), SIGNAL(mouseDoubleClick( int )), SLOT(mouseDoubleClick( int )));
+     connect(tabBar(), SIGNAL(mouseMiddleClick( int )), SLOT(mouseMiddleClick( int )));
--- kdelibs-3.5.7.orig/debian/patches/kubuntu_55_printer_sharing.diff
+++ kdelibs-3.5.7/debian/patches/kubuntu_55_printer_sharing.diff
@@ -0,0 +1,181 @@
+--- kdelibs-3.5.3/kdeprint/management/kmmainview.h	2005-10-10 16:06:32.000000000 +0100
++++ kdelibs-3.5.3/kdeprint/management/kmmainview.h	2006-07-24 13:37:09.000000000 +0100
+@@ -42,6 +42,7 @@
+ class QBoxLayout;
+ class MessageWindow;
+ class QMenuBar;
++class KToggleAction;
+ 
+ /**
+  * @internal
+@@ -78,6 +79,8 @@
+ 	void slotTest();
+ 	void slotServerRestart();
+ 	void slotServerConfigure();
++	void slotEnableBrowsing();
++	void slotEnableSharing();
+ 	void slotManagerConfigure();
+ 	void slotAddSpecial();
+ 	void slotRefresh();
+@@ -125,6 +128,12 @@
+ 	class KMainWindowPrivate;
+ 	KMainWindowPrivate *d;
+ 	KToolBar *m_menubar;
++	KToggleAction* enableBrowsing;
++	KToggleAction* enableSharing;
++	//check for browsing status and tick/untick enableBrowsing
++	void setBrowsingStatus();
++	//check for sharing status and tick/untick enableSharing
++	void setSharingStatus();
+ };
+ 
+ KDEPRINT_EXPORT int kdeprint_management_add_printer_wizard( QWidget* parent );
+--- new/kdelibs-3.5.3/kdeprint/management/kmmainview.cpp	2005-11-08 22:39:38.000000000 +0000
++++ kdelibs-3.5.3/kdeprint/management/kmmainview.cpp	2006-07-24 14:39:04.000000000 +0100
+@@ -55,6 +55,7 @@
+ #include <ksimpleconfig.h>
+ #include <kstandarddirs.h>
+ #include <kapplication.h>
++#include <qprocess.h>
+ 
+ #undef m_manager
+ #define	m_manager	KMFactory::self()->manager()
+@@ -209,6 +210,11 @@
+ 
+ 	new KAction(i18n("R&estart Server"),"kdeprint_restartsrv",0,this,SLOT(slotServerRestart()),m_actions,"server_restart");
+ 	new KAction(i18n("Configure &Server..."),"kdeprint_configsrv",0,this,SLOT(slotServerConfigure()),m_actions,"server_configure");
++	enableBrowsing = new KToggleAction(i18n("Access Printers on Local Network"),0,this,SLOT(slotEnableBrowsing()),m_actions,"enable_browsing");
++	enableSharing = new KToggleAction(i18n("Share Printers on Local Network"),0,this,SLOT(slotEnableSharing()),m_actions,"enable_sharing");
++
++	setBrowsingStatus();
++	setSharingStatus();
+ 
+ 	KToggleAction	*tact = new KToggleAction(i18n("Show &Toolbar"),0,m_actions,"view_toolbar");
+ 	tact->setCheckedState(i18n("Hide &Toolbar"));
+@@ -258,6 +264,8 @@
+ 	m_toolbar->insertLineSeparator();
+ 	m_actions->action("server_restart")->plug(m_toolbar);
+ 	m_actions->action("server_configure")->plug(m_toolbar);
++	m_actions->action("enable_browsing")->plug(m_toolbar);
++	m_actions->action("enable_sharing")->plug(m_toolbar);
+ 	m_toolbar->insertLineSeparator();
+ 	m_actions->action("manager_configure")->plug(m_toolbar);
+ 	m_actions->action("view_refresh")->plug(m_toolbar);
+@@ -292,6 +300,8 @@
+ 	menu = new QPopupMenu( this );
+ 	m_actions->action("server_restart")->plug( menu );
+ 	m_actions->action("server_configure")->plug( menu );
++	m_actions->action("enable_browsing")->plug( menu );
++	m_actions->action("enable_sharing")->plug( menu );
+ 	//m_menubar->insertItem( i18n( "Server" ), menu );
+ 	m_menubar->insertButton( "misc", 2, true, i18n( "Print Server" ) );
+ 	m_menubar->getButton( 2 )->setPopup( menu, true );
+@@ -323,6 +333,40 @@
+ 	slotPrinterSelected(QString::null);
+ }
+ 
++void KMMainView::setBrowsingStatus() {
++	enableBrowsing->setChecked(false);
++	QProcess browsingStatus(QString("/usr/share/cups/browsing_status"), this, "browsingStatus");
++	browsingStatus.start();
++	while (browsingStatus.isRunning()) {
++		kapp->processEvents();
++	}
++	int exitStatus = browsingStatus.exitStatus();
++	if (exitStatus == 0) { // disabled
++		enableBrowsing->setChecked(false);
++	} else if (exitStatus == 1) { // enabled
++		enableBrowsing->setChecked(true);
++	} else if (exitStatus == 2) { // custom setup
++		enableBrowsing->setEnabled(false);
++	}
++}
++
++void KMMainView::setSharingStatus() {
++	enableSharing->setChecked(false);
++	QProcess sharingStatus(QString("/usr/share/cups/sharing_status"), this, "sharingStatus");
++	sharingStatus.start();
++	while (sharingStatus.isRunning()) {
++		kapp->processEvents();
++	}
++	int exitStatus = sharingStatus.exitStatus();
++	if (exitStatus == 0) { // disabled
++		enableSharing->setChecked(false);
++	} else if (exitStatus == 1) { // enabled
++		enableSharing->setChecked(true);
++	} else if (exitStatus == 2) { // custom setup
++		enableSharing->setEnabled(false);
++	}
++}
++
+ void KMMainView::slotRefresh()
+ {
+ 	// TODO: remove me
+@@ -477,6 +521,8 @@
+ 		m_pop->insertSeparator();
+ 		m_actions->action("server_restart")->plug(m_pop);
+ 		m_actions->action("server_configure")->plug(m_pop);
++		m_actions->action("enable_browsing")->plug(m_pop);
++		m_actions->action("enable_sharing")->plug(m_pop);
+ 		m_pop->insertSeparator();
+ 		m_actions->action("manager_configure")->plug(m_pop);
+ 		m_actions->action("view_refresh")->plug(m_pop);
+@@ -691,6 +737,58 @@
+ 	}
+ }
+ 
++void KMMainView::slotEnableBrowsing()
++{
++	setCursor(QCursor(Qt::BusyCursor));
++	
++	QString scaryMessage = i18n("Enabling local browsing for printers will open a network port (631) on your computer.  If security problems are discovered in the print server, remote attackers could access your computer as the \"cupsys\" user.");
++
++	if (enableBrowsing->isChecked()) {
++		if (KMessageBox::warningYesNo( this, scaryMessage, i18n("Access Printers on Local Network"), KGuiItem(i18n("Enable Browsing")), KGuiItem(i18n("Don't Enable Browsing")) ) == KMessageBox::Yes) {
++			KProcess *proc = new KProcess;
++			*proc << "kdesu";
++	        	*proc << "/usr/share/cups/enable_browsing 1";
++			proc->start(KProcess::Block);
++			setBrowsingStatus();
++		} else {
++			enableBrowsing->setChecked(false);
++		}
++	} else {
++		KProcess *proc = new KProcess;
++		*proc << "kdesu";
++		*proc << "/usr/share/cups/enable_browsing 0";
++		proc->start(KProcess::Block);
++		setBrowsingStatus();
++	}
++	setCursor(QCursor(Qt::ArrowCursor));
++}
++
++void KMMainView::slotEnableSharing()
++{
++	setCursor(QCursor(Qt::BusyCursor));
++	
++	QString scaryMessage = i18n("Enabling local browsing for printers will open a network port (631) on your computer.  If security problems are discovered in the print server, remote attackers could access your computer as the \"cupsys\" user.");
++
++	if (enableSharing->isChecked()) {
++		if (KMessageBox::warningYesNo( this, scaryMessage, i18n("Share Printers on Local Network"), KGuiItem(i18n("Enable Sharing")), KGuiItem(i18n("Don't Enable Sharing")) ) == KMessageBox::Yes) {
++			KProcess *proc = new KProcess;
++			*proc << "kdesu";
++	        	*proc << "/usr/share/cups/enable_sharing 1";
++			proc->start(KProcess::Block);
++			setSharingStatus();
++		} else {
++			enableSharing->setChecked(false);
++		}
++	} else {
++		KProcess *proc = new KProcess;
++		*proc << "kdesu";
++		*proc << "/usr/share/cups/enable_sharing 0";
++		proc->start(KProcess::Block);
++		setSharingStatus();
++	}
++	setCursor(QCursor(Qt::ArrowCursor));
++}
++
+ void KMMainView::slotToggleToolBar(bool on)
+ {
+ 	if (on) m_toolbar->show();
--- kdelibs-3.5.7.orig/debian/patches/kubuntu_56_langpacks_desktop_files.diff
+++ kdelibs-3.5.7/debian/patches/kubuntu_56_langpacks_desktop_files.diff
@@ -0,0 +1,149 @@
+--- orig/kdelibs-3.5.5/kdecore/kconfigbackend.cpp	2006-07-22 09:16:41.000000000 +0100
++++ kdelibs-3.5.5/kdecore/kconfigbackend.cpp	2006-10-22 19:43:04.000000000 +0100
+@@ -505,6 +505,8 @@
+    bool fileOptionImmutable = false;
+    bool groupOptionImmutable = false;
+    bool groupSkip = false;
++   bool foundGettextDomain = false;
++   QCString gettextDomain;
+ 
+    int line = 0;
+    for(; s < eof; s++)
+@@ -596,6 +598,7 @@
+       if (groupSkip && !bDefault)
+         goto sktoeol; // Skip entry
+ 
++
+       bool optionImmutable = groupOptionImmutable;
+       bool optionDeleted = false;
+       bool optionExpand = false;
+@@ -695,6 +698,11 @@
+       QCString val = printableToString(st, s - st);
+       //qDebug("found key '%s' with value '%s'", key.data(), val.data());
+ 
++      if (QString(key.data()) == "X-Ubuntu-Gettext-Domain") {
++	gettextDomain = val.data();
++	foundGettextDomain = true;
++      }
++
+       KEntryKey aEntryKey(aCurrentGroup, decodeKey(key));
+       aEntryKey.bLocal = (locale != 0);
+       aEntryKey.bDefault = bDefault;
+@@ -718,6 +726,34 @@
+          pConfig->putData(aEntryKey, aEntry, false);
+       }
+    }
++   // Look up translations using KLocale
++   // https://launchpad.net/distros/ubuntu/+spec/langpacks-desktopfiles-kde
++   // This calls KLocale up to 10 times for each config file (and each KConfig has up to 4 files)
++   // so I'll see how much of a performance hit it is
++   // it also only acts on the last group in a file
++   // Ideas: only translate most important fields, only translate "Desktop Entry" files,
++   //        do translation per KConfig not per single file
++   if (!pWriteBackMap) {
++     QFile file("file.txt");
++     if (foundGettextDomain) {
++
++       KLocale locale(gettextDomain);
++
++       QString language = locale.language();
++       translateKey(locale, aCurrentGroup, QCString("Name"));
++       translateKey(locale, aCurrentGroup, QCString("Comment"));
++       translateKey(locale, aCurrentGroup, QCString("Language"));
++       translateKey(locale, aCurrentGroup, QCString("Keywords"));
++       translateKey(locale, aCurrentGroup, QCString("About"));
++       translateKey(locale, aCurrentGroup, QCString("Description"));
++       translateKey(locale, aCurrentGroup, QCString("GenericName"));
++       translateKey(locale, aCurrentGroup, QCString("Query"));
++       translateKey(locale, aCurrentGroup, QCString("ExtraNames"));
++       translateKey(locale, aCurrentGroup, QCString("X-KDE-Submenu"));
++     }
++   }
++
++
+    if (fileOptionImmutable)
+       bFileImmutable = true;
+ 
+@@ -732,6 +768,21 @@
+ #endif
+ }
+ 
++void KConfigINIBackEnd::translateKey(KLocale& locale, QCString currentGroup, QCString key) {
++  KEntryKey entryKey = KEntryKey(currentGroup, key);
++  KEntry entry = pConfig->lookupData(entryKey);
++  if (QString(entry.mValue) != "") {
++    QString orig = key + "=" + entry.mValue;
++    QString translate = locale.translate(key + "=" + entry.mValue);
++    if (QString::compare(orig, translate) != 0) {
++      translate = translate.mid(key.length() + 1);
++      entry.mValue = translate.utf8();
++      entryKey.bLocal = true;
++      entry.bNLS = true;
++      pConfig->putData(entryKey, entry, false);
++    }
++  }
++}
+ 
+ void KConfigINIBackEnd::sync(bool bMerge)
+ {
+--- orig/kdelibs-3.5.5/kdecore/kconfigbackend.h	2005-10-10 16:06:03.000000000 +0100
++++ kdelibs-3.5.5/kdecore/kconfigbackend.h	2006-10-16 19:36:33.000000000 +0100
+@@ -25,6 +25,7 @@
+ #include "kconfigdata.h"
+ #include <kconfigbase.h>
+ #include <klockfile.h>
++#include <klocale.h>
+ #include "kdelibs_export.h"
+ 
+ class QFile;
+@@ -250,6 +251,11 @@
+   void parseSingleConfigFile(QFile& rFile, KEntryMap *pWriteBackMap = 0L,
+ 			     bool bGlobal = false, bool bDefault = false);
+ 
++  // Kubuntu patch, 2006-08-03
++  // looks up a key in with KLocale
++  // see https://launchpad.net/distros/ubuntu/+spec/langpacks-desktopfiles-kde
++  void translateKey(KLocale& locale, QCString currentGroup, QCString key);
++
+   /**
+    * Writes configuration file back.
+    *
+--- orig/kdelibs-3.5.5/kdecore/klocale.cpp	2005-11-08 22:39:22.000000000 +0000
++++ kdelibs-3.5.5/kdecore/klocale.cpp	2006-10-22 19:56:03.000000000 +0100
+@@ -76,6 +76,7 @@
+ #ifdef Q_WS_WIN
+   char win32SystemEncoding[3+7]; //"cp " + lang ID
+ #endif
++  bool useMainCatalogue;
+ };
+ 
+ static KLocale *this_klocale = 0;
+@@ -118,8 +119,13 @@
+ {
+   // Use the first non-null string.
+   QString mainCatalogue = catalog;
+-  if (maincatalogue)
+-    mainCatalogue = QString::fromLatin1(maincatalogue);
++
++  // don't use main catalogue if we're looking up .desktop translations
++  if (mainCatalogue.contains("desktop") == 0 || mainCatalogue.contains("kdesktop") == 1) {
++    if (maincatalogue) {
++      mainCatalogue = QString::fromLatin1(maincatalogue);
++    }
++  }
+ 
+   if (mainCatalogue.isEmpty()) {
+     kdDebug(173) << "KLocale instance created called without valid "
+@@ -129,8 +135,10 @@
+   else {
+     // do not use insertCatalogue here, that would already trigger updateCatalogs
+     d->catalogNames.append( mainCatalogue );   // application catalog
+-    d->catalogNames.append( SYSTEM_MESSAGES ); // always include kdelibs.mo
+-    d->catalogNames.append( "kio" );            // always include kio.mo
++    if (mainCatalogue.contains("desktop") == 0 || mainCatalogue.contains("kdesktop") == 1) { //don't bother if we're looking up desktop translations
++      d->catalogNames.append( SYSTEM_MESSAGES ); // always include kdelibs.mo
++      d->catalogNames.append( "kio" );            // always include kio.mo
++    }
+     updateCatalogues(); // evaluate this for all languages
+   }
+ }
--- kdelibs-3.5.7.orig/debian/patches/kubuntu_57_nomediaioslave_fileio.diff
+++ kdelibs-3.5.7/debian/patches/kubuntu_57_nomediaioslave_fileio.diff
@@ -0,0 +1,571 @@
+diff -dur -x debian -x admin -x '*.m4' -x '*.in' -x configure -x '*.desktop' -x '*.theme' -x Makefile.am -x 
+obj-i486-linux-gnu kdelibs-3.5.4_orig/kioslave/file/file.cc kdelibs-3.5.4/kioslave/file/file.cc
+--- kdelibs-3.5.4_orig/kioslave/file/file.cc	2006-03-17 11:19:07.000000000 +0100
++++ kdelibs-3.5.4/kioslave/file/file.cc	2006-08-21 23:59:17.000000000 +0200
+@@ -25,6 +25,7 @@
+ #include <config.h>
+ 
+ #include <qglobal.h> //for Q_OS_XXX
++#include <qstringlist.h>
+ #include <sys/types.h>
+ #include <sys/wait.h>
+ #include <sys/stat.h>
+@@ -94,6 +95,11 @@
+ #include <klargefile.h>
+ #include <kglobal.h>
+ #include <kmimetype.h>
++#include <kapplication.h>
++#include <dcopclient.h>
++#include <dcopobject.h>
++#include <dcopref.h>
++#include <kcmdlineargs.h>
+ 
+ using namespace KIO;
+ 
+@@ -107,27 +113,82 @@
+                             mode_t type, bool withACL );
+ #endif
+ 
++// This describes a mount point in the system and is used to provide extra
++// meta data about directories that are also mount points.
++class Medium {
++public:
++    // These constants are taken from kdebase/kioslave/media/libmediacommon/media.h
++    static const uint ID = 0;
++    static const uint NAME = 1;
++    static const uint LABEL = 2;
++    static const uint USER_LABEL = 3;
++    static const uint MOUNTABLE = 4;
++    static const uint DEVICE_NODE = 5;
++    static const uint MOUNT_POINT = 6;
++    static const uint FS_TYPE = 7;
++    static const uint MOUNTED = 8;
++    static const uint BASE_URL = 9;
++    static const uint MIME_TYPE = 10;
++    static const uint ICON_NAME = 11;
++    static const uint PROPERTIES_COUNT = 12;
++    static const QString SEPARATOR;
++
++    Medium();
++
++    QCString mountPointPath;
++    QCString parentDirectory;
++    QString mountPointName;
++
++    QString mimeType;
++    QString guessedMimeType;
++    QString icon;
++};
++
++class FileProtocol::FileProtocolPrivate {
++public:
++    FileProtocolPrivate();
++
++    void buildMountList();
++    void buildHiddenList( QStringList &hiddenList, const char *hiddenFilename );
++    void createMountList(const QStringList &props);
++
++    time_t mountCacheAge;
++    QValueList<const Medium> mountList;
++
++    QString homeParentDir;
++    QString homeDirName;
++};
++
++static const KCmdLineOptions options[] =
++{
++        { "+protocol", I18N_NOOP( "Protocol name" ), 0 },
++        { "+pool", I18N_NOOP( "Socket name" ), 0 },
++        { "+app", I18N_NOOP( "Socket name" ), 0 },
++        KCmdLineLastOption
++};
++
+ extern "C" { KDE_EXPORT int kdemain(int argc, char **argv); }
+ 
+ int kdemain( int argc, char **argv )
+ {
+-  KLocale::setMainCatalogue("kdelibs");
+-  KInstance instance( "kio_file" );
+-  ( void ) KGlobal::locale();
++    // KApplication is necessary to use DCOP
++    putenv(strdup("SESSION_MANAGER="));
++    KLocale::setMainCatalogue("kdelibs");
++    KCmdLineArgs::init(argc, argv, "kio_file", 0, 0, 0, 0);
++    KCmdLineArgs::addCmdLineOptions( options );
++    KApplication app( false, false );
++    // We want to be anonymous even if we use DCOP
++    app.dcopClient()->attach();
+ 
+-  kdDebug(7101) << "Starting " << getpid() << endl;
++    KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+ 
+-  if (argc != 4)
+-  {
+-     fprintf(stderr, "Usage: kio_file protocol domain-socket1 domain-socket2\n");
+-     exit(-1);
+-  }
++    kdDebug(7101) << "Starting " << getpid() << endl;
+ 
+-  FileProtocol slave(argv[2], argv[3]);
+-  slave.dispatchLoop();
++    FileProtocol slave(args->arg(1), args->arg(2));
++    slave.dispatchLoop();
+ 
+-  kdDebug(7101) << "Done" << endl;
+-  return 0;
++    kdDebug(7101) << "Done" << endl;
++    return 0;
+ }
+ 
+ 
+@@ -135,8 +196,13 @@
+ {
+     usercache.setAutoDelete( true );
+     groupcache.setAutoDelete( true );
++
++    d = new FileProtocolPrivate();
+ }
+ 
++FileProtocol::~FileProtocol() {
++    delete d;
++}
+ 
+ int FileProtocol::setACL( const char *path, mode_t perm, bool directoryDefault )
+ {
+@@ -990,11 +1056,16 @@
+         return *temp;
+ }
+ 
+-
+-
+ bool FileProtocol::createUDSEntry( const QString & filename, const QCString & path, UDSEntry & entry,
+                                    short int details, bool withACL )
+ {
++    return createUDSEntryExtended( filename, path, entry, details, withACL, false, 0, 0, 0);
++}
++
++bool FileProtocol::createUDSEntryExtended( const QString & filename, const QCString & path, UDSEntry & entry,
++                                   short int details, bool withACL, bool isHidden, const QString *mimeType,
++                                   const QString *guessedMineType, const QString *icon )
++{
+     assert(entry.count() == 0); // by contract :-)
+     // Note: details = 0 (only "file or directory or symlink or doesn't exist") isn't implemented
+     // because there's no real performance penalty in kio_file for returning the complete
+@@ -1092,6 +1163,31 @@
+     // We made that mistake for KDE 2.0, but it's in fact the
+     // "file status" change time, which we don't care about.
+ 
++    if ( isHidden ) {
++        atom.m_uds = KIO::UDS_HIDDEN;
++        atom.m_long = 1;
++        entry.append( atom );
++    }
++
++
++    if ( mimeType != 0) {
++        atom.m_uds = KIO::UDS_MIME_TYPE;
++        atom.m_str = *mimeType;
++        entry.append( atom );
++    }
++
++    if ( guessedMineType != 0) {
++        atom.m_uds = UDS_GUESSED_MIME_TYPE;
++        atom.m_str = *guessedMineType;
++        entry.append( atom );
++    }
++
++    if ( icon != 0) {
++        atom.m_uds = UDS_ICON_NAME;
++        atom.m_str = *icon;
++        entry.append( atom );
++    }
++
+     return true;
+ }
+ 
+@@ -1106,6 +1202,7 @@
+ 	return;
+     }
+ 
++
+     /* directories may not have a slash at the end if
+      * we want to stat() them; it requires that we
+      * change into it .. which may not be allowed
+@@ -1113,14 +1210,72 @@
+      * stat("/is/unaccessible/") -> EPERM            H.Z.
+      * This is the reason for the -1
+      */
+-    QCString _path( QFile::encodeName(url.path(-1)));
++    QString pathQString(url.path(-1));
++    QCString _path( QFile::encodeName(pathQString));
++
++//fprintf(stderr,"%i FileProtocol::stat(): %s\n",getpid(),_path.data());
++//fflush(stderr);
+ 
+     QString sDetails = metaData(QString::fromLatin1("details"));
+     int details = sDetails.isEmpty() ? 2 : sDetails.toInt();
+     kdDebug(7101) << "FileProtocol::stat details=" << details << endl;
+ 
++    // Check for the .hidden file.
++    KURL hiddenURL = url;
++    hiddenURL.adjustPath(-1);
++    QString itemFileName = hiddenURL.fileName();
++    hiddenURL.setFileName(".hidden");
++
++    QStringList hiddenList;
++    d->buildHiddenList(hiddenList, QFile::encodeName(hiddenURL.path()));
++    bool hidden = false;
++    if (hiddenList.size()!=0) {
++        hidden = hiddenList.contains(itemFileName)!=0;
++    }
++
++    // Keep the mount list in mind.
++    d->buildMountList();
++
++    const QString *mimeType = 0;
++    const QString *guessedMimeType = 0;
++    const QString *icon = 0;
++    QString mimeIcon;
++    QString inodeDirectoryString("inode/directory");
++    QString folderHomeIcon("folder_home");
++    QValueList<const Medium>::iterator it2;
++    for(it2=d->mountList.begin(); it2!=d->mountList.end(); ++it2) {
++        if( qstrcmp(_path.data(),(*it2).mountPointPath.data())==0) {
++            // FIXME Should we refresh the stat data about this mountpoint?
++            mimeType = &((*it2).mimeType);
++            guessedMimeType = &inodeDirectoryString;
++
++            if ( !(*it2).icon.isEmpty() ) {
++                icon = &((*it2).icon);
++            } else {
++                mimeIcon = KMimeType::mimeType( (*it2).mimeType )->icon( (*it2).mimeType, false);
++                icon = &mimeIcon;
++            }
++            
++//fprintf(stderr,"%i FileProtocol::stat() mimeType: %s\n",getpid(),mimeType->latin1());
++//fprintf(stderr,"%i FileProtocol::stat() guessedMimeType: %s\n",getpid(),guessedMimeType->latin1());
++//fprintf(stderr,"%i FileProtocol::stat() icon: %s\n",getpid(),icon->latin1());
++//fflush(stderr);
++        }
++    }
++
++    // Hide other people's home directories.
++    if(pathQString.section('/',0,-2,QString::SectionIncludeLeadingSep)==d->homeParentDir) {
++        if(pathQString.section('/',-1)==d->homeDirName) {
++            // Add the icon to our own home directory.
++            icon = &folderHomeIcon;
++        } else {
++            hidden = true;
++        }
++    }
++
+     UDSEntry entry;
+-    if ( !createUDSEntry( url.fileName(), _path, entry, details, true /*with acls*/ ) )
++    if ( !createUDSEntryExtended( url.fileName(), _path, entry, details, true /*with acls*/, false,
++            mimeType, guessedMimeType, icon ) )
+     {
+         error( KIO::ERR_DOES_NOT_EXIST, url.path(-1) );
+         return;
+@@ -1169,6 +1324,9 @@
+     statEntry( entry );
+ 
+     finished();
++
++//fprintf(stderr,"%i stat() exit\n\n",getpid());
++//fflush(stderr);
+ }
+ 
+ void FileProtocol::listDir( const KURL& url)
+@@ -1199,6 +1357,9 @@
+     DIR *dp = 0L;
+     KDE_struct_dirent *ep;
+ 
++//fprintf(stderr,"%i FileProtocol::listDir() Listing dir %s\n",getpid(),_path.data());
++//fflush(stderr);
++
+     dp = opendir( _path.data() );
+     if ( dp == 0 ) {
+         switch (errno)
+@@ -1244,13 +1405,85 @@
+         finished();
+     }
+ 
++    // Check for the .hidden file.
++    QStringList hiddenList;
++    d->buildHiddenList(hiddenList, ".hidden");
++
++    // Freshen the mount list
++    d->buildMountList();
++
++//fprintf(stderr,"%i FileProtocol::listDir() checkpoint 1\n",getpid());
++//fflush(stderr);
++
++    // Build the list of mounts in this dir.
++    //QValueList<const Medium> mountList;
++    QValueList<const Medium>::iterator it2;
++    QDict<const Medium> mountShortList;
++    for(it2=d->mountList.begin(); it2!=d->mountList.end(); ++it2) {
++        if( qstrcmp(_path.data(),(*it2).parentDirectory.data())==0) {
++//fprintf(stderr,"%i FileProtocol::listDir() adding short list %s\n",getpid(),_path.data());
++//fflush(stderr);
++            mountShortList.insert( (*it2).mountPointName, &(*it2));
++        }
++    }
++
++//fprintf(stderr,"%i FileProtocol::listDir() checkpoint 2\n",getpid());
++//fflush(stderr);
++
++    QString inodeDirectoryString("inode/directory");
++    QString folderHomeIcon("folder_home");
++
++    // Flag to indicate if we are listing the /home dir. (Based on what $HOME says).
++    bool isHomeDirs = url.path()==d->homeParentDir;
++
+     UDSEntry entry;
+     QStrListIterator it(entryNames);
+     for (; it.current(); ++it) {
+         entry.clear();
+-        if ( createUDSEntry( QFile::decodeName(*it),
++
++//fprintf(stderr,"%i FileProtocol::listDir() Checking file %s\n",getpid(),*it);
++//fflush(stderr);
++
++        // Is this entry on the .hidden hit list? 
++        QString itemQString(*it);
++        bool hidden = false;
++        hidden = hiddenList.contains(itemQString) != 0;
++
++        const QString *mimeType = 0;
++        const QString *guessedMimeType = 0;
++        QString mimeIcon;
++        const QString *icon = 0;
++
++        const Medium *matchingMount = mountShortList.find( itemQString );
++        if(matchingMount != 0) {
++//fprintf(stderr,"%i FileProtocol::listDir() mountShortList.contains()!=0\n",getpid());
++//fflush(stderr);
++            mimeType = &(matchingMount->mimeType);
++            guessedMimeType = &inodeDirectoryString;
++
++            if ( !matchingMount->icon.isEmpty() ) {
++                icon = &(matchingMount->icon);
++            } else {
++                mimeIcon = KMimeType::mimeType(matchingMount->mimeType)->icon(matchingMount->mimeType, false);
++                icon = &mimeIcon;
++            }
++//fprintf(stderr,"%i FileProtocol::listDir() mimeType: %s\n",getpid(),mimeType->latin1());
++//fprintf(stderr,"%i FileProtocol::listDir() icon: %s\n",getpid(),icon->latin1());
++//fflush(stderr);
++        }
++
++        // Give our home directory an icon.
++        if(isHomeDirs) {
++            if(itemQString==d->homeDirName) {
++                icon = &folderHomeIcon;
++//fprintf(stderr,"%i FileProtocol::listDir() home dir icon: %s\n",getpid(),icon->latin1());
++//fflush(stderr);
++            }
++        }
++
++        if ( createUDSEntryExtended( QFile::decodeName(*it),
+                              *it /* we can use the filename as relative path*/,
+-                             entry, 2, true ) )
++                             entry, 2, true, hidden, mimeType, guessedMimeType, icon ) )
+           listEntry( entry, false);
+         //else
+         // ;//Well, this should never happen... but with wrong encoding names
+@@ -1263,8 +1496,12 @@
+     chdir(path_buffer);
+ 
+     finished();
++//fprintf(stderr,"%i FileProtocol::listDir() exit\n\n",getpid());
++//fflush(stderr);
+ }
+ 
++//-------------------
++
+ /*
+ void FileProtocol::testDir( const QString& path )
+ {
+@@ -1794,4 +2031,155 @@
+ }
+ #endif
+ 
++/*************************************
++ *
++ * Private
++ *
++*************************************/
++
++const QString Medium::SEPARATOR = "---";
++
++Medium::Medium() {
++}
++
++FileProtocol::FileProtocolPrivate::FileProtocolPrivate()
++{
++    mountCacheAge = 0;
++
++    if(getenv("HOME")!=0) {
++
++        QString homeDir(QFile::encodeName(getenv("HOME")));
++        if(homeDir.endsWith("/")) {
++            homeDir.truncate(homeDir.length()-1);
++        }
++        homeDirName = homeDir.section('/',-1);
++        homeParentDir = homeDir.section('/', 0, -2, QString::SectionIncludeLeadingSep);
++    }
++}
++
++void FileProtocol::FileProtocolPrivate::buildHiddenList(
++        QStringList &hiddenList, const char *hiddenFilename )
++{
++    // Open and read the ".hidden" file. The .hidden file lists files and
++    // directories that should be considered hidden by the Open dialog and
++    // Konqueror. (Hidden in the same way that filename begining with a dot
++    // are hidden. This is how Mac OS X hides files from the user in the
++    // Finder. 
++    // http://www.westwind.com/reference/OS-X/invisibles.html
++
++#define HIDDEN_BUFFER_SIZE 1024
++    char buffer[HIDDEN_BUFFER_SIZE];    // We only support 1Kb worth of .hidden file stuff.
++    int fd = KDE_open( hiddenFilename, O_RDONLY);
++    if ( fd < 0 ) {
++        return;
++    }
++
++    int n = ::read( fd, buffer, HIDDEN_BUFFER_SIZE-1 );
++    close( fd );
++    if (n == -1) {
++        return;
++    }
++    close( fd );
++
++    buffer[n] = 0;  // Null terminate the string.
++    // The list of filenames should have the same encoding as what the filesystem uses.
++    hiddenList = QStringList::split('\n', QFile::decodeName(buffer));
++}
++
++#define MOUNTLIST_REFRESH_TIME 5
++void FileProtocol::FileProtocolPrivate::buildMountList() {
++//fprintf(stderr,"%i FileProtocol::buildMountList()\n",getpid());
++//fflush(stderr);
++    // Only fresh the mount list if it is more than 5 seconds old.
++    if(time(0)-mountCacheAge <= MOUNTLIST_REFRESH_TIME) {
++//fprintf(stderr,"%i FileProtocol::buildMountList() using cached mount list!!!\n",getpid());
++//fflush(stderr);
++        return;
++    }
++//fprintf(stderr,"%i FileProtocol::buildMountList() fetching mountlist\n",getpid());
++//fflush(stderr);
++
++    // We get the mount/media information from the KDE mediamanager, the
++    // same way as what the media:/ ioslave does.
++    DCOPRef mediamanager("kded", "mediamanager");
++    DCOPReply reply = mediamanager.call( "fullList" );
++    if ( !reply.isValid() ) {
++        return;
++    }
++    createMountList(reply);
++
++    mountCacheAge = time(0);
++}
++
++void FileProtocol::FileProtocolPrivate::createMountList(const QStringList &props) {
++
++//fprintf(stderr,"%i FileProtocol::createList() checkpoint 1 ---------------------------\n",getpid());
++//fflush(stderr);
++    mountList.clear();
++//fprintf(stderr,"%i FileProtocol::createList() checkpoint 2\n",getpid());
++//fflush(stderr);
++
++    if ( props.size() % (Medium::PROPERTIES_COUNT+1) == 0) {
++        int media_count = props.size()/(Medium::PROPERTIES_COUNT+1);
++
++//fprintf(stderr,"%i FileProtocol::createList() media count: %d\n",getpid(),media_count);
++//fflush(stderr);
++
++        QStringList properties = props;
++
++        for(int i=0; i<media_count; i++) {
++            Medium m;
++
++            if ( properties.size() >= Medium::PROPERTIES_COUNT ) {
++                //m.m_properties[Medium::ID] = properties[Medium::ID];
++                //m.m_properties[Medium::NAME] = properties[Medium::NAME];
++                //m.m_properties[Medium::LABEL] = properties[Medium::LABEL];
++                //m.m_properties[Medium::USER_LABEL] = properties[Medium::USER_LABEL];
++
++                //m.m_properties[Medium::MOUNTABLE] = properties[Medium::MOUNTABLE];
++                //m.m_properties[Medium::DEVICE_NODE] = properties[Medium::DEVICE_NODE];
++                //m.m_properties[Medium::MOUNT_POINT] = properties[Medium::MOUNT_POINT];
++
++//fprintf(stderr,"%i FileProtocol::createList() Mount point: %s\n",getpid(), properties[Medium::MOUNT_POINT].latin1());
++//fflush(stderr);
++
++                const QString *mountPoint = &properties[Medium::MOUNT_POINT];
++                m.mountPointPath = QCString(QFile::encodeName( *mountPoint ));
++
++                int lastSlash = mountPoint->findRev('/');
++                if(lastSlash!=-1) {
++                    m.parentDirectory = QCString(QFile::encodeName( mountPoint->left(lastSlash) ));
++                }
++
++                m.mountPointName = mountPoint->section('/',-1);
++
++//fprintf(stderr,"%i FileProtocol::createList() parentDirectory: %s\n",getpid(),m.parentDirectory.data() );
++//fflush(stderr);
++
++                //m.m_properties[Medium::FS_TYPE] = properties[Medium::FS_TYPE];
++                //m.m_properties[Medium::MOUNTED] = properties[Medium::MOUNTED];
++                //m.m_properties[Medium::BASE_URL] = properties[Medium::BASE_URL];
++
++                //m.m_properties[Medium::MIME_TYPE] = properties[Medium::MIME_TYPE];
++                m.mimeType = properties[Medium::MIME_TYPE];
++//fprintf(stderr,"%i FileProtocol::createList() Mimetype: %s\n",getpid(),properties[Medium::MIME_TYPE].latin1());
++//fflush(stderr);
++
++                //m.m_properties[Medium::ICON_NAME] = properties[Medium::ICON_NAME];
++                m.icon = properties[Medium::ICON_NAME];
++            }
++
++            mountList.append(m);
++
++            QStringList::iterator first = properties.begin();
++            QStringList::iterator last = properties.find(Medium::SEPARATOR);
++            ++last;
++            properties.erase(first, last);
++//fprintf(stderr,"%i \n",getpid());
++//fflush(stderr);
++
++        }
++    }
++}
++
+ #include "file.moc"
+diff -dur -x debian -x admin -x '*.m4' -x '*.in' -x configure -x '*.desktop' -x '*.theme' -x Makefile.am -x 
+obj-i486-linux-gnu kdelibs-3.5.4_orig/kioslave/file/file.h kdelibs-3.5.4/kioslave/file/file.h
+--- kdelibs-3.5.4_orig/kioslave/file/file.h	2005-10-10 17:05:36.000000000 +0200
++++ kdelibs-3.5.4/kioslave/file/file.h	2006-08-16 23:25:27.000000000 +0200
+@@ -45,7 +45,7 @@
+   Q_OBJECT
+ public:
+   FileProtocol( const QCString &pool, const QCString &app);
+-  virtual ~FileProtocol() { }
++  virtual ~FileProtocol();
+ 
+   virtual void get( const KURL& url );
+   virtual void put( const KURL& url, int _mode,
+@@ -93,6 +93,10 @@
+ 
+   class FileProtocolPrivate;
+   FileProtocolPrivate *d;
++
++  bool createUDSEntryExtended( const QString & filename, const QCString & path, KIO::UDSEntry & entry, 
++                       short int details, bool withACL, bool isHidden, const QString *mimeType,
++                       const QString *guessedMineType, const QString *icon);
+ };
+ 
+ #endif
+
+
--- kdelibs-3.5.7.orig/debian/patches/kubuntu_59_nomediaioslave_kfile_speedbar.diff
+++ kdelibs-3.5.7/debian/patches/kubuntu_59_nomediaioslave_kfile_speedbar.diff
@@ -0,0 +1,11 @@
+--- kdelibs-3.5.4_orig/kio/kfile/kfilespeedbar.cpp	2005-10-10 17:05:43.000000000 +0200
++++ kdelibs-3.5.4/kio/kfile/kfilespeedbar.cpp	2006-08-30 22:21:29.000000000 +0200
+@@ -57,7 +57,7 @@
+         insertItem( u, i18n("Home Folder"), false,
+                                "folder_home" );
+ 
+-        u = "media:/";
++        u = "/media";
+         if ( KProtocolInfo::isKnownProtocol( u ) )
+             insertItem( u, i18n("Storage Media"), false,
+                                    KProtocolInfo::icon( "media" ) );
--- kdelibs-3.5.7.orig/debian/patches/kubuntu_60_kresolver_asserts.diff
+++ kdelibs-3.5.7/debian/patches/kubuntu_60_kresolver_asserts.diff
@@ -0,0 +1,22 @@
+--- kdelibs-3.5.4/kdecore/network/kresolverworkerbase.cpp	2005-09-10 09:27:10.000000000 +0100
++++ kdelibs-3.5.4/kdecore/network/kresolverworkerbase.cpp	2006-09-18 15:17:57.000000000 +0100
+@@ -127,19 +127,16 @@
+ 
+ bool KResolverWorkerBase::checkResolver()
+ {
+-  assert(th != 0L);
+   return th->checkResolver();
+ }
+ 
+ void KResolverWorkerBase::acquireResolver()
+ {
+-  assert(th != 0L);
+   th->acquireResolver();
+ }
+ 
+ void KResolverWorkerBase::releaseResolver()
+ {
+-  assert(th != 0L);
+   th->releaseResolver();
+ }
+ 
--- kdelibs-3.5.7.orig/debian/patches/kubuntu_61_hibernate_icons.diff.uu
+++ kdelibs-3.5.7/debian/patches/kubuntu_61_hibernate_icons.diff.uu
@@ -0,0 +1,407 @@
+begin 664 kubuntu_61_hibernate_icons.diff
+M9&EF9B`M=7).82!O<FEG+VMD96QI8G,M,RXU+C0O<&EC<R]C<GES=&%L<W9G
+M+V-R,38M86-T:6]N+6AI8F5R;F%T92YP;F<@:V1E;&EB<RTS+C4N-"]P:6-S
+M+V-R>7-T86QS=F<O8W(Q-BUA8W1I;VXM:&EB97)N871E+G!N9PHM+2T@;W)I
+M9R]K9&5L:6)S+3,N-2XT+W!I8W,O8W)Y<W1A;'-V9R]C<C$V+6%C=&EO;BUH
+M:6)E<FYA=&4N<&YG"3$Y-S`M,#$M,#$@,#$Z,#`Z,#`N,#`P,#`P,#`P("LP
+M,3`P"BLK*R!K9&5L:6)S+3,N-2XT+W!I8W,O8W)Y<W1A;'-V9R]C<C$V+6%C
+M=&EO;BUH:6)E<FYA=&4N<&YG"3(P,#8M,#DM,3D@,3(Z,#@Z,34N,#`P,#`P
+M,#`P("LP,3`P"D!`("TP+#`@*S$L-R!`0`HKB5!.1PT**QH**P````U)2$12
+M````$````!`(!@```!_S_V$````&8DM'1````````/E#NW\````)<$A9<P``
+M"Q,```L3`0":G!@```+U241!5#C+/9/+;U1E&,9_[_=]YYP9.S.=H3=;FA9"
+M00$3`XF:5KPL=*5NC.%_@/_#G2L7L#(F;HTKD(7115/QDHJ!4(%:0J0W:#IV
+M.L[EG#F7[W71EF?Y),^;]\F3GS0^^/+SL>FYJR*V#LH+B0"""`@"(LBA+R(4
+M6;J_L[%ZS8T>/W7EQ.R)^O':`&?E,&T(`D<4!AAK*-2@&*PQ&&M1#.LM6U?T
+MBA,QC;%RS!MS%0#*D>/45)63DQ6J90=`)RY8WXU9;^;D:K%&\'C^<E'#J"I)
+MFK/32L@]+)P?8_[<",8G/-G8Y>EVB]!ZWCPSS,63$8-!2K.K9(4`BE-?\+PU
+M8'HDX--W)I@>";FQ^(#?U_IDIH)S(8WJ@+=>J;+P:I5DD''S[H`D+Z'>XU25
+M9ZV4>B7B[$R%[WY<X<:??5ZJC?#AA6-HD;/X,&9KN4_F'>^?&^:/QYNL/`M0
+M]1A53SD**Y@_/\K63HMO;^^RGU?)O>'2V1KSIR/B7I=F5[AU+V&O)YR9C.C%
+M":J*\UZI54K,3@RQMO&<)WLAI2$HEQ01P1BAFWAZ5NAGGG^:!>/U"*-MO%><
+M]QYK+"*"&(-U(3F&U%LX6)Y,#:DWX"V*@"J"'E4HB#/8;*;,3==YN1%@C,-:
+MBP*JBA&#&,?XL&-VQ++U;\R@<'A?8-1[LD)8>M!A:JS&9PNC1('02RW+CV-^
+M>[A'OPB)`LO'%TJ,#GE^?=3!NPHK6A0'%9RS+#WJ\\MJG\OO3A%$;6[>R_AJ
+ML0<^8F*\PB<72WST>LCM^YO<V2[CPA*%/SQ@K:6?"BO7?FAAS#$NO]W@O=<*
+M*];W0$28';6,#7E^OK_-UTL#?&D&\07^X(,<8RQ!&+#3$;[XOL.EM83YTP&3
+M=0OJ67N:\,W?7>YL1.31#,X%^$&.]SDNC?NM?J_3L$&`46CWE%MW"WY:22B'
+MBJ@G*2S>U'!!A$E3\BRCM;M-W/VOY7KMW>OKJ\M7@[!4/T#X"%]>S"AR1*D>
+M>DJ:]/=[[>;U_P'29FB.5=SSF@````!)14Y$KD)@@@I<($YO(&YE=VQI;F4@
+M870@96YD(&]F(&9I;&4*9&EF9B`M=7).82!O<FEG+VMD96QI8G,M,RXU+C0O
+M<&EC<R]C<GES=&%L<W9G+V-R,38M86-T:6]N+7-U<W!E;F0N<&YG(&MD96QI
+M8G,M,RXU+C0O<&EC<R]C<GES=&%L<W9G+V-R,38M86-T:6]N+7-U<W!E;F0N
+M<&YG"BTM+2!O<FEG+VMD96QI8G,M,RXU+C0O<&EC<R]C<GES=&%L<W9G+V-R
+M,38M86-T:6]N+7-U<W!E;F0N<&YG"3$Y-S`M,#$M,#$@,#$Z,#`Z,#`N,#`P
+M,#`P,#`P("LP,3`P"BLK*R!K9&5L:6)S+3,N-2XT+W!I8W,O8W)Y<W1A;'-V
+M9R]C<C$V+6%C=&EO;BUS=7-P96YD+G!N9PDR,#`V+3`Y+3$Y(#$R.C`Y.C`W
+M+C`P,#`P,#`P,"`K,#$P,`I`0"`M,"PP("LQ+#8@0$`**XE03D<-"BL:"BL`
+M```-24A$4@```!`````0"`8````?\_]A````!F)+1T0```````#Y0[M_````
+M"7!(67,```L3```+$P$`FIP8```"W4E$050XRU63NX\;51C%?_>[=V;LC>WU
+M8]^LL@L;(=$B`=HH$C140(-0_H?D[X".BB*I$!(MHDJ4C@*%IT*@(""AE0)9
+M]L%FC>U9V^/QS-S[43@"<8JC<[JC<W3,1^]W/KBRMWK36M-6Y5\8`^:9,,;\
+MIP$CAJ+PH]\.SFZYO1=6;NSN[K;G_CF,<0"(`1=%1"Y!K"#&(Z*(6*P51!2K
+MAVU5O>%$3&=6K-+HO`*`B^HTE_=HM)['14T`?#5F-CVDFA]BI<*()>2!)/ZE
+M(QJ4JLK)9V=`Q>K&57IK^^1SX?SL,</!$X+&+'=?)6F\3%',4=_'4*(**\X'
+M99[]111OL[[W+G%]FU]_OD.6?D]CJ22.'?.T0[/[&LWN5<HB9WYQEYK+":HX
+M5:7(3TGJ;1KMEWCTT^=DPSOT>DMTU]^DJI19^B79X!AG2Y:[;W`T_(&(1X2@
+M2`A*E-19V=AG.#CF_/@SFDLCA(I6[QI)<Y_)9(;1/OGH'D8')$LODN=35!51
+M#=22%I>:.Z2#`V+S&,(`U?%B/B,$/\%H2BA_QQ=_D-36*"M!->!""%AG,<8@
+M8HACBTB%E6*Q/2!2(J;`"BL8%`54#<$KXKV"SBAF1[1[5XAJ&S@G6&O!Z"*F
+M",X:7+*&37:838]Q=HX/`0FJ&$K&@_NTEK=8V7H/(PG63)FE#Q@\_8[89=@H
+MH;;\-H$5QL-O:5P**WBON.`#UCJR]#[9Z!NV=J^3/HTH)W>9]C\F\=!87:?6
+M>8>X^19'3[ZF;A]22QS>^V<=6(LA8WARB^ZVT-F\CB]?A^H0(P8;[Q!8Y>3/
+MKYB//N'R9L![@_<!5_F`M4(419APQOCT0_+Q-:*E?6RT2:@@'QXP&7U*8AYR
+M>:LB<H[*!RH?<%E6#,?CK!-%%A"4%)_>(T^_0*D3U&`EIY4$DMA1S(6RJ#@Y
+M'7)Q,1NZ\_[T]H,?#V_6:E%[<5DP"^)_'M"%18$L*T;]OZ>W_P'NHF#O#V#U
+M#`````!)14Y$KD)@@@I<($YO(&YE=VQI;F4@870@96YD(&]F(&9I;&4*9&EF
+M9B`M=7).82!O<FEG+VMD96QI8G,M,RXU+C0O<&EC<R]C<GES=&%L<W9G+V-R
+M,C(M86-T:6]N+6AI8F5R;F%T92YP;F<@:V1E;&EB<RTS+C4N-"]P:6-S+V-R
+M>7-T86QS=F<O8W(R,BUA8W1I;VXM:&EB97)N871E+G!N9PHM+2T@;W)I9R]K
+M9&5L:6)S+3,N-2XT+W!I8W,O8W)Y<W1A;'-V9R]C<C(R+6%C=&EO;BUH:6)E
+M<FYA=&4N<&YG"3$Y-S`M,#$M,#$@,#$Z,#`Z,#`N,#`P,#`P,#`P("LP,3`P
+M"BLK*R!K9&5L:6)S+3,N-2XT+W!I8W,O8W)Y<W1A;'-V9R]C<C(R+6%C=&EO
+M;BUH:6)E<FYA=&4N<&YG"3(P,#8M,#DM,3D@,3(Z,#@Z,C,N,#`P,#`P,#`P
+M("LP,3`P"D!`("TP+#`@*S$L-B!`0`HKB5!.1PT**QH**P````U)2$12````
+M%@```!8(!@```,2T;#L````&8DM'1````````/E#NW\````)<$A9<P``"Q,`
+M``L3`0":G!@```3?241!5#C+C97+;UW5%<9_:^]]SKFO7/OZ$=N)W9"FMJLF
+M$%`;174H*C242DSZ!W36OZ',D)"8M3/&#&A'G56*B%`KH?`0<2&0J!"E;>P8
+MK(38<>S$]_J><\\]C[T8G!O209%8TI;V:WW:>WW?TB=R^I47.H<77F]/S)Q!
+M3,#_#>5[A6K>>[!]Y>'.G5>E\^(;'YTZ^YL5546*!)'_N2@&(P+&8L0@QF!&
+M0T2JM0@B!L102DC2[_'YZL7+KMV9.>-+SU*GR_)\\S&F"(@0.$NS'E`+'8A0
+ME)#FX'4$;"I@$<.7]TL^OSM&NS-SQB$2:!&S,!TQU@HKT=&OZY'C^%R+'\ZU
+MZ+0"PL"@"BMYX7G8S]C<2;F]5U!XBS&",8:CDX8;VP6(!$X5O%<.DH(HS%"%
+MV8DZSYZ:XHG9%L["<)B3IADB0A@X%J;JS'4B9K9C/K[99S\-L59(A@""JN)0
+M3^D]W;C$.<N1R08O_6R6^>D&<9+RWK\VN+%Y0#^SN"!B:KS!J>,=GCS>9G'^
+M$)&#BY_MT\M:))D\(A&GJJ3#DK6[,8UZQ/-/'V9^NL&=[3W^^O<O6+MO"5O3
+M!$&(*0T[]PSK>S$WMPM^_<PX/YAM<_9'"1>N'I!H&^\558]15525S9TA$^V(
+MDT^TB9.4MRY<X]/;$7EX&.,"?G5ZG%^>;%(6.?L)K*X7O'TU)LT\IXY/,M=*
+MZ0]R5$%5,:@'8ZC7`LZ=G,)9PS]6_\OJK9+<MNDFGB,3$2\^/<[YTV.,VWVZ
+M24F<P3_7,CZY-20,`YX\UJ3;[5-J56/C55%@;K+)TGR+=)CQSL=WV<W&Z`V4
+MWD`QQA#8BCC1G-[`TQ\**WNQ<GDM(RO@Z'03R@&%5]1[G*H'A(EVQ%@S(!D,
+MN?V@)"U#&"AB*MWJJ`.S`N),*(P`PE>[)6GN.=0(:00%Y%5IG7J/(!CKOFT.
+M:T.L<Z@8O%;C47B$PANL%Y#'9P*@OJJQ]QCU'A'HITHO*6G40Q9F&@A@K,-8
+MBQA3)2(8$8PU&&,1L<QU'+7`T$LRXLP@`EY+C/<>$6'WP'-K.Z46A9Q_9I9:
+MX#'&8HVE5*%4\-Y3E/HM:"TTK"R&A`XVON[2R^L(H%XKN0F0E\)[UWMDA>>E
+MLPL\MQQ697&.]7LEUS82/KFQQ?I.B7,AB'!N*>07RP'#+.?]+W8AFD!1O'IL
+M[<3+KXU-'L$%`3L]SXG9B*6C31;G:O22@JV>87\@?+J1\N&_$WHZ3;-1Y[D?
+MA_QNI<9DR_#AM=O\[6I!V)XG'<1L;_X'IUJ."'/T,WCSW8=,MP-^LG"(/_RV
+MQOLW8E;72[9Z!F.:')UPK"P&G%L,:$;"]?5[_/G2?6@M8ZQ%=20W[ST`QEJ,
+ML7QYO^2/%Q[P^^?;G%UL\/)/QSC_%*2%(@BU`$(G#+.<2Y]M\9=+N^R9$X2U
+M)DC5'/XQL&)'[!OK^&I/^=/%`WY^(N'9Y9!C4P&'ZA:`[6[&QM8!'US?Y^J=
+M`-]8(@SKB%2*4?5X+7&^+/(\&P9B#-8&HY<;!H7ETIIP>:-@HCZD%97@"_I#
+MV$\#O#M&,-;`&:G<9`2:]+OXLLQ=EL97'NS<65$@BNJ59N61*U0)]\0`U;RR
+MI@R(1S96[0,,D@/N;MXD2^,KPNE77@AJS=>#L'$&X3O,]/MZJ>;%<'`E'\:O
+M?@-[1$X%S[CMB`````!)14Y$KD)@@@I<($YO(&YE=VQI;F4@870@96YD(&]F
+M(&9I;&4*9&EF9B`M=7).82!O<FEG+VMD96QI8G,M,RXU+C0O<&EC<R]C<GES
+M=&%L<W9G+V-R,C(M86-T:6]N+7-U<W!E;F0N<&YG(&MD96QI8G,M,RXU+C0O
+M<&EC<R]C<GES=&%L<W9G+V-R,C(M86-T:6]N+7-U<W!E;F0N<&YG"BTM+2!O
+M<FEG+VMD96QI8G,M,RXU+C0O<&EC<R]C<GES=&%L<W9G+V-R,C(M86-T:6]N
+M+7-U<W!E;F0N<&YG"3$Y-S`M,#$M,#$@,#$Z,#`Z,#`N,#`P,#`P,#`P("LP
+M,3`P"BLK*R!K9&5L:6)S+3,N-2XT+W!I8W,O8W)Y<W1A;'-V9R]C<C(R+6%C
+M=&EO;BUS=7-P96YD+G!N9PDR,#`V+3`Y+3$Y(#$R.C`Y.C`R+C`P,#`P,#`P
+M,"`K,#$P,`I`0"`M,"PP("LQ+#8@0$`**XE03D<-"BL:"BL````-24A$4@``
+M`!8````6"`8```#$M&P[````!F)+1T0```````#Y0[M_````"7!(67,```L3
+M```+$P$`FIP8```$KTE$050XRXV5SX]<1Q''/]7=K]_\>#NSN_;N>KW>&(/B
+M2.`<K8AU^&T($O\"-RZ(.]Q\BL(!;IPY`"?.B`C!Q0E2;+!1+`5D"=MQ'&77
+MF]AK[\[LO)DW[T=5#F^R<``I=>E6=7=5=7^_WVKYV4_DV]M;*Z]O;`PN.R'A
+M?YCQ^<R4ZN,GX]N[>X?7Y%=OK+SS_:N7=LR,Z4P`:7<).`%Q#N_`.8=SLA@=
+M(H)S@LAG?HBA87P\Y<T_OW<C;*P/+JLJH]E%^H.73K*+""+@?4(2^X30002@
+M!BT0T3:P<[A%DJ;\@.'@/3;6!I>#"$D^-=+>-C$=GEP\A"[9\`+9TA=)TA6<
+MCV"&:D4Y/Z28?D@]_PCOZD5PAY,MZOPNXD@"9I@I=75,.4\!H]L[P^G-5\F6
+MO@`2J*HY95$@(@0?Z?:W2;N;Y.,-)D=_)X8CQ'NP*2)@9@0U4&UHRA'>!WK9
+M6<YLOT8O.T<QRWGX_EL<'][%NPEI#/2RTZR<NL1@]666EE\$23EZ\B99=XS8
+MM`71()@:35V0%_=)TQ[K6]^BEYWCV<$N_[SS>[S=9VTU$M.D!<Z>D#]_0#V_
+MQ_+:]Q@LO\!T^@HKQZ,_,.A/,5-4#6=F&,9\]B%I=Y7!RE<HBIP[MWY#RC]8
+M7ZU(HF-Y[3OTE[])536@1]3Y3?+G?T2UX-3:)8IJDZJ<`(:9X=1:6B6QR^DS
+M5W`N\.^[?Z&9W62056@](NV>97G]NPS7KG(T6::I1T!.F?^-^?$MDB32'[S,
+M9#)"I,'4<*8**V+TLTVRX47*LN#QHS\QS`XP'6,Z7O`V(81(50G:C!&;8,TS
+MRLD-L)+^8(M9`:8UVH)G")!V5DGBD/E\2E-]1`P%U@!>P(KVB@"4B.4(-0(T
+MU2-4"V*Z1-WT,`-3(ZA:2Z/@3L01$T_P'N<,)XH3_8]P4)S4"!XG_->:H-HV
+M`%7#J1J(8#JAJ<?$V*.WM`V+9-ZWD@5!8"'AUN^]$-)-G.M0SL<XR0&A4<6I
+M*H*@]0%%_CXQ[7#FW%74.HO#'I$&:%!5S.J3H,YWB/T=D,CH\"'=.%X4:3A3
+M6U13,3YX"]62[0NO$;.O+Z3M:>8/F([NL+][BZ9\0(P!$8C9%9+^UZBJ.0?[
+M;[.ZTJI.30EJ"BL"W@>FHW>8'-YD<.H;;+_X8X[V(U+>P.H]1H]_SBQO.'\V
+M)XD927^'SO(/$==C[^%U(N\R'*8\?5J@:H1&#:RM#)MP^/C7)'&-I>&7Z?1^
+M2G[X-LWL)L[VZ6>.$+=(^CLD_2N(Z_/)_K]XNOM;7KH`WKFV8C6"-BVJ[;LY
+MFO(#GN_^@L'&C^@-7V&X_@/0JY@5+7RN@TBDJN;L/[K.P>[O^-(+S^CWXDD#
+M4E6"JF*`]Q[G6B98_8CC_5\R'7V5F+U*DI['AZ66Q?./.1X_Y.C)7TEXEXL7
+ME&XG+OJW0]5H5`EUH]5\7B7."4GB\>XS.LV0^CKUX0WFMDIC&74-V(3$'W%^
+M7>GU$D3"(JB@9HQ&4YI:JY#GY>W=O><[F-'MIHOO1D[&=O[)@L."\XY2'/FD
+M%85(ZP<XGLRX=_\Q^;2\'29Y=>W>@V>O[^Z-+_-_/M//:V96S6;U[7Q:7?L4
+MLF9'88KQ:!8`````245.1*Y"8((*7"!.;R!N97=L:6YE(&%T(&5N9"!O9B!F
+M:6QE"F1I9F8@+75R3F$@;W)I9R]K9&5L:6)S+3,N-2XT+W!I8W,O8W)Y<W1A
+M;'-V9R]C<C,R+6%C=&EO;BUH:6)E<FYA=&4N<&YG(&MD96QI8G,M,RXU+C0O
+M<&EC<R]C<GES=&%L<W9G+V-R,S(M86-T:6]N+6AI8F5R;F%T92YP;F<*+2TM
+M(&]R:6<O:V1E;&EB<RTS+C4N-"]P:6-S+V-R>7-T86QS=F<O8W(S,BUA8W1I
+M;VXM:&EB97)N871E+G!N9PDQ.3<P+3`Q+3`Q(#`Q.C`P.C`P+C`P,#`P,#`P
+M,"`K,#$P,`HK*RL@:V1E;&EB<RTS+C4N-"]P:6-S+V-R>7-T86QS=F<O8W(S
+M,BUA8W1I;VXM:&EB97)N871E+G!N9PDR,#`V+3`Y+3$Y(#$R.C`X.C(W+C`P
+M,#`P,#`P,"`K,#$P,`I`0"`M,"PP("LQ+#$Q($!`"BN)4$Y'#0HK&@HK````
+M#4E(1%(````@````(`@&````<WIZ]`````9B2T=$````````^4.[?P````EP
+M2%ES```+$P``"Q,!`)J<&```"&%)1$%46,.EE\MO&]<5QG_GSG"&%$52#UJR
+ME/@EOQ(_D]@&"BLTB=$X;8$NT^R35;M(MOTCLNHFZ:)`VP`%VD4=I"U2MT`>
+M;=!XD4?CQ'9J1X[M1GY(LBV*%$D-YW5/%S,:2:Z;32XX''(>YW[W.^=^W[W"
+MD9]547W>JU1?+E?KAXPQ9>5;MO\70$"M'0SZ*Q>CH/\J(J==5)\?G=S^RKZC
+M3TU6&^-8:U']!@B2?<G&"[+AUL9?FTZR]BGWVG>/SW[^P2O+BW.XI4KUI;U'
+MGYQL/K2'^1M?8>(57/,``&(PQB`F/Q?_'8QLO"Z(2/%L]C][/E5#1)GIF<,H
+M3)[[YY]><BO5^N&AVACS<U>8&>ES;.\XKFLV<)F/5@3$`(+K&%S78(P@&!10
+M!*N"&,'D("1_1T00A,3"I5L1L_?:5!M-*D/UPZZ(*5N;(O$**X=VC;%UO(*U
+M&QC8$*Q1]6@V/)IUGUK%Q2\95)4PL?1#9:D3L=1+6(WR-&T"(CA&2-4PMQP3
+M*8@Q91?`6HL1)4XLW=48J[J>.1&&*R4>W5YC]_0PH\,E7,?PH!9/EEGN15R=
+M[W/M3D*8.CG]63C'0&+!<015BZ*X`*I@K1*$*;T@8:U_(X:=4U6>/-AD:KR"
+M8X1O:J62P\1HA;&ZQ_18GP\OM[D;^!CCYO$@3#)VUCAV-<^@564U3.@-'"#+
+MXZ&9.M]_8I*QFI=5A"JM=H_9Z_-<O]TBB,!Q/6I5GYW3(^Q^>)S&L(_K..S8
+M6J?B"?\XW^+KMH];\G(`@B+9J!5<5%%K,_J#A++G`L+^[75./391=#X(8SX^
+M_Q5GSL[22X?QAILXKH\8@]MVN'@GHOG5`D\='&7_MF'\DL/$6(VG#UG^>':>
+M>X,QW%*)*,[H5;6`9B6L:ED-+;,W^RQU8SS/Y=3CDS0;/@!+[2ZOO_D!KY^Y
+M3$NG<>O;L>XP,1ZQ>H2V1#]VF6N[O/EQC[_]JT6G'P&PM=G@Y.%1HNY=@@C"
+M-&-@36^,HCD:8;$=\>^Y/@=WU)F9JA8C__U;'_'.YRMH?0_B-5B-%,<8]C]4
+M8=^4C\$2A$H00:L/[U^.>>]B0)18`/9N'^>1*>AT.D2I9#66BYT!4*N($50,
+MM:$2C^\9*0HK[NRGL[Q[;@&GOHW(NO0C2YS"=_;7>/&925YX9@M'IB/Z_1Y!
+MK`QBZ$?"![,A%^9"0'%=E^/[MV"B98(P+1C(`"@H%C'9E#FTJ\'>AX8!6%Q:
+MX;=_.4]0FB;&)XB4U5`!PQ,SPY0]0\5W.;:GSFIG@4$,@R0[[G4M9SX+6.YG
+M'>V8'F6\$M):&9!8`U@H4F`5D2S8T5T-RIX#P"<7Y[AXRQ*:$8+0,LA'&*50
+M]M:U8*A<(ECM$T00Q,(@RJK]ZIV4+^=C`'ROQ/:)*MUN-YMW5E$T2X%5Q1A#
+MV2^Q;6*H"/S9[")]K=,)H+.:J5T092`V^95FH`9Q=H2),(BALZI<OIT4CVT=
+MKZ)Q#\1D8K<V#;$6,8:2"V.U4O'"TDH`[A`@1*F0`L;`(%$VJK4"<2K$B>!H
+M[GJ2><.]KA:>,EKS<33"B*`V10%75;'6YNZ6ZW9A`P;C>)C<Z<!@-3ON;U8%
+M\D-R(;,9DDU4J4TS<#:K`1<4:U.,,5B$Y=XZ9<V1(5Q'-UCKNNURGRH;`;W/
+MDDO&8;3J%+ZRW`U14P(1U.9"I`HK:BU&#$DJW%J*BJ!']TU1-A&(4_B_R;U=
+M[D>P=CWW?\2A[`G[IISBD5MW^UA31A"L33,ARABPB!%B*WQQ(V`09U/GV*-3
+M[)YP,J3&66?"F$TU8%41(4]A!@2$G4V7`]-N)FA1PJ6OV^"-@+"N`YI+\=H(
+MO[P=<FUA`,#D>(T7?KB+>BG(U@4YQ7$J7+L3%P!FYY:(M83D3($P4C7\^(3/
+M^'!6+]=NMKBZ$.)7QQ"R/E59JP&+B.`:87XYYKWS'?9-5W`=X>G'ICE_O<N?
+M+R2(5##&,$B$TQ_V2:.`9-#A=V]?12O;\T+-5DRG#GB<V)6-/DE2WO[H/[32
+M,1I>&6M3;)K5@)O-0EO0!X:_GNORW4?K/#Y3I>)[O/"#&4K^'=Z=A6Z8Y?GR
+M?,+/[RI)$!+I(U0:(\7(3QWT>.ZXAU_*ZN3S*XN\\UF;H>:QK-AMFIL1Z[.@
+M6&2*8:EG^<W?6VRINSS<])D8J_+3'VWCR.X5_O#A*C>6'<)4"!*#^!/XCJ'B
+M&79M<7CNA,_QG6[1^=Q"FU^]=8FPLI/AH7H^O<':-&-@;3T@18X=1(1/KX?\
+M\IT6/WEVE(>;92J^R_<.CW)D1Y4O;D;,+@HK[:PT&*TZ[)]R.##M,EI=UY*Y
+MA3:_>.,\LYTFM:T[LIF3K\_6[-A5V,"`LRY(QO#^Y9#NH,6+)^L<V%:AY#HT
+M&SXG&SXG#ZYI(-PO"BMQDG+^RB*_/O,ELYTMU"9W8YQ,#Z0`D&9"I&HS`$;6
+M1<2L@SDWI]Q\L\VS!WN</##$SHD**V6_],".!V',U5O+O/?)#=Z]T&=0WD5M
+M<AK)BW-]A9P-.EN4:LY`+KT9$*=0/B-"*W!XXU,X>Z7+3+/-WJ:R=<1AM.:C
+M6-HK(;?N];ATH\?U)4,KJE,>W\>05\X%:STMDJN@39/,C%3M((FC<AB&E/S*
+M)MG-E"_?7!C#0M]CH:=\<D-Q),;H*IK&6!RL-$C-5MRA,M5ZM@`MMG'%_B!C
+M:J6]1!R%J-J!F\;AA4&_>Z+3OH>(4*D.%PRH%5)98X)":B,U("5$?,210GZ-
+M"#9-B6VPH>`H`%AKZ75:W+YQE:#7)HW#"ZY-D]>ZK5NOH'8RZ-PKBH4';`$V
+MZ;_\[]T'M<U>"&D2$P8]>LOSBS9-7G.!TW'093D**UYV7.^0B)0?%.A;;]F+
+M0#I(D^BBILFKP.G_`B`U"(\5I"I[`````$E%3D2N0F"""EP@3F\@;F5W;&EN
+M92!A="!E;F0@;V8@9FEL90ID:69F("UU<DYA(&]R:6<O:V1E;&EB<RTS+C4N
+M-"]P:6-S+V-R>7-T86QS=F<O8W(S,BUA8W1I;VXM<W5S<&5N9"YP;F<@:V1E
+M;&EB<RTS+C4N-"]P:6-S+V-R>7-T86QS=F<O8W(S,BUA8W1I;VXM<W5S<&5N
+M9"YP;F<*+2TM(&]R:6<O:V1E;&EB<RTS+C4N-"]P:6-S+V-R>7-T86QS=F<O
+M8W(S,BUA8W1I;VXM<W5S<&5N9"YP;F<),3DW,"TP,2TP,2`P,3HP,#HP,"XP
+M,#`P,#`P,#`@*S`Q,#`**RLK(&MD96QI8G,M,RXU+C0O<&EC<R]C<GES=&%L
+M<W9G+V-R,S(M86-T:6]N+7-U<W!E;F0N<&YG"3(P,#8M,#DM,3D@,3(Z,#@Z
+M-3@N,#`P,#`P,#`P("LP,3`P"D!`("TP+#`@*S$L-R!`0`HKB5!.1PT**QH*
+M*P````U)2$12````(````"`(!@```'-Z>O0````&8DM'1````````/E#NW\`
+M```)<$A9<P``"Q,```L3`0":G!@```@Q241!5%C#M9?+CQS5%<9_Y]:SW],S
+M8\]X_,`/;/,P)L0@101P(B?_`&$/JT01;/-'L,H&LHB49!$I+'"4AR*R"*`@
+M090$*P3;8#PP!OPVGNZ9GNZ>KN<]651US6`35DE)I:[JNO>><[]SSO>=*S_Y
+M,0U5GFG4_1?:[?"8,28$Y?]U6:O1QD9T?KR9O"3":5>59_;MZ;[XY.-'%N;F
+M&EAK4?T:!P1D^@"(W/U1OF+2UC@);Z^.'GW[;\LO7KZZAMNH>\\_\?CAA7L/
+MS?/)R@TV1@;%O6L)(V",P1CYTJ]SQ[L80:3\3P0Q4GP3P9B<T$]XZ,$E0!?^
+M\*?WGG?;[=I#L]TZ'Z_<8!P?9&[I!$8**P>TVJ$@!DSY;AP78URD-`**B"+8
+MT@&#2.F(4#U#1K)Y@?7!,O-S#=KMVD.N,1+FN65C*,PN'J-67T2QVT&M%O#]
+M#GYMGB"<Q_5:&!.@JE@;HW9,$O?(DA[H)K+-<'&#B(.1G'1T&4@P1D(7!:L6
+M58.U*6DR1+%5'$4$SV_2FKF?9OL07M#%F+M#!!!F*4FRQGACA2R^A&-BC)&M
+MQ!$'R!#C8%51G09;%55+GDW(LA&H0AGS1FL_\XM/4&OL0L3YV@QW7(^:NQ,_
+MF&4\7&*]]P\"YS:N:Z:9!,1%6,M$=Q5%%50M6;:)DXY*N`SMF6,L[/X^?CA;
+M^JF,AGUN7%^FO_HIZ`3?=PC"%C/=_<SM.$00=G`<E_;,/8A3HW_SKP3YY_B!
+M"QA$8T1T:A]7%:Q5K$W)TB&N&R("[>Y1=NX^51E/DXA//GZ7Y0]?HUD?,3_K
+M$_@.QA$<<4F&Y[FY.4]WQY,T.T=QW(!6:R<V?XH;G_^>6;.*Y[FH)DC!!ZA2
+MA,!:Q6:;C`?+.(ZAWMC%PNY3!.$\`,-ACS-_?Y7UU7?9L\ME9J:.,1;!EN67
+M(Y(B;#+J_8XD^@:=^>_@!QTZ,XM$DY/<OOH**TN+*4(,HA7?&%7%JB("27R+
+M\>!#VMT':;0.5CO_YSNOL+'Z.O?N5SIM0>TF1AQJK:,$]2-8-:B=@$[`]DG'
+M;S$9O(FU"0!S.PZ#=Q^#P0`A`;9"8`#4:DD8BA>TF)E_!#%%PBU??(>;5]]@
+M[VX'UTFP^1@TI37[+1;V/<>.O<^2Z'%&HS&J$]`(T3'Q\&WBT3D4<%V7'8N/
+MLC8PY-D$*1$H'%"PJCA.P5B=V6,T.X<!V!C<XNR97[.T,"'P4M1.RMU#<^:;
+M&"?$]6JT9T]P\XM-T`@H;INO,AF\ALW6`.C.W4.<S1%%?8QD6"T**\$HBEK%
+M&,'U:G1F'\9Q0@`N?W8&FYQGIA5C[02U$=BH()%R#(#GU1F/BQ`($[`1HC%Y
+MO$(ZN5B."6BT]C$<#D$**YNJ6H9`+<88/"^DWMQ;+7SK^K]I-\9@!]AL@-HM
+MF+E+L)+R_ZA(-(U0.R"+/JI&-)J+C,:*D<+FMC*D8"SQ\/S9:L)DLT>]5O"_
+MD(#F1=0T@FUT#8J0EK<SU3]$+9JO%IH"!&&7)'40,>16`<4MN-P6RN684C3*
+M##6"[YI2[0S&@!&+$<N=EV!+1TOC8A"Q7Y)K!?)<$9&R#,&H0FYM*9^6+%VK
+M)M0;\ZBZV^2VE%G'W"WZ8DK)-94L.XZ'XW:KH7&TAN<6)6_SHA0-*-9J,4DR
+MDNA:M>:NW0^39"&.85L?4.K\'1X4_<*T%Q`<`^*$.,&1:LQX>(TPM(@(N;4H
+M6B!@\U+'29D,/\#F4>'`GA,X_B$4<!SS)22VYX!B0:3H#\KO(N#Z^W'#!P#(
+MTHCUW@5F6L4<:RU4"*A6\,7CBT3C2P"TV@L<N.]9)G&[:$2F70\I:72I<J!W
+M>QG/2<ONJ#!NW!F"S@\P[AP`_=XEXLT59KM!D3%;25@B((*(2YK<8+#Z)K7F
+M$<2X+.U[BN':6;+LC]1J4P<BQKW33**<P4;&RH7?L&]A&D8PQL5OGL*M/09`
+MGF=\]LE?F.WT"<,.>6ZQN9V*D6+55NV5$1CV_DQ[[MLT.H_@^S4.WO\L7USQ
+M('D#(T-$A"S^"(U^2CS,N&]_PDRG5NW<;Y[";S^-F*#DD_=9_^)U3ARO8QQ#
+M;FT9@A*!O"S#:8QMUJ-__5>X_@Z"VAX:S9WLO?=';/2/L]E_%8<K"#'&F;!S
+M3C`FP#@U'/\`0>=IW-JCE?'UM<M<>/\7[-\;TVXWJZ(MDG!*1&5M&B,X)1?$
+MHW_1O_9SNDL_)*SOP?5J='=^ET;G.,GF!TBV#'8=1'#<+DYX%#=X`'&Z%9>L
+MKUWF[+L_8[Z]S#U[6TQK1Z`,@18AR'-;&3=E5VN,$`_?HG]E2'OQ.6K-!W`<
+MCR"<)PA/`B<K-I8[."'/4VY=/\O%<[]D1V>90P=:Q<:@:E`K!*PJN;55+[\=
+M"6,$3=YC_>I51O7O49\Y2:VY'\\+O])PFD:L]5:X\NF;C-?>X,!2Q-*N5K$I
+MMK?GD.<6M8J+%B^(5$0R-6ZD0,.1/DQ^RS!ZAW4YB)K#./XB0=#%JA)'ZXR&
+MUQBM7\#HI[3K?8X<"PG#^A;L,CU)%268Y:486=4H2;(PCF)JH;=%-A4B!N.`
+M$<$W-U%[$Y4SI!.'S0U#FBJ.L71\R^*>G#!P\?T&8+:Z\>G.2R=Z_0WB*,6J
+M1FX<Y^>&P^BQU=X`$:'9K!4(B""B&)-CK%1<+T8PDN`Y$'CEH6,;6GENF41I
+M*4B43D@E0/VU$2N7KK.^,2&.\W-NEMF7K]T8OFB5A=7>I$J6LEKN4#S9_G+'
+MM_]V;3NMJI)F.:-1S(U;HUM99E]V@=/#4<KDL[47?,\Y)B+A5R_TOSFRJQ(E
+M:7X^R_0EX/1_`$:$W<%^=''7`````$E%3D2N0F"""EP@3F\@;F5W;&EN92!A
+M="!E;F0@;V8@9FEL90ID:69F("UU<DYA(&]R:6<O:V1E;&EB<RTS+C4N-"]P
+M:6-S+V-R>7-T86QS=F<O8W(T."UA8W1I;VXM:&EB97)N871E+G!N9R!K9&5L
+M:6)S+3,N-2XT+W!I8W,O8W)Y<W1A;'-V9R]C<C0X+6%C=&EO;BUH:6)E<FYA
+M=&4N<&YG"BTM+2!O<FEG+VMD96QI8G,M,RXU+C0O<&EC<R]C<GES=&%L<W9G
+M+V-R-#@M86-T:6]N+6AI8F5R;F%T92YP;F<),3DW,"TP,2TP,2`P,3HP,#HP
+M,"XP,#`P,#`P,#`@*S`Q,#`**RLK(&MD96QI8G,M,RXU+C0O<&EC<R]C<GES
+M=&%L<W9G+V-R-#@M86-T:6]N+6AI8F5R;F%T92YP;F<),C`P-BTP.2TQ.2`Q
+M,CHP.#HT,2XP,#`P,#`P,#`@*S`Q,#`*0$`@+3`L,"`K,2PQ,B!`0`HKB5!.
+M1PT**QH**P````U)2$12````,````#`(!@```%<"^8<````&8DM'1`#_`/\`
+M_Z"]IY,````)<$A9<P``"Q,```L3`0":G!@````'=$E-10?6"1,**S,[#_C&
+M4```"_E)1$%4:-[5FEML'-=YQW]G9O:^R_M5%&51$FE;BJR+%=F&8C65Y=B*
+M'XPX15S'+?J4ND4?DA9%_)`::>$T2%"D+=`T05TG-1(@L5,'C9(@K7)QI$26
+M95NJ*<NR95&FJ`M)\;XD]SYSSNG#[,SN<):4D@*%>X"#61[.G/U_M__W?6=6
+M:*T!$#N?'`*>`O8"@X#@_34T,`*\!CRMA[]\`4!HK1$[G_Q#X%]BB52B>_T@
+MZ98.WH\CEYUEZMH(Y6*^"#RAA[_\;<&.SPX!P]W]@XF[[_\DT7B2]_.HE`HK
+MG/S9=YBZ.E($=EK`4[%$*G'7P<>(Q!(4\CFNCK[#4G86Z=@WW%`8)D((#,-`
+M".'_+0P30]3^+\2*^U9,;QUA8`A`&"#<-<NRB,:39)K;B<02W'7P,8X\_Y5$
+MN9A_R@+V=O5M\<&_=?I7""W9/M!,2SJZ-OCJ%ZX$HA&8AD`3!EP/4`CA:2&T
+MYCVGM6"IJ+AXO<#\3)FVSG5$8@FZ^K9P]>*9O18PF&[I0&O-M4OG$5KRY._?
+M3G,JLC;PZE4C,`1H1&#]9NY9[5I_O[>6*RF>_4660BY+IKG=B]-!JYYMEK*S
+M;+VEB5C4I&2K-06H!^1^N:8Y%:&O/4$J;I*(F22B)DHI"BMEA[*M*51@<L$F
+M7Y)HJ.Z!_WSM&EZ+1PPV]\2X.!UP:V$!:*U!*Z1CDTDV4:[(-<'7M*1))2)\
+M8&,3&[N3:UJM?LPNY!B;*C`Z"Q7'%<+=NW8-?G:%2,5-!!*TPJ-_R]M457=Q
+MI*)LRP8D[&K=`Q^+F.RYM8T=FYHQC=\L972TINEH3;/3<3AY]AH79J-@1'V-
+MN];150OCKROMQHF'-2"`)Y%4FE)%K:%Y&.Q+<NB#O21BYO^*$BW+XD.[-K*S
+M4.('QRZR)+JJP0M:!\'7UH2/%<!8N:F4FK(M_5FR%17'G65'<]=MK7QL7]]-
+M@==:![YLM9%.QGG\P6WT12<I%$I4''`4V%+C**A(=TKM>D%`"?4Q`%!Q%,6R
+M#&C=T\`C]_:R>TO+JD`N79WBY!L7&'YGC%Q)4;0%D6B"IDR2YJ3)[0.=[-FV
+M@5OZ.AM:^.$#._CUZ1&.OELDD6FONJP7Z/@N%(Z!N@6M-15'^4'J<??!79VK
+M@I^=7^(?G_L)Y]Z;HFO]$$WM=]">:@XH00HKP=EYP1N_6&1]TQ2?^-U-M#6'
+ML_Z]=PXR,?4JY^9-DIF6NH#62%7G0E6%&[ZIE:OUJS-%E@HK#A5;4;8U95LS
+MV)?A@3W=#<'_]/B;_/%?/<O%*<7`COMIZ1U"1#.4'>V;WOML2PU6G/%B*_]\
+M9($39R<:[OF)0WM)5T8I%"M4'/RI=)5$E/05[@L@JZ&=*RE.O#U/OB2QI<8P
+M#!X_T%_+FE[.R!7XW%=>X.^?^SDM&W;3LWD/D@AE6V,[P5EQH&SK`)A\1?"C
+M-P7_^I^76<J50N[TIX_N8W+DU5`,>$03$,!S(R^5%\J*5]]=8'[9X8$]W:03
+M5DA+7_SZ#SEU89Z^;?<1S?3X6JZ_>O1K2XTMM6]13Z"RK7EG.L:_OYH/[9])
+M)?C(WO5<'Q]S@UK6+."Y3]"%/(FJ-4C9$4QERQS<W17:_"='ASG^QB@=&W>C
+M1-0'93L:IYI"'KFG@R\\OH&G'^OCT'83*26.<MG%=RGE"BLW?,7AE7?#0CQ\
+M8`?EN1%L1U*1+HV&\/J)3*E01?D']VT@:@69=GINB;_[YA$R/;>CK'1`X][\
+MX&"&^^YH)A$S2<8M#MW5ST#T$MGY64HV`;>RI:#BP`LG\RSD@M5O-&+QP-V;
+MF;PR4A<#;GD2L@`H%[A?_@HK[M\=IKN_^>IARJ1(M&_V@7A7;^[?VA1Z[J']
+MVY@9'W'Y70G_Z@5WK@S_=BQLA0_MWL3<Y"7*CJ!HBVJ!IU98H$JC];R_95V:
+M@9Y48+-S%R=YZ?51,GV[_,"R9=4"=?[=E@G'3&=;AL79<4H5Y6K?$2$KG+EB
+M<WDF:(7^GE;:DHJ)V1PENUH`-J)1I52@.;GW`^TA$/]U_&V*9%@HQRC906;Q
+M_-N6JV=>J=Q@]BQ0<?#!>_.UT4KHN9VW;V!Q=MQ7KE(K+*`1O@4,PT`8)GT=
+MB=!&QTZ]1[1I'15I,+<L62ZY2:]>D+*S>F'G"BLH0D+74^7I2^$NL+<C0R4_
+M[W=I6FN_5_`S<2"(A:"K)=R-3<XN$TG?XM]3MEW6B43`-#2&(1!"!ZK%H`5<
+MGS<TU7OK&QRW9)C(A@O)SM84RB[X]RJE?!<**]1"]3'0W1(+%69SV3SIUD2H
+M170D.$I@&K4Z?BT+&`B$KJ]S:OO-Y;3O#=[H;D\A[6*MD%M9"_DQ($R$T+4&
+MN\$P(LF&C;C7)PAAW.!PIWH?P8YN96NY<BB[Y+I0U0*A4L(5P`-E,K5HA])[
+M9UL&M-,0?&#M!MU<?0,?!&_2FC)#>TS/%S"LZ.I!C%9H)7WP0@AF%RL-@TD[
+MY;7!B[6%6`N\$(+.IG"?,;.0QXJE?2MK)5>AT;I-)Q?";+!_SQ94);<F^+6Z
+MRT;',/7@`79O#.>0B=D<5C3I*V!-%_)*B1/GET(;/;CO-NS<U-K@;Q`#0?!&
+M`+P0@GNVA`\&7CD[3C39<G,QX"6SRS,V8]/!,G?KYA[N'DHBM.MNC<`;AH%J
+M<"+C59)!\,'@W;4QPN:NH`N-362Y/+E(HK7?OR\<`]4X6'G<=_2ML!6^].F/
+MPM+%AB=MGD#G)\+Q\];%ZWZM50_>F\F8P6<^$@\]=_3T&%8L233=48NM1N7T
+MRA@00O#BB?G0$4M/1Q.?_;U-?F;TSC_KK?'#TX40D.>/O$FBM=]WF7KM(PS^
+MY$"<CDS0_2JVP_,_>YMDVP;_7HUH[$)2RM`9Y_2BP_=>G@^!>>3@'=S9-8/0
+M,E"]>K%QZE*%O_S6=8Z>'N.EUT?YU-/_P8FSUTEWW]80_-Y-%O=M#?O^=X^<
+M8WJA1'/?=C^`#0%2-F@IM:XEL/J2XKE?SK.8#S/2%__L`#L[9T/@/9X_,R[X
+MVR,Q_OK[6<XOK:-WU\>)9[I"X._>;/&9!\*NDUTN\>SA89K7;<.,IGQV\^JV
+M&R2R&JA\6?.%[T^'SG?:FI/\TZ?OX<\/2!*6;)BD#-,BV;:!5.<@IAD)@$_'
+M#?[BP3A//9R@.2%"9<OGGSE&25HT]VVO4;,P,(5>/9'5:]$'81B<>+?`,S^=
+M;DB+#]\[P#>?Z&!']_(J22K,^WLW67S]CU(-W0;@:R^>XOB9";IN_3"F%?'!
+M^Q:H2V16HR"N!^^M??MXG@T=<QRZ,]PG]+2G^8=/W<J%JUE>'I$,7S.8S<%"
+MP2W*VE(&G4TFNS=:[!N,,-"Y^JG>CW]]@6\</D/'X'[BF:X`>/=,*)@'0@(T
+M`N^QS9=^E./R5)$G#O4U+!>&^EL8Z@^ZPEH%VDJW^=J+I_C&X3.T#>PETSD0
+M`N_]O8H`#H;AUL.-P'ML\\(IS:79:WSND4Z:TO$;O\&YB9%=+O'Y9X[Q\MDI
+MNK?>3[)E74/PWJF<4LY*`:0K%0)S#?#>VNM7!)_\ZC2/[BKSZ($!HA'KMWMA
+M9SM\]\@YGCT\C(RVT[O](:*)IE7!!S.Q#%I`*]GP758CGA="4%81OO7?,7[\
+MUF4>VF;S.SNZN:6W]::`CTUD>>G4&-_[^=LL%".T;=Q/O&5]@&U6??U4Q=HX
+M!M`W!;Z>;;).$]]Y4_#<R3EZ8B/L[#?H:;'H;$W1W9[RZ_F9A3SC,\N\<G:<
+MB:PBT=I/JF<?O4V]M3UO`!Y`.G8H!K366BCI4"F72$1B-P7>I4=\JHREVLF*
+M#HY-">2U(DZE@+874'8!I2$22V'%UF/UWD;?0%,`U,V"!UA:G$=)/P:T!8S8
+MI?R04HJ%^1GBJ2:$:=T0O!OOC7G>C*:P8NE07F@$\C<!+QV;JZ/OH)3"+N4!
+M1BS@M6)N8<BQ*RBEF+SZ'FT=/<23:4PK@J"6@15N%RZ$1BFWJS4,"0BTKA,$
+M!0BD%@BAW,,HKU/3TN=S`.6_,)3^48GW]M(32CHVRXMS7!D]3ZE80$F'8FX!
+MX#7_IP;Q5$NB;=T0AOG;,<K_U5#287[B`J5\M@CL#/S8PS"M1#S5@A6-OR_!
+M.Y42I7P6)9W:CSW^O__<YG\`%BR(]:*DN:D`````245.1*Y"8((*7"!.;R!N
+M97=L:6YE(&%T(&5N9"!O9B!F:6QE"F1I9F8@+75R3F$@;W)I9R]K9&5L:6)S
+M+3,N-2XT+W!I8W,O8W)Y<W1A;'-V9R]C<C0X+6%C=&EO;BUS=7-P96YD+G!N
+M9R!K9&5L:6)S+3,N-2XT+W!I8W,O8W)Y<W1A;'-V9R]C<C0X+6%C=&EO;BUS
+M=7-P96YD+G!N9PHM+2T@;W)I9R]K9&5L:6)S+3,N-2XT+W!I8W,O8W)Y<W1A
+M;'-V9R]C<C0X+6%C=&EO;BUS=7-P96YD+G!N9PDQ.3<P+3`Q+3`Q(#`Q.C`P
+M.C`P+C`P,#`P,#`P,"`K,#$P,`HK*RL@:V1E;&EB<RTS+C4N-"]P:6-S+V-R
+M>7-T86QS=F<O8W(T."UA8W1I;VXM<W5S<&5N9"YP;F<),C`P-BTP.2TQ.2`Q
+M,CHP.#HU,RXP,#`P,#`P,#`@*S`Q,#`*0$`@+3`L,"`K,2PQ,R!`0`HKB5!.
+M1PT**QH**P````U)2$12````,````#`(!@```%<"^8<````&8DM'1`#_`/\`
+M_Z"]IY,````)<$A9<P``"Q,```L3`0":G!@````'=$E-10?6"1,+`AJ$#KN+
+M```,,$E$051HWM6::VP<UW7'?W=F]C'[X&.7;TJT*(J49=4VK3BR!3NJ6\=Q
+M51<PXB`.DK0?V[3-E[8HX@^!D19)@P1%'VCA!&V=-&B*.'83I'6"(#$**\-.
+M',F6G82*(ULF]2`MD10IOLE]S,[<>_MA9F=W.$M*3;^H`PQV=W;OF?^YY_4_
+M9U9HK0%XXI-B#'@2.`HKC`*"F^O0P!1P&OCL%Y_2DP!":\T3GQ2_!_Q3-I.R
+M1P_TTE7,<3,>2\M;3)U?H%1V*L`GOOB4_KKXU!\S!DR,CO3:'WO\7C*9)#?S
+M42[7^,9SKS)U8:$"C%O`D]E,RO[HA^_!MA-L;95Y^]QEEI8W<%UY78&F*1!"
+M8!@&0HCPLVD**\#`-`3"$/YKT^^$\*\+(1`TKAL&(`P,`88!0@@LRR)C)RD6
+M\]AV@H]^^![^YA]^:)?*SI,6</3`2$\(_D>O_!*I!.V%VTDF.W8%+PR!(8@`
+M,@P#@48($R%T%'`=($8(#MCA6K`.C9(;E"OG<>97&.@O8-L)#HST<.;-RT<M
+M8+2KF$-KS;EWKB"5X-!=3Y!(MN\,/+B)#TH#`6A#@"94)OP-&D1=,1&3L:-,
+MH<-K2FZQ-O\T:VMEBL5\/4Y'K>9LL[2\05O';9AF"BLEJ[LKT`1("($&$E8[
+M=G80T\IBFC:F9:.4PG/+:.V`+N,Z\TBO%"05`P(9.E#<3XHB=LTPTZ0R([BU
+M\Q$H%H#6&J7!=25MR3Q2.KN"K^^J%@:)1):VSE\CD]^WJ]6:CZW-)<I;T^!=
+M!%V#8*<)K(`0D?=U)4PKBZP)E/8Q`UB-+*L`4,I#>DX+X'6S^B8VS12%[KMI
+M+]Z)$.;_*I/D\EWD\EUXWCA79EXE*29))@EW'*W1@5M"PQ*@,$0#:T2!ND9:
+M2Y2J[KCS:$VF;93^H1.8EOU_2HF69;%OY'ZJU7'.O_V?]!0V,/Q(#N*F&;R_
+M<;XU="C#B)4[+9&>$YY*5E&RAI(UM'+H[+F'P>$/WA!XK77D9CL=Z72.P^,?
+M9WYYD&JU[+N5]M#*!>T%GVL()(@HY$8,!%91LH;T*F&:#'<>0?_08W1T'=D1
+MR,+52TR>>Y7IBQ,HN86@@FTGR&3:,!/M=/<<8FCX;KI[;FEIX3N//,K4N1]3
+M67V)8J<=@/6M[N<:WX64VA8#S1=\96H(H=&R45RZ!]^_(_B-]26^__S?LS!_
+MEK'1'NXXU$9[>]%/J>$F2`1OLG[UYRQ<V</^@X^3R19BLD9O?1^OG9S#-,[2
+MT9[Q@==="1FZ4'W#C3IHJ7P%*J7+>.Z&[S+:02N'?/LHO7L>;@G^%S]_@:>_
+M_`<H]SP/_<8P8R,=Y',"K1S`-[U6CO^J7=(IZ,S-LCK[%'/OGFPI\^BQQ[EX
+M.4?-*8?N@ZX!"BLA!%(U7#-40"L9N-`6*XLGD;*$5BZ&8;#WP,?#0M/@)!L\
+M^^^?YK]_\+<<N:.#N^_J(V%)M'+0RFV<VHTHT?#G$L+Y+C.3_T*ULA%SI_L>
+M^"->^^D\X/D;00TAI.]12D85`%"ZP3V4++-Z[36\V@HKO7L?QDK$V>GSW_X\
+M*XMO\.#Q0?IZDN&.:]W\BE\OM*^(KYP3*J2U0TJ\36GY/V+R;3O/GGT?8'KF
+M:AC4:-\"JBDO-%E`;^,@#DYU@9Z!]\>$3_SL^UR<>H4CXUTD$ZH)5)`U@*Z!
+MQQ@Z]#D&QSZ+F3F!E#+832]44N`KYE4G**V=BMWGSO<\RM1%!RG=P`)!G&YW
+M(3^058Q1#HW^+H:9W!:PB_SPNW_-H;$\N8R*['C]S'>^E_;N!S$M&RN18>_^
+M$UR:&V9I:0UT->)6`O]]:?E9W-KJMCJ19.3@PTR=GP]CP#0$2JFX!93VJ7$=
+MO!""[H&'8KOR7]_Z2[(9AY%]=K#CM?"U?K85C\?6';[C$:8N7`,\'S0>0KB!
+M\B[H+4K7_C6V;O_H_5R:64;@(*@@A(Y0"2-,HTI':&^N[0#9_'!$V/SL62Y.
+MO<A=M^?#P-(Z`-'DWU8RGA[S;=W,SJW[)%'7$#@Q*[B5,[C5F<BZSL)>%`6V
+M-N>`*@@#K5JD4:54I#DI]KTO!N*M-W]`/E,A9:WZKM"<64+_=G>IS!*MW6#G
+MO4"1J/5JI=.Q=4/[QIF=6P\W5RD5M8`0&AW06L/PNR@[.Q@3=&'R90;ZDABB
+MAG27T6H3I:(I4N#L0AJ\*.!`Z>94Z99_VL)Z_:RLUOPN31!@W5:)E0R"&+\9
+M2:9Z8H(VU^>YI2_1Z`&4XV<=,X'6)D(8:"TB;#&2WY$!>`,A@GOA-T$^5=`H
+M=RZV+IOKIEQ182U24H4N%.D'FF,@9??&B%FIM(R=SK5H$3T$'FCS.M,8/W!%
+MG>,$/*?>%PL$6BVCM8X4SFR^ETJU0>1B_4`8`X9`-S78K8Z,;32!;W"E>I]@
+M&+N/DX30(<]O[NC\+H_6]]50=8)>($CY,2JAE(K$@.LLQ,I[OJT;3[(#^-T5
+MC_04P=1A.WC3$)A69YRVE!9))HR=@U@ID%*'X(40U)REEL'D.'I7\,V3A=;'
+MSN"%$)B)[MB*TM8U<EDKM+*4V],H#0O4)PHKKC,?$W3@X'&V2FI7\"UZI(@%
+MFM=M!X\`RXY3]JV-.3(9*P@OP[<`S2ZDFA0(AE`;RW&J>^OAWV)AR=T5O&%P
+MG1B()H!F\$(($IECL36S[YZBHST9C0&U0PS4!;K5&:JEZ8B@OH';R+3=BY0^
+M\%;@#<,`6J51%0._/7@3]EV8J9'(JK65:=;79M@[8#=F1-MCH!X'S3<00K"Q
+M_%(,QF]_\`N<GZ;EI*VN4*UR+K;NZMPO?:YEQ-W(EY,A7?R3V+KI"R^1L2VZ
+MBLE&'5`MZ'0D!H)S9?Y;L1%+6WL?^P]_RJ^,`7C3;'(E`>65Y^.=V\^^R=Y!
+M.T(6Z[MO"$@7_A##ZHI6#:_&6V>^R=">3-/D3K=.HU+*2!-O&`9>;9&5^>=B
+M8.XX\AC7-M^#E%'V6L\NM=(;7)WZ<Z8OO,3%J1?YSC._S]4K)[EU--<2O&4?
+M)9%[,':?LQ//4*TL<OMM[?5A+&`@I6S14NKF]-C(N2MS7\.MK<>$_^:)S[.T
+M.1X#'XX=O3.DG+]B[<I?,%`\QX=^IY^>KG0+\/>V=)UJ98V)TT]S^&`[V8P9
+M5F$A=&1<T[*0-?NW5B46+WTN-M_)9`L<>_`?D?:?(I7=LDA9IL'0G@RC^[,D
+M$F84O)$C7?PS[)XG$69[C+:\_,)GL,RJO_L!>)_(F2T**YD&J71D%^N!9A@&
+MY?63+,[\<\NT.#SV*%TC7V6S=F>\PFX?OX>Y_BC9@2^W=!N`-TY]B;EW7^&!
+M^WM(),T0?-T"4NFP+[;".B!52_#U:Z7EK[.<&J+8?Z+%K+./@T?^CK65263E
+M)QC>!*@EM%SUY5@%S$0WEGV$1/8^S.3PCG5B\JWO<>;UKW#\6!<]W>EMX'WR
+MIV2C#EAQ%Z*E*X'!UL(7J)1F&!SY1$NZT%$8`\;8/F_=G5HT?OO&J2]QYO6O
+M</1(@>%]^3CXX'.S"UEU*N'5^P%!2_#U;*/+SW+EW"6ZAS]-.MUVW:I[(T>U
+MLL;++WR&A=F?\-`#O0ST9UJ"KT_E/-F@$A80D",5T&%S1_!AMI&OLSCY,1SS
+M(PP?_`B6]:L]&/2\&F<GGF'B]-,4.R6/?*"?MK;DCN";*[&4VUQ(2MWR65:K
+M/"^$(&$YI,2_,?/F]W#-1^C=\^MT%FZY(>!K*]-,7WB1M\X\1\)<Y?BQ`GL&
+MTI%LLQ/X.M:6#8W6-P:^.=NT9=<0XALL7_@:4Q-]&*EQK&0?V5PWV7PO:)_/
+ME[:NL;DQR^S,*90WQ]Y!F_O>FZ6_MS^4>3WPX#]%VAX#6FLM/$]1=6JD4O8-
+M@?<?AS:^+Q92=!77$.)E*E5)N>RQNJ(I5Q2@R&83["E8W+K7HBT_&(V1&P0/
+ML+*R@>>%"BMH"Y@JE=TQI137KJW2EDMC)6X$O!'[OI[GLQF37-:*U85Z]?U5
+MP;N>Y.UW+J.4HE1V`:8LX/3J:F6L5O-02G'ATCQ]O05RN32)A.E/&<*I@@HK
+M^G"!0*$U2!%D+M&((25$\)Q.HD+%_>]E"$K[-!H_><BFQZJ^4CI4RG4ERRN;
+MG'OG7<KE*IZG6%VM`)P._VK0T9ZVQPX4L$SCIOZK@2<5D^=76%NO5H#QR)\]
+M+-.P.SK2I%/630F^ZGBLK57QI&K\V>/_^]]M_@<(B5E4DA'"T@````!)14Y$
+AKD)@@@I<($YO(&YE=VQI;F4@870@96YD(&]F(&9I;&4*
+`
+end
--- kdelibs-3.5.7.orig/debian/patches/kubuntu_62_flash_installer.diff
+++ kdelibs-3.5.7/debian/patches/kubuntu_62_flash_installer.diff
@@ -0,0 +1,1023 @@
+--- khtml/misc/knsplugininstaller.cpp	(revision 0)
++++ khtml/misc/knsplugininstaller.cpp	(revision 0)
+@@ -0,0 +1,672 @@
++/*
++ * This file is part of the KDE project.
++ *
++ * Copyright (C) 2005 Benoit Canet <bcanet@dental-on-line.fr>
++ *           with some advices from Aurelien Gateau <agateau@dental-on-line.fr>
++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Library General Public
++ * License as published by the Free Software Foundation; either
++ * version 2 of the License, or (at your option) any later version.
++ *
++ * This library is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ * Library General Public License for more details.
++ *
++ * You should have received a copy of the GNU Library General Public License
++ * along with this library; see the file COPYING.LIB.  If not, write to
++ * the Free Software Foundation, Inc., 51 Franklin Steet, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
++ *
++ */
++
++
++#include "knsplugininstaller.moc"
++
++#include <kdebug.h>
++#include <kdiroperator.h> 
++#include <klistview.h>
++#include <klocale.h>
++#include <kstddirs.h>
++#include <ktempfile.h> 
++#include <netaccess.h>
++
++#include <qbuttongroup.h>
++#include <qdir.h>
++#include <qiodevice.h>
++#include <qfile.h>
++#include <qlabel.h>
++#include <qlayout.h> 
++#include <qmap.h>
++#include <qstringlist.h>
++#include <qtextstream.h>
++
++#include <sys/utsname.h>
++
++// Use 6031 for debugging (render_frame)
++#define DEBUG_NUMBER 6031 
++
++/*
++ * Utility class to associate a list item with a pluginInfo object
++ */
++class PluginListItem : public QListViewItem
++{
++
++public:
++    PluginListItem(KNSPluginInfo pluginInfo, QListView *parent)
++    : QListViewItem(parent, pluginInfo.pluginName())
++    , m_pluginInfo(pluginInfo) {}
++    KNSPluginInfo pluginInfo() const { return m_pluginInfo; }
++
++private:
++    KNSPluginInfo m_pluginInfo;
++
++};
++
++
++// public methods 
++
++KNSPluginInstallEngine::KNSPluginInstallEngine(KMimeType::Ptr mime) : QObject()
++{
++    m_mime = mime;
++
++    // Fill the architecture map 
++    m_archMap["i386"] = "ia32";
++    m_archMap["i486"] = "ia32";
++    m_archMap["i586"] = "ia32";
++    m_archMap["i686"] = "ia32";
++}
++
++KNSPluginInstallEngine::~KNSPluginInstallEngine()
++{
++}
++
++bool KNSPluginInstallEngine::pluginAvailable()
++{
++
++    if(m_pluginList.count())
++        return true;
++    
++    // check if pluginsListFile is present in kde config
++    if(!loadConfig())
++        return false;
++
++    // load the xml configuration file 
++    if(!loadXmlConfig())
++        return false;
++    
++    return findPlugin();
++}
++
++bool KNSPluginInstallEngine::isActive() 
++{
++    // check if we have a configuration key in the kde registry
++    QString pluginsListFile;
++    KConfig cfg("kcmnspluginrc", true);
++    cfg.setGroup("Misc");
++    pluginsListFile = cfg.readPathEntry("PluginsListFile");
++    return !pluginsListFile.isEmpty();
++}
++
++const QValueList<KNSPluginInfo>& KNSPluginInstallEngine::pluginList() const
++{
++    return m_pluginList;
++}
++
++// private methods 
++bool KNSPluginInstallEngine::loadConfig()
++{
++    QString pluginsListFile;
++    KConfig cfg("kcmnspluginrc", true);
++    cfg.setGroup("Misc");
++    pluginsListFile = cfg.readPathEntry("PluginsListFile");
++    if(!pluginsListFile.isEmpty())
++    {
++        m_pluginsListFileURL = KURL(pluginsListFile);
++        kdDebug(DEBUG_NUMBER) << "config loaded "<<endl;
++        return true;
++    }
++    return false;
++}
++
++bool KNSPluginInstallEngine::loadXmlConfig()
++{
++
++    // load the Xml configuration file 
++    if(m_pluginsXmlConfig.isEmpty())
++    {
++        QString tmpFile;
++        if(KIO::NetAccess::download(m_pluginsListFileURL, tmpFile, NULL)) {
++            QFile f(tmpFile);
++            if(!f.open(IO_ReadOnly))
++                return false;
++            QTextStream stream(&f);
++            stream.setEncoding(QTextStream::UnicodeUTF8);
++            m_pluginsXmlConfig = stream.read();
++            f.close();
++            KIO::NetAccess::removeTempFile(tmpFile);
++        } else
++            return false;
++    }
++    kdDebug(DEBUG_NUMBER) << "xml config loaded :" << endl;
++    return true;
++}
++
++bool KNSPluginInstallEngine::findPlugin()
++{
++
++    // get system infos
++    // TODO/FIX : correct this to work with x86-64 machines
++    utsname sysinfo;
++    if(uname(&sysinfo))
++        return false;
++    QString sysname(sysinfo.sysname);
++    QString machine(sysinfo.machine);
++    QString arch = m_archMap[machine]; 
++    
++    // Parse the document
++    QDomDocument doc("xmlConfig");
++    doc.setContent(m_pluginsXmlConfig);
++    QDomNodeList archList = doc.elementsByTagName(QString("arch"));
++    QDomNode archNode, osNode , pluginNode, node;
++    QDomElement e;
++
++    // look for the correct architecture
++    bool found = false;
++    unsigned int i;
++    for(i=0; i < archList.count() ; i++) {
++        archNode = archList.item(i);
++        e = archNode.toElement();
++        if( e.attribute("architecture") == arch) {
++            kdDebug(DEBUG_NUMBER) << "found correct architecture :" << arch << endl;
++            found = true;
++            break;
++        }
++    }
++
++    if(!found)
++        return false;
++    
++    // look for the correct os 
++    found = false;
++    osNode = archNode.firstChild();
++    while(!osNode.isNull()) {
++        e = osNode.toElement();
++        if( e.tagName() == "os" && e.attribute("name") == sysname) {
++            kdDebug(DEBUG_NUMBER) << "found correct os :" << sysname << endl;
++            found = true;
++            break;
++        }
++        osNode=osNode.nextSibling();
++    }
++
++    if(!found)
++        return false;
++   
++    // Look for a plugin with the given mimetype
++    pluginNode = osNode.firstChild();
++    while(!pluginNode.isNull()) {
++        e = pluginNode.toElement();
++        if( e.tagName() == "plugin" && m_mime->is(e.attribute("mimetype")) ) {
++            kdDebug(DEBUG_NUMBER) << "found correct plugin :" << e.attribute("mimetype") << endl;
++            KNSPluginInfo pluginInfo(pluginNode);
++                if(pluginInfo.isValid())
++                    m_pluginList.append(pluginInfo);
++        }
++        pluginNode=pluginNode.nextSibling();
++    }
++
++    if(m_pluginList.count())
++        return true;
++    else
++        return false;
++}
++
++
++void KNSPluginInstallEngine::startInstall(KNSPluginInfo info)
++{
++    m_toInstallPluginInfo = info;
++    // create a temporary dowload file 
++    KTempFile tempFile(locateLocal("tmp", "plugin") , QString(".tar.gz"));
++    m_tmpPluginFileName = tempFile.name();
++    tempFile.unlink();
++    tempFile.close();
++    // start the download job
++    m_downloadJob  = KIO::copy(info.pluginURL(), "file://"+m_tmpPluginFileName, false );
++    // connect signals 
++    connect(m_downloadJob, SIGNAL(percent (KIO::Job *, unsigned long)), this , SLOT(slotDownLoadProgress(KIO::Job *, unsigned long)));
++    connect(m_downloadJob, SIGNAL(result(KIO::Job *)), this, SLOT(slotDownloadResult(KIO::Job *)) );
++    kdDebug(DEBUG_NUMBER) << "download plugin " << m_tmpPluginFileName << endl;
++} 
++
++void KNSPluginInstallEngine::slotDownLoadProgress(KIO::Job *, unsigned long percent)
++{ 
++    // propagate the download progression
++    emit installProgress( ((int)percent)/3 );
++}
++
++void KNSPluginInstallEngine::slotDownloadResult(KIO::Job *job)
++{ 
++    // test if the download job suceed
++    if(job->error()) {
++        kdDebug(DEBUG_NUMBER) << "download error" << m_tmpPluginFileName << endl;
++        emit installFailed();
++     }
++     else {
++        kdDebug(DEBUG_NUMBER) << "download completed" << m_tmpPluginFileName << endl;
++        // the download succeed copy the plugins files 
++        
++       // test the existance of the homedir
++       QDir dir(QDir::homeDirPath());
++       if(!dir.exists()) {
++           emit installFailed();
++           return;
++        }
++
++       // test and create firefox plugins directory
++       if(!dir.exists(".mozilla"))
++           dir.mkdir(".mozilla");
++       if(!dir.exists(".mozilla/plugins"))
++           dir.mkdir(".mozilla/plugins");
++       // destination kurl
++       KURL destURL("file://"+QDir::homeDirPath()+"/.mozilla/plugins");
++
++       // construct the source kurlList
++       KURL::List urlList;
++       QStringList pluginFileList = m_toInstallPluginInfo.pluginFileList();
++
++       QStringList::iterator it;
++       for( it = pluginFileList.begin(); it != pluginFileList.end(); ++it ) {
++           urlList.append( KURL("tar://"+m_tmpPluginFileName+"/"+(*it)) );
++        }
++       m_installFileJob  = KIO::copy(urlList , destURL, false );
++       connect(m_installFileJob, SIGNAL(percent (KIO::Job *, unsigned long)), this , SLOT(slotCopyProgress(KIO::Job *, unsigned long)));
++       connect(m_installFileJob, SIGNAL(result(KIO::Job *)), this, SLOT(slotCopyResult(KIO::Job *)) );
++    }
++    kdDebug(DEBUG_NUMBER) << "COPY FILE " << m_tmpPluginFileName << endl;
++
++    // zero the download job pointer
++    m_downloadJob = NULL;
++}
++
++void KNSPluginInstallEngine::slotCopyProgress(KIO::Job *, unsigned long percent)
++{
++    // propagate the download progression
++    emit installProgress( ((int)percent)/3 + 33 );
++} 
++ 
++void KNSPluginInstallEngine::slotCopyResult(KIO::Job *job)
++{
++    // test if the download job suceed
++    if(job->error()) {
++        kdDebug(DEBUG_NUMBER) << "download error" << m_tmpPluginFileName << endl;
++        emit installFailed();
++    }
++    else {
++       // start the plugins scan
++       m_scanProc = new QProcess( this );
++       m_scanProc->addArgument( "nspluginscan" );
++       m_scanProc->addArgument( "--verbose" );
++
++       connect( m_scanProc, SIGNAL(readyReadStdout()),
++               this, SLOT(readScanProcFromStdout()) );
++       connect( m_scanProc, SIGNAL(processExited()),
++               this, SLOT(endScanProc()) );
++       if ( !m_scanProc->start() ) {
++            emit installFailed();
++       }
++    }
++}
++
++void KNSPluginInstallEngine::readScanProcFromStdout()
++{
++    // Monitor the scan progress
++    QString progress = m_scanProc->readLineStdout();
++    int percent;
++    bool ok;
++    percent = progress.toInt(&ok);
++    if(!ok)
++        emit installFailed();
++    emit installProgress( (percent)/3 + 66 );
++}
++
++
++void KNSPluginInstallEngine::endScanProc()
++{
++    // end of scan
++    if(m_scanProc->normalExit()) {
++        emit installProgress( 100 );
++        emit installCompleted();
++    } else
++        emit installFailed();
++}
++
++KNSPluginWizard::KNSPluginWizard(QWidget *parent, const char *name, KMimeType::Ptr mime)
++: KWizard(parent, name, true)
++, m_installEngine(mime)
++{
++    setCaption(i18n("KDE plugin wizard"));
++    setModal(true);
++
++    // read the plugin installer configuration
++    m_installEngine.pluginAvailable();
++
++    // init the wizzard Pages
++    initConfirmationPage();
++    initLicencePage();
++    initInstallationProgressPage();
++    initFinishPage();
++    initPagesButtonStates();
++
++    // connect signals and slots
++    connectSignals();
++
++    //set correct default installation status
++    m_installationComplete = false;
++
++};
++
++
++KNSPluginWizard::~KNSPluginWizard()
++{
++};
++
++void KNSPluginWizard::initConfirmationPage() 
++{
++
++        m_confirmationVBox = new QVBox(this);
++        new QLabel(i18n("The following plugins are available."), m_confirmationVBox);
++        m_pluginListView = new KListView(m_confirmationVBox);        
++        m_pluginListView->addColumn(i18n("Name"));
++        m_pluginListView->setSelectionMode(QListView::Single);
++        new QLabel(i18n("Click on next to install the selected plugin."), m_confirmationVBox);
++        addPage (m_confirmationVBox, i18n("Plugin installation confirmation"));
++        
++        bool selected = false;
++  
++        // Fill the plugin list
++        QValueList<KNSPluginInfo>::iterator it;
++        QValueList<KNSPluginInfo> pluginList = m_installEngine.pluginList();
++        for( it = pluginList.begin(); it != pluginList.end(); ++it ) {
++            PluginListItem *item = new PluginListItem((*it) , m_pluginListView);
++            if(!selected) {
++                selected = true;
++                m_pluginListView->setSelected(item, true);
++            }
++            kdDebug(DEBUG_NUMBER) << "New Plugin List item"<< endl;
++            setNextEnabled(m_confirmationVBox, true);
++        }
++}
++
++void KNSPluginWizard::initLicencePage()
++{
++    m_licenceVBox = new QVBox(this);
++    m_licencePageLabel = new QLabel(m_licenceVBox);
++    m_licencePageText = new KTextEdit(m_licenceVBox);
++    m_licencePageText->setReadOnly(true);
++    
++    // invisible buttonGroup
++    QButtonGroup *buttonGroup = new QButtonGroup(this);
++    m_agreementButtonGroup = buttonGroup;
++    buttonGroup->hide();
++    buttonGroup->setExclusive(true);
++    
++    m_licencePageAgree = new QRadioButton ( i18n("I agree."), m_licenceVBox);
++    
++    m_licencePageDisagree = new QRadioButton ( i18n("I do not agree (plugin will not be installed)."), m_licenceVBox);
++
++    buttonGroup->insert(m_licencePageAgree);
++    buttonGroup->insert(m_licencePageDisagree);
++    m_licencePageDisagree->setChecked(true);
++    
++    addPage (m_licenceVBox, i18n("Plugin licence"));
++
++
++    connect(buttonGroup, SIGNAL(clicked(int)), this, SLOT(slotAgreementClicked(int)));
++}
++
++void KNSPluginWizard::initInstallationProgressPage() {
++
++    m_installationProgressWidget = new QWidget(this);
++    QVBoxLayout *layout = new QVBoxLayout(m_installationProgressWidget);
++    layout->addWidget(new QLabel(i18n("Installation in progress."), m_installationProgressWidget));
++    layout->addItem(new QSpacerItem(40,20,QSizePolicy::Expanding,QSizePolicy::Expanding ));
++    m_installationProgressBar = new KProgress(m_installationProgressWidget);
++    m_installationProgressBar->setTotalSteps(100);
++    layout->addWidget(m_installationProgressBar);
++    
++    addPage( m_installationProgressWidget, i18n("Plugin installation"));
++    
++}
++
++void KNSPluginWizard::initFinishPage()
++{
++    m_finishWidget = new QWidget(this);
++    QVBoxLayout *layout = new QVBoxLayout(m_finishWidget);
++    layout->addItem(new QSpacerItem(40,20,QSizePolicy::Expanding,QSizePolicy::Expanding ));
++    m_finishLabel = new QLabel(m_finishWidget);
++    layout->addWidget(m_finishLabel);
++    layout->addItem(new QSpacerItem(40,20,QSizePolicy::Expanding,QSizePolicy::Expanding ));
++    
++    addPage(m_finishWidget, i18n("Installation status"));
++    
++}
++
++
++void KNSPluginWizard::initPagesButtonStates()
++{
++    // set buttons states for the confirmation page
++    setNextEnabled(m_confirmationVBox, true);
++    setFinishEnabled(m_confirmationVBox, false);
++    setHelpEnabled(m_confirmationVBox, false);
++
++    // set buttons states for the licence page
++    setNextEnabled(m_licenceVBox    , false);
++    setBackEnabled(m_licenceVBox  , false);
++    setFinishEnabled(m_licenceVBox  , false);
++    setHelpEnabled(m_licenceVBox    , false);
++    
++    // for the installation page
++    setNextEnabled(m_installationProgressWidget     , false);
++    setBackEnabled(m_installationProgressWidget     , false);
++    setFinishEnabled(m_installationProgressWidget   , false);
++    setHelpEnabled(m_installationProgressWidget     , false);
++
++    // for the finish page 
++    setNextEnabled(m_finishWidget     , false);
++    setBackEnabled(m_finishWidget     , false);
++    setFinishEnabled(m_finishWidget   , true);
++    setHelpEnabled(m_finishWidget     , false);
++}
++
++
++
++void KNSPluginWizard::connectSignals() {
++    connect(&m_installEngine, SIGNAL(installProgress(int)), m_installationProgressBar, SLOT(setProgress(int)) );
++    connect(&m_installEngine, SIGNAL(installCompleted()), this, SLOT(slotInstallationCompleted()) );
++     connect(&m_installEngine, SIGNAL(installFailed()), this, SLOT(slotInstallationFailed()) );
++     
++
++}
++
++void KNSPluginWizard::showPage(QWidget *page)
++{
++
++    // if the licence page is shown set the label and the licence content
++    if(page == m_licenceVBox && m_licencePageLabel->text().isEmpty()) {
++        KNSPluginInfo info =  static_cast<PluginListItem *>(m_pluginListView->selectedItem())->pluginInfo();
++        m_licencePageLabel->setText(i18n("To install ")+info.pluginName()+i18n(" you need to agree to the following"));
++        QString licence;
++        licence = info.licence();
++        QString tmpFile;
++        if(info.licenceURL().isValid()) 
++            // retrieve the licence if we have an url
++            if(KIO::NetAccess::download(info.licenceURL(), tmpFile, NULL)) {
++                    QFile f(tmpFile);
++                    if(f.open(IO_ReadOnly)) {
++                        QTextStream stream(&f);
++                        stream.setEncoding(QTextStream::UnicodeUTF8);
++                        licence  = stream.read();
++                        f.close();
++                        KIO::NetAccess::removeTempFile(tmpFile);
++                    }
++             } 
++        // else display the licence found in the xml config
++        m_licencePageText->setText(licence);
++
++    }
++    
++    // if the installation page is shown start the download
++    if(page == m_installationProgressWidget) {
++        KNSPluginInfo info =  static_cast<PluginListItem *>(m_pluginListView->selectedItem())->pluginInfo();
++        m_installEngine.startInstall(info);
++
++    }
++
++    // If we must display the finish page
++    if(page == m_finishWidget) {
++        if(m_installationComplete)  {
++            m_finishLabel->setText(i18n("Installation completed. Reload the page."));
++
++        } else
++            m_finishLabel->setText(i18n("Installation failed"));
++
++    }
++
++    
++    KWizard::showPage(page);
++}
++
++int KNSPluginWizard::exec()
++{
++    if(!m_installEngine.pluginList().count())
++        return QDialog::Rejected;
++
++    return KWizard::exec();
++}
++
++
++bool KNSPluginWizard::pluginAvailable()
++{
++    return m_installEngine.pluginAvailable();
++}
++
++void KNSPluginWizard::slotAgreementClicked(int id)
++{
++    if( id == m_agreementButtonGroup->id(m_licencePageAgree) ) {
++        setNextEnabled(m_licenceVBox, true);
++   
++    } else {
++        setNextEnabled(m_licenceVBox, false);
++    }
++       
++}
++
++void KNSPluginWizard::slotInstallationCompleted() 
++{
++    m_installationComplete = true;
++    // enable next button 
++    setNextEnabled(m_installationProgressWidget, true);
++    next();
++}
++void KNSPluginWizard::slotInstallationFailed()
++{
++    m_installationComplete = false;
++    showPage(m_finishWidget);
++}
++
++
++// KNSPlugin info copy constructor
++
++KNSPluginInfo::KNSPluginInfo()
++{
++
++}
++
++// KNSPlugin info constructor par an xml dom fragment
++KNSPluginInfo::KNSPluginInfo(QDomNode pluginNode)
++{
++    QDomElement e;
++    QDomNode node;
++
++    // Read plugin informations
++    node = pluginNode.firstChild();
++    while(!node.isNull()) {
++        e = node.toElement();
++        if( e.tagName() == "pluginname") {
++            kdDebug(DEBUG_NUMBER) << "found name " << e.text() << endl;
++            m_pluginName = e.text();
++        }
++        
++        if( e.tagName() == "pluginurl") {
++            kdDebug(DEBUG_NUMBER) << "found plugin url " << e.text() << endl;
++            m_pluginURL = KURL(e.text());
++        }
++
++        if( e.tagName() == "licence") {
++            kdDebug(DEBUG_NUMBER) << "found licence " << e.text() << endl;
++            m_licence = e.text();
++        }            
++        
++        if( e.tagName() == "licenceurl") {
++            kdDebug(DEBUG_NUMBER) << "found licenceurl " << e.text() << endl;
++            m_licenceURL = KURL(e.text());
++        }            
++        
++        if( e.tagName() == "pluginfile") {
++            kdDebug(DEBUG_NUMBER) << "found pluginfile " << e.text() << endl;
++            m_pluginFileList.append(e.text());
++        }
++        node = node.nextSibling();
++    }
++}
++
++
++KNSPluginInfo::~KNSPluginInfo()
++{
++
++}
++
++
++bool KNSPluginInfo::isValid() const
++{
++    // tell if the pluginInfo is a valid One
++    if( m_pluginName.isEmpty() || ( m_licence.isEmpty() && !m_licenceURL.isValid() ) || !m_pluginURL.isValid() || m_pluginFileList.empty() ) {
++        kdDebug(DEBUG_NUMBER) << "invalid plugin info" << endl;
++        return false;
++
++    }
++    
++    else {
++
++        kdDebug(DEBUG_NUMBER) << "valid plugin info" << endl;
++        return true;
++    }
++}
++
++// Accesors
++QString KNSPluginInfo::pluginName() const
++{
++    return m_pluginName;
++}
++
++QString KNSPluginInfo::licence() const
++{
++    return m_licence;
++}
++
++KURL KNSPluginInfo::licenceURL() const
++{
++    return m_licenceURL;
++}
++
++KURL KNSPluginInfo::pluginURL() const
++{
++    return m_pluginURL;
++}
++
++const QStringList& KNSPluginInfo::pluginFileList() const
++{
++    return m_pluginFileList;
++}
+--- khtml/misc/Makefile.am	(revision 558891)
++++ khtml/misc/Makefile.am	(working copy)
+@@ -22,14 +22,14 @@
+ noinst_LTLIBRARIES = libkhtmlmisc.la
+ libkhtmlmisc_la_SOURCES = \
+ 	decoder.cpp    loader.cpp loader_jpeg.cpp guess_ja.cpp\
+-	htmlhashes.cpp helper.cpp arena.cpp stringit.cpp
++	htmlhashes.cpp helper.cpp arena.cpp stringit.cpp knsplugininstaller.cpp
+ libkhtmlmisc_la_LIBADD = $(LIBJPEG)
+ libkhtmlmisc_la_LDFLAGS = $(USER_LDFLAGS)
+ libkhtmlmisc_la_METASOURCES = AUTO
+ 
+ noinst_HEADERS = \
+ 	decoder.h khtmllayout.h loader_jpeg.h loader.h guess_ja.h\
+-	stringit.h htmlhashes.h helper.h shared.h arena.h 
++	stringit.h htmlhashes.h helper.h shared.h arena.h knsplugininstaller.h
+ 
+ INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/dcop -I$(top_srcdir)/kio -I$(top_srcdir)/libltdl \
+            -I$(top_srcdir)/khtml -I$(top_srcdir)/kutils $(all_includes)
+--- khtml/misc/knsplugininstaller.h	(revision 0)
++++ khtml/misc/knsplugininstaller.h	(revision 0)
+@@ -0,0 +1,269 @@
++/*
++ * This file is part of the KDE project.
++ *
++ * Copyright (C) 2005 Benoit Canet <bcanet@dental-on-line.fr>
++ *           with some advices from Aurelien Gateau <agateau@dental-on-line.fr>
++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Library General Public
++ * License as published by the Free Software Foundation; either
++ * version 2 of the License, or (at your option) any later version.
++ *
++ * This library is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ * Library General Public License for more details.
++ *
++ * You should have received a copy of the GNU Library General Public License
++ * along with this library; see the file COPYING.LIB.  If not, write to
++ * the Free Software Foundation, Inc., 51 Franklin Steet, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
++ *
++ */
++
++#ifndef KNSPLUGININSTALLER_H
++#define KNSPLUGININSTALLER_H
++
++#include <job.h>
++#include <ktextedit.h>
++#include <kmimetype.h>
++#include <kprogress.h> 
++#include <kurl.h>
++#include <kwizard.h>
++
++#include <qbuttongroup.h>
++#include <qdom.h>
++#include <qlabel.h>
++#include <qobject.h>
++#include <qprocess.h>
++#include <qradiobutton.h>
++#include <qvaluelist.h>
++#include <qvbox.h>
++#include <qwidget.h>
++
++class QStringList;
++
++/*
++ * This class contains all the infos needed to install a given plugin
++ * Takes and parse a QDomNode in its constructor
++ */
++class KNSPluginInfo 
++{
++
++public:
++
++    /*
++     * Construct the plugin info object
++     */
++    KNSPluginInfo();
++    KNSPluginInfo(QDomNode pluginNode);
++    ~KNSPluginInfo();
++
++    /*
++     * Check the validity of the plugin info object
++     */
++    bool isValid() const;
++
++    //Accessor methods
++    QString pluginName() const;
++    QString licence() const;
++    KURL licenceURL() const;
++    KURL pluginURL() const;
++    const QStringList& pluginFileList() const;
++   
++private:
++ 
++    // plugin info
++    QString m_pluginName;
++    QString m_licence;
++    KURL m_licenceURL;
++    KURL m_pluginURL;
++    QStringList m_pluginFileList;
++    
++    
++};
++
++
++/*
++ * This class contain all the the methods used to perform a plugin installation
++ *
++ */
++class KNSPluginInstallEngine : public QObject
++{
++    Q_OBJECT
++public:
++
++    /*
++     * Construct the class
++     */
++    KNSPluginInstallEngine(KMimeType::Ptr mime);
++    ~KNSPluginInstallEngine();
++    
++    /*
++     * Check if the installer engine and wizzard is activated
++     */
++    static bool isActive();
++    /**
++     * Check the availability of a plugin 
++     */
++    bool pluginAvailable();
++    /*
++     * Return the list of plugins Available
++     */
++    const QValueList<KNSPluginInfo>& pluginList() const;
++    void startInstall(KNSPluginInfo info);
++
++    
++
++private:
++
++    // methods used to check the kde config and detect if an adequate plugin is available
++ 
++    /*
++     * load kde KNSPluginInstaller config
++     */
++    bool loadConfig();
++    /*
++     * retrieve the xml configuration file
++     */
++    bool loadXmlConfig();
++    /*
++     * parse the xml configuration file
++     */
++    bool findPlugin();
++    
++
++    QMap<QString, QString> m_archMap;
++    QString m_pluginsXmlConfig;
++    QValueList<KNSPluginInfo> m_pluginList;
++    KMimeType::Ptr m_mime;
++    KURL m_pluginsListFileURL;
++    QString m_tmpPluginFileName;
++    KIO::CopyJob *m_downloadJob;
++    KIO::CopyJob *m_installFileJob;
++    KNSPluginInfo m_toInstallPluginInfo;
++    QProcess *m_scanProc;
++    
++signals:
++    // Signals used to communicate with the wizzard 
++    void installProgress(int percent);
++    void installCompleted();
++    void installFailed();
++   
++private slots:
++    // Used to monitor the plugin downloading
++    void slotDownLoadProgress(KIO::Job *job, unsigned long percent);
++    void slotDownloadResult(KIO::Job *job);
++    
++    // Used to monitor the plugin installation
++    void slotCopyProgress(KIO::Job *job, unsigned long percent);
++    void slotCopyResult(KIO::Job *job);
++
++    // Used to monitor the plugins scan
++    void readScanProcFromStdout();
++    void endScanProc();
++
++
++
++};
++
++/*
++ * This class is a wizzard used to install a plugin 
++ */
++class KNSPluginWizard : public KWizard
++{
++    Q_OBJECT
++public:
++        
++    /**
++    * Construct a KNSpluginInstaller
++    */
++    KNSPluginWizard(QWidget *parent, const char *name,  KMimeType::Ptr mime);
++    ~KNSPluginWizard();
++
++
++    /**
++     * Lauch the wizzard
++     */
++    int exec();
++    /*
++     * Check the availability of a plugin
++     */
++    bool pluginAvailable();
++
++
++private:
++    // methods used in the constructor to init the wizzard pages
++    void initConfirmationPage();
++    void initLicencePage();
++    void initInstallationProgressPage();
++    void initFinishPage();
++
++    // in this method we disable or enable the wizzard pages buttons
++    void initPagesButtonStates();
++    
++    /*
++     * Connect signals
++     */
++    void connectSignals();
++    
++    /*
++     * Overiden method called when a page is shown
++     */
++    void showPage(QWidget *page);
++
++
++    // Plugin installation engine
++    KNSPluginInstallEngine m_installEngine;
++
++    // pages widgets
++    QVBox *m_confirmationVBox;
++    QVBox *m_licenceVBox;
++    QWidget *m_installationProgressWidget;
++    QWidget *m_finishWidget;
++    
++    // plugin list
++    KListView *m_pluginListView;
++    
++    // licence stuff
++    QLabel *m_licencePageLabel;
++    KTextEdit *m_licencePageText;
++    QRadioButton *m_licencePageAgree;
++    QRadioButton *m_licencePageDisagree;
++    QButtonGroup *m_agreementButtonGroup;
++
++    // installation progress bar
++    KProgress *m_installationProgressBar;
++
++    // Finish Label 
++    QLabel *m_finishLabel;
++
++    // installation status
++    bool m_installationComplete;
++ 
++private slots:
++    /*
++     * Check if the user Agree or disagree with the licence
++     */
++    void slotAgreementClicked(int id);
++    /*
++     * Called when the installation is completed
++     */
++    void slotInstallationCompleted();
++    /*
++     * Called when the installation has failed
++     */
++    void slotInstallationFailed();
++
++signals:
++    /*
++     * Emited when the installation has complete - TODO connect this signal to reload the page
++     */
++    void pluginInstallCompleted();
++};
++
++
++
++   
++
++#endif
+--- khtml/rendering/render_frames.cpp	(revision 558891)
++++ khtml/rendering/render_frames.cpp	(working copy)
+@@ -36,6 +36,7 @@
+ #include "misc/htmltags.h"
+ #include "khtmlview.h"
+ #include "khtml_part.h"
++#include "misc/knsplugininstaller.h"
+ 
+ #include <kapplication.h>
+ #include <kmessagebox.h>
+@@ -937,17 +938,30 @@
+         if (!mimeName.isEmpty() && part->docImpl() && !part->pluginPageQuestionAsked( serviceType ) )
+         {
+             part->setPluginPageQuestionAsked( serviceType );
+-            // Prepare the URL to show in the question (host only if http, to make it short)
+-            KURL pluginPageURL( embed->pluginPage );
+-            QString shortURL = pluginPageURL.protocol() == "http" ? pluginPageURL.host() : pluginPageURL.prettyURL();
+-            int res = KMessageBox::questionYesNo( m_view,
+-                                                  i18n("No plugin found for '%1'.\nDo you want to download one from %2?").arg(mimeName).arg(shortURL),
+-                                                  i18n("Missing Plugin"), i18n("Download"), i18n("Do Not Download"), QString("plugin-")+serviceType);
+-            if ( res == KMessageBox::Yes )
++            bool pluginAvailable;
++            pluginAvailable = false;
++            // check if a pluginList file is in the config
++            if(KNSPluginInstallEngine::isActive())
+             {
+-                // Display vendor download page
+-                ext->createNewWindow( pluginPageURL );
+-                return;
++                KNSPluginWizard pluginWizard(m_view, "pluginInstaller", mime);
++                if(pluginWizard.pluginAvailable()) {
++                    pluginAvailable = true;
++                    pluginWizard.exec();
++                }
++            } 
++            if(!pluginAvailable) {
++                // Prepare the URL to show in the question (host only if http, to make it short)
++                KURL pluginPageURL( embed->pluginPage );
++                QString shortURL = pluginPageURL.protocol() == "http" ? pluginPageURL.host() : pluginPageURL.prettyURL();
++                int res = KMessageBox::questionYesNo( m_view,
++                                                      i18n("No plugin found for '%1'.\nDo you want to download one from %2?").arg(mimeName).arg(shortURL),
++                                                      i18n("Missing Plugin"), i18n("Download"), i18n("Do Not Download"), QString("plugin-")+serviceType);
++                if ( res == KMessageBox::Yes )
++                {
++                    // Display vendor download page
++                    ext->createNewWindow( pluginPageURL );
++                    return;
++                }
+             }
+         }
+     }
+@@ -1007,4 +1021,5 @@
+   }
+ }
+ 
++
+ #include "render_frames.moc"
--- kdelibs-3.5.7.orig/debian/patches/kubuntu_64_rosetta_translation.diff
+++ kdelibs-3.5.7/debian/patches/kubuntu_64_rosetta_translation.diff
@@ -0,0 +1,11 @@
+--- kdelibs/kdecore/kaboutdata.cpp	2006-03-17 10:19:05.000000000 +0000
++++ kdelibs/kdecore/kaboutdata.cpp	2006-12-05 19:46:12.000000000 +0000
+@@ -389,7 +389,7 @@
+             "of the translation teams all over the world.</p>"
+             "<p>For more information on KDE internationalization "
+             "visit <a href=\"http://l10n.kde.org\">http://l10n.kde.org</a></p>"
+-            );
++		) + i18n("<p>Kubuntu includes additions and alterations to the KDE translation from <a href=\"https://translations.launchpad.net/\">Launchpad</a>.</p>");
+ }
+ 
+ QString
--- kdelibs-3.5.7.orig/debian/patches/kubuntu_65_nzb_mimetype.diff
+++ kdelibs-3.5.7/debian/patches/kubuntu_65_nzb_mimetype.diff
@@ -0,0 +1,27 @@
+diff -Nur kdelibs-3.5.6/mimetypes/application/Makefile.am kdelibs-3.5.6.new/mimetypes/application/Makefile.am
+--- kdelibs-3.5.6/mimetypes/application/Makefile.am	2006-07-22 10:16:37.000000000 +0200
++++ kdelibs-3.5.6.new/mimetypes/application/Makefile.am	2007-03-20 04:00:59.000000000 +0100
+@@ -67,7 +67,7 @@
+ 	x-java-jnlp-file.desktop xml-dtd.desktop fits.desktop \
+ 	x-rar-compressed.desktop \
+ 	x-sqlite2.desktop x-sqlite3.desktop chm.desktop \
+-	x-mplayer2.desktop
++	x-mplayer2.desktop x-nzb.desktop
+ 
+ mimetypeapplicationdatadir = $(kde_mimedir)/application
+ 
+diff -Nur kdelibs-3.5.6/mimetypes/application/x-nzb.desktop kdelibs-3.5.6.new/mimetypes/application/x-nzb.desktop
+--- kdelibs-3.5.6/mimetypes/application/x-nzb.desktop	1970-01-01 01:00:00.000000000 +0100
++++ kdelibs-3.5.6.new/mimetypes/application/x-nzb.desktop	2007-03-20 03:58:33.000000000 +0100
+@@ -0,0 +1,11 @@
++[Desktop Entry]
++Encoding=UTF-8
++Comment=NewzBin Usenet Index
++Hidden=false
++MimeType=application/x-nzb
++Icon=bt
++Type=MimeType
++Patterns=*.nzb
++X-KDE-AutoEmbed=false
++X-KDE-isAlso=text/xml
++
--- kdelibs-3.5.7.orig/debian/patches/kubuntu_66_konsole_pty.diff
+++ kdelibs-3.5.7/debian/patches/kubuntu_66_konsole_pty.diff
@@ -0,0 +1,236 @@
+--- orig/kdelibs-3.5.6/interfaces/terminal/kde_terminal_interface.h	2005-10-10 15:05:25.000000000 +0000
++++ kdelibs-3.5.6/interfaces/terminal/kde_terminal_interface.h	2007-01-25 14:19:45.000000000 +0000
+@@ -163,6 +163,8 @@
+      start another program instead or close it yourself.
+   */
+   virtual void setAutoDestroy(bool enabled) = 0;
++
++  virtual bool setPtyFd(int master_pty) = 0;
+ };
+ 
+ #endif
+--- orig/kdelibs-3.5.6/kdecore/kpty.cpp	2006-05-22 18:14:21.000000000 +0000
++++ kdelibs-3.5.6/kdecore/kpty.cpp	2007-01-25 14:33:13.000000000 +0000
+@@ -196,87 +196,37 @@
+   delete d;
+ }
+ 
+-bool KPty::open()
++bool KPty::setPty(int pty_master)
+ {
+-  if (d->masterFd >= 0)
+-    return true;
++   kdWarning(175)
++      << "setPty()" << endl;
++   // a pty is already open
++   if(d->masterFd >= 0) {
++      kdWarning(175)
++	 << "d->masterFd >= 0" << endl;
++      return false;
++   }
++   d->masterFd = pty_master;
++   return _attachPty(pty_master);
++}
+ 
++bool KPty::_attachPty(int pty_master)
++{
+   QCString ptyName;
+ 
+-  // Find a master pty that we can open ////////////////////////////////
+-
+-  // Because not all the pty animals are created equal, they want to
+-  // be opened by several different methods.
+-
+-  // We try, as we know them, one by one.
+-
++    kdWarning(175)
++       << "_attachPty() " << pty_master << endl;
+ #if defined(HAVE_PTSNAME) && defined(HAVE_GRANTPT)
+-#ifdef _AIX
+-  d->masterFd = ::open("/dev/ptc",O_RDWR);
+-#else
+-  d->masterFd = ::open("/dev/ptmx",O_RDWR);
+-#endif
+-  if (d->masterFd >= 0)
+-  {
+     char *ptsn = ptsname(d->masterFd);
+     if (ptsn) {
+         grantpt(d->masterFd);
+         d->ttyName = ptsn;
+-        goto gotpty;
+     } else {
+        ::close(d->masterFd);
+        d->masterFd = -1;
+     }
+-  }
+ #endif
+ 
+-  // Linux device names, FIXME: Trouble on other systems?
+-  for (const char* s3 = "pqrstuvwxyzabcdefghijklmno"; *s3; s3++)
+-  {
+-    for (const char* s4 = "0123456789abcdefghijklmnopqrstuvwxyz"; *s4; s4++)
+-    {
+-      ptyName.sprintf("/dev/pty%c%c", *s3, *s4);
+-      d->ttyName.sprintf("/dev/tty%c%c", *s3, *s4);
+-
+-      d->masterFd = ::open(ptyName.data(), O_RDWR);
+-      if (d->masterFd >= 0)
+-      {
+-#ifdef __sun
+-        /* Need to check the process group of the pty.
+-         * If it exists, then the slave pty is in use,
+-         * and we need to get another one.
+-         */
+-        int pgrp_rtn;
+-        if (ioctl(d->masterFd, TIOCGPGRP, &pgrp_rtn) == 0 || errno != EIO) {
+-          ::close(d->masterFd);
+-          d->masterFd = -1;
+-          continue;
+-        }
+-#endif /* sun */
+-        if (!access(d->ttyName.data(),R_OK|W_OK)) // checks availability based on permission bits
+-        {
+-          if (!geteuid())
+-          {
+-            struct group* p = getgrnam(TTY_GROUP);
+-            if (!p)
+-              p = getgrnam("wheel");
+-            gid_t gid = p ? p->gr_gid : getgid ();
+-
+-            chown(d->ttyName.data(), getuid(), gid);
+-            chmod(d->ttyName.data(), S_IRUSR|S_IWUSR|S_IWGRP);
+-          }
+-          goto gotpty;
+-        }
+-        ::close(d->masterFd);
+-        d->masterFd = -1;
+-      }
+-    }
+-  }
+-
+-  kdWarning(175) << "Can't open a pseudo teletype" << endl;
+-  return false;
+-
+- gotpty:
+   struct stat st;
+   if (stat(d->ttyName.data(), &st))
+     return false; // this just cannot happen ... *cough*  Yeah right, I just
+@@ -349,6 +299,92 @@
+   return true;
+ }
+ 
++bool KPty::open()
++{
++  if (d->masterFd >= 0)
++    return true;
++
++  QCString ptyName;
++
++  // Find a master pty that we can open ////////////////////////////////
++
++  // Because not all the pty animals are created equal, they want to
++  // be opened by several different methods.
++
++  // We try, as we know them, one by one.
++
++#if defined(HAVE_PTSNAME) && defined(HAVE_GRANTPT)
++#ifdef _AIX
++  d->masterFd = ::open("/dev/ptc",O_RDWR);
++#else
++  d->masterFd = ::open("/dev/ptmx",O_RDWR);
++#endif
++  if (d->masterFd >= 0)
++  {
++    char *ptsn = ptsname(d->masterFd);
++    if (ptsn) {
++        grantpt(d->masterFd);
++        d->ttyName = ptsn;
++        goto gotpty;
++    } else {
++       ::close(d->masterFd);
++       d->masterFd = -1;
++    }
++  }
++#endif
++
++  // Linux device names, FIXME: Trouble on other systems?
++  for (const char* s3 = "pqrstuvwxyzabcdefghijklmno"; *s3; s3++)
++  {
++    for (const char* s4 = "0123456789abcdefghijklmnopqrstuvwxyz"; *s4; s4++)
++    {
++      ptyName.sprintf("/dev/pty%c%c", *s3, *s4);
++      d->ttyName.sprintf("/dev/tty%c%c", *s3, *s4);
++
++      d->masterFd = ::open(ptyName.data(), O_RDWR);
++      if (d->masterFd >= 0)
++      {
++#ifdef __sun
++        /* Need to check the process group of the pty.
++         * If it exists, then the slave pty is in use,
++         * and we need to get another one.
++         */
++        int pgrp_rtn;
++        if (ioctl(d->masterFd, TIOCGPGRP, &pgrp_rtn) == 0 || errno != EIO) {
++          ::close(d->masterFd);
++          d->masterFd = -1;
++          continue;
++        }
++#endif /* sun */
++        if (!access(d->ttyName.data(),R_OK|W_OK)) // checks availability based on permission bits
++        {
++          if (!geteuid())
++          {
++            struct group* p = getgrnam(TTY_GROUP);
++            if (!p)
++              p = getgrnam("wheel");
++            gid_t gid = p ? p->gr_gid : getgid ();
++
++            chown(d->ttyName.data(), getuid(), gid);
++            chmod(d->ttyName.data(), S_IRUSR|S_IWUSR|S_IWGRP);
++          }
++          goto gotpty;
++        }
++        ::close(d->masterFd);
++        d->masterFd = -1;
++      }
++    }
++  }
++
++  kdWarning(175) << "Can't open a pseudo teletype" << endl;
++  return false;
++
++ gotpty:
++  return  _attachPty(d->masterFd);
++
++  return true;
++}
++
+ void KPty::close()
+ {
+    if (d->masterFd < 0)
+--- orig/kdelibs-3.5.6/kdecore/kpty.h	2005-10-10 15:06:02.000000000 +0000
++++ kdelibs-3.5.6/kdecore/kpty.h	2007-01-25 14:34:10.000000000 +0000
+@@ -61,6 +61,13 @@
+    */
+   bool open();
+ 
++  /** 
++   * Attach a existing pty master 
++   *
++   * @return true if the pty was successfully added
++   */ 
++  bool setPty(int pty_master);
++
+   /**
+    * Close the pty master/slave pair.
+    */
+@@ -138,6 +145,9 @@
+    */
+   int slaveFd() const;
+ 
++protected:
++  bool _attachPty(int pty_master);
++
+ private:
+   bool chownpty(bool grant);
+ 
--- kdelibs-3.5.7.orig/debian/patches/kubuntu_68_xdg_autostart.diff
+++ kdelibs-3.5.7/debian/patches/kubuntu_68_xdg_autostart.diff
@@ -0,0 +1,18 @@
+diff -Nur kdelibs-3.5.6/kinit/autostart.cpp kdelibs-3.5.6.new/kinit/autostart.cpp
+--- kdelibs-3.5.6/kinit/autostart.cpp	2006-05-22 20:14:16.000000000 +0200
++++ kdelibs-3.5.6.new/kinit/autostart.cpp	2007-02-13 16:40:34.000000000 +0100
+@@ -48,6 +48,14 @@
+   m_startList = new AutoStartList;
+   m_startList->setAutoDelete(true);
+   KGlobal::dirs()->addResourceType("autostart", "share/autostart");
++  QString xdgdirs = getenv("XDG_CONFIG_DIRS");
++  if (xdgdirs.isEmpty())
++        xdgdirs = "/etc/xdg";
++
++  QStringList xdgdirslist = QStringList::split( ':', xdgdirs );
++  for ( QStringList::Iterator itr = xdgdirslist.begin(); itr != xdgdirslist.end(); ++itr ) {
++	KGlobal::dirs()->addResourceDir("autostart", (*itr) +"/autostart");
++  }
+ }
+ 
+ AutoStart::~AutoStart()
--- kdelibs-3.5.7.orig/debian/patches/kubuntu_91_execute_feedback.diff
+++ kdelibs-3.5.7/debian/patches/kubuntu_91_execute_feedback.diff
@@ -0,0 +1,173 @@
+diff -r -u -p kdelibs-3.5.6.original/kdecore/kiconeffect.cpp kdelibs-3.5.6.patched/kdecore/kiconeffect.cpp
+--- kdelibs-3.5.6.original/kdecore/kiconeffect.cpp	2005-09-10 10:27:12.000000000 +0200
++++ kdelibs-3.5.6.patched/kdecore/kiconeffect.cpp	2007-02-09 23:49:22.000000000 +0100
+@@ -24,6 +24,9 @@
+ #include <qwidget.h>
+ #include <qpainter.h>
+ #include <qpen.h>
++#include <qapplication.h>
++#include <qpoint.h>
++#include <qrect.h>
+ 
+ #include <kdebug.h>
+ #include <kglobal.h>
+@@ -768,3 +770,148 @@ KIconEffect::visualActivate(QWidget * wi
+     }
+ }
+ 
++void
++KIconEffect::visualActivate(QWidget * widget, QRect rect, QPixmap *pixmap)
++{
++    if (!KGlobalSettings::visualActivate())
++        return;
++
++    // Image too big to display smoothly
++    if ((rect.width() > 160) || (rect.height() > 160)) {
++	visualActivate(widget, rect); // call old effect
++	return;
++    }
++
++    uint actSpeed = KGlobalSettings::visualActivateSpeed();
++    uint actCount = QMIN(rect.width(), rect.height()) / 4;
++
++
++    // Clip actCount to range 1..10.
++    if (actCount < 1)
++        actCount = 1;
++
++    else if (actCount > 10)
++        actCount = 10;
++
++    // Clip actSpeed to range 1..100.
++    if (actSpeed < 1)
++        actSpeed = 1;
++
++    else if (actSpeed > 100)
++        actSpeed = 100;
++
++    // actSpeed needs to be converted to actDelay.
++    // actDelay is inversely proportional to actSpeed and needs to be
++    // divided up into actCount portions.
++    // We also convert the us value to ms.
++
++    unsigned int actDelay = (1000 * (100 - actSpeed)) / actCount;
++
++    unsigned int deltaX = rect.width() / actCount * 1.5;
++    unsigned int deltaY = rect.height() / actCount * 1.5;
++
++    QPoint c = rect.center();
++    QRect maxRect(c.x() - (actCount * 2) * deltaX /2,
++	          c.y() - (actCount * 2) * deltaY /2,
++		  actCount * 2 * deltaX,
++		  actCount * 2 * deltaY);
++
++    // convert rect to global coordinates if needed
++    if ((widget->rect().width() <= maxRect.width())
++       || (widget->rect().height() <= maxRect.height()))
++    {
++	QPoint topLeft(rect.x(), rect.y());
++	rect.moveLeft(widget->mapToGlobal(topLeft).x());
++	rect.moveTop(widget->mapToGlobal(topLeft).y());
++	c = rect.center();
++	maxRect.setRect(c.x() - (actCount * 2) * deltaX /2,
++	        	c.y() - (actCount * 2) * deltaY /2,
++			actCount * 2 * deltaX,
++			actCount * 2 * deltaY);
++    }
++
++    QPainter *p;
++    QImage img = pixmap->convertToImage();
++    QPixmap pix;
++    QPixmap composite(maxRect.width(), maxRect.height(), -1, QPixmap::BestOptim);
++    QPainter cPainter(&composite);
++    QPoint cComposite = composite.rect().center();
++
++    // enable alpha blending
++    img.setAlphaBuffer(true);
++    
++    // Ugly hack... Get "Screenshot" to blt into and even do that on the
++    // root window if the display area of <widget> is too small
++    if ((widget->rect().width() <= maxRect.width())
++       || (widget->rect().height() <= maxRect.height()))
++    {
++        p = new QPainter(QApplication::desktop()->screen( -1 ), TRUE);
++	pix = QPixmap::grabWindow((QApplication::desktop()->screen( -1 ))->winId(),
++		    		      maxRect.x(),
++				      maxRect.y(),
++				      maxRect.width(),
++				      maxRect.height());
++    } else
++    {
++	// not as ugly as drawing directly to the screen
++	p = new QPainter(widget);
++	pix = QPixmap::grabWidget(widget,
++			              maxRect.x(),
++				      maxRect.y(),
++				      maxRect.width(),
++				      maxRect.height());
++    }
++    uchar deltaAlpha = 255 / (actCount * 1.2);
++    
++    // Activate effect like MacOS X
++    for (unsigned int i = actCount; i < actCount * 2; i++) {
++
++        int w = i * deltaX;
++        int h = i * deltaY;
++
++        rect.setRect(cComposite.x() - w / 2, cComposite.y() - h / 2, w, h);
++
++	// draw offscreen
++	cPainter.drawPixmap(0, 0, pix, 0, 0, pix.width(), pix.height());
++	cPainter.drawImage(rect, img);
++	cPainter.flush();
++
++	// put onscreen
++	p->drawPixmap(maxRect, composite);
++        p->flush();
++
++	// Fade out Icon a bit more
++        int x, y;
++        if ((img.depth() == 32) && qt_use_xrender && qt_has_xft)
++        {
++    	    int width  = img.width();
++	    int height = img.height();
++	
++	    for (y=0; y<height; y++)
++	    {
++#ifdef WORDS_BIGENDIAN
++		uchar *line = (uchar*) img.scanLine(y);
++#else
++		uchar *line = (uchar*) img.scanLine(y) + 3;
++#endif
++		for (x=0; x<width; x++)
++		{
++		    *line = (*line < deltaAlpha) ? 0 : *line - deltaAlpha;
++		    line += 4;
++		}
++	    }
++	}
++        usleep(actDelay);
++    }
++
++    // remove traces of the effect
++    if ((widget->rect().width() <= maxRect.width())
++       || (widget->rect().height() <= maxRect.height()))
++	p->drawPixmap(maxRect, pix);
++    else {
++	 p->drawPixmap(maxRect, pix);
++        widget->update(rect);
++    }
++
++    delete p;
++}
+diff -r -u -p kdelibs-3.5.6.original/kdecore/kiconeffect.h kdelibs-3.5.6.patched/kdecore/kiconeffect.h
+--- kdelibs-3.5.6.original/kdecore/kiconeffect.h	2005-09-10 10:27:12.000000000 +0200
++++ kdelibs-3.5.6.patched/kdecore/kiconeffect.h	2007-02-08 02:53:09.000000000 +0100
+@@ -152,6 +152,7 @@ public:
+      * @param rect This rectangle defines the effect's borders
+      */
+     static void visualActivate(QWidget *widget, QRect rect);
++    static void visualActivate(QWidget *widget, QRect rect, QPixmap *pixmap);
+ 
+     /**
+      * Tints an image gray.
--- kdelibs-3.5.7.orig/debian/patches/kubuntu_92_kdeprint_filter.diff
+++ kdelibs-3.5.7/debian/patches/kubuntu_92_kdeprint_filter.diff
@@ -0,0 +1,19 @@
+diff -Nur kdelibs-3.5.6/kdeprint/filters/psnup.xml kdelibs-3.5.6.new/kdeprint/filters/psnup.xml
+--- kdelibs-3.5.6/kdeprint/filters/psnup.xml	2005-09-10 10:27:40.000000000 +0200
++++ kdelibs-3.5.6.new/kdeprint/filters/psnup.xml	2007-02-22 17:28:44.000000000 +0100
+@@ -11,6 +11,15 @@
+ 		</filterarg>
+ 		<filterarg name="box" description="Border line width" format="-d%value" type="int" min="0" max="20" default="0" />
+ 		<filterarg name="margin" description="Additional margin" format="-b%value" type="int" min="0" max="100" default="0" />
++		<filterarg name="orientation" description="Orientation" format="%value" type="list" default="">
++			<value name="" description="Normal" />
++			<value name="-l" description="Landscape" />
++			<value name="-r" description="Seascape" />
++		</filterarg>
++		<filterarg name="layout" description="Layout" format="%value" type="list" default="">
++			<value name="" description="Row-Major" />
++			<value name="-c" description="Column-Major" />
++		</filterarg>
+ 	</filterargs>
+ 	<filterinput>
+ 		<filterarg name="file" format="%in" />
--- kdelibs-3.5.7.orig/debian/patches/kubuntu_95_ajax_encoding.diff
+++ kdelibs-3.5.7/debian/patches/kubuntu_95_ajax_encoding.diff
@@ -0,0 +1,12 @@
+--- kdelibs/khtml/ecma/xmlhttprequest.cpp	2006-10-09 15:18:01.000000000 +0300
++++ kdelibs/khtml/ecma/xmlhttprequest.cpp	2006-10-09 15:37:17.000000000 +0300
+@@ -639,7 +639,8 @@
+     if (!encoding.isNull())
+       decoder->setEncoding(encoding.latin1(), Decoder::EncodingFromHTTPHeader);
+     else {
+-      // FIXME: Inherit the default encoding from the parent document?
++      // W3C working draft specifies UTF-8 as the default encoding
++      decoder->setEncoding("UTF-8", Decoder::DefaultEncoding);
+     }
+   }
+   if (len == 0)
--- kdelibs-3.5.7.orig/debian/man/kmailservice.sgml
+++ kdelibs-3.5.7/debian/man/kmailservice.sgml
@@ -0,0 +1,373 @@
+<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
+
+<!-- Process this file with docbook-to-man to generate an nroff manual
+     page: `docbook-to-man manpage.sgml > manpage.1'.  You may view
+     the manual page with: `docbook-to-man manpage.sgml | nroff -man |
+     less'.  A typical entry in a Makefile or Makefile.am is:
+
+manpage.1: manpage.sgml
+	docbook-to-man $< > $@
+
+    
+	The docbook-to-man binary is found in the docbook-to-man package.
+	Please remember that if you create the nroff version in one of the
+	debian/rules file targets (such as build), you will need to include
+	docbook-to-man in your Build-Depends control field.
+
+  -->
+
+  <!-- Fill in your name for FIRSTNAME and SURNAME. -->
+  <!ENTITY dhfirstname "<firstname>Chris</firstname>">
+  <!ENTITY dhsurname   "<surname>Cheney</surname>">
+  <!-- Please adjust the date whenever revising the manpage. -->
+  <!ENTITY dhdate      "<date>November  6, 2002</date>">
+  <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
+       allowed: see man(7), man(1). -->
+  <!ENTITY dhsection   "<manvolnum>1</manvolnum>">
+  <!ENTITY dhemail     "<email>ccheney@debian.org</email>">
+  <!ENTITY dhusername  "Chris Cheney">
+  <!ENTITY dhucpackage "<refentrytitle>KMAILSERVICE</refentrytitle>">
+  <!ENTITY dhpackage   "kmailservice">
+
+  <!ENTITY debian      "<productname>Debian</productname>">
+  <!ENTITY gnu         "<acronym>GNU</acronym>">
+]>
+
+<refentry>
+  <refentryinfo>
+    <address>
+      &dhemail;
+    </address>
+    <author>
+      &dhfirstname;
+      &dhsurname;
+    </author>
+    <copyright>
+      <year>2002</year>
+      <holder>&dhusername;</holder>
+    </copyright>
+    &dhdate;
+  </refentryinfo>
+  <refmeta>
+    &dhucpackage;
+
+    &dhsection;
+  </refmeta>
+  <refnamediv>
+    <refname>&dhpackage;</refname>
+
+    <refpurpose>mail service</refpurpose>
+  </refnamediv>
+  <refsynopsisdiv>
+    <cmdsynopsis>
+      <command>&dhpackage;</command>
+
+      <arg><option><replaceable>Qt-options</replaceable></option></arg>
+      <arg><option><replaceable>KDE-options</replaceable></option></arg>
+      <arg><option><replaceable>url</replaceable></option></arg>
+
+    </cmdsynopsis>
+  </refsynopsisdiv>
+  <refsect1>
+    <title>DESCRIPTION</title>
+
+    <para>This manual page documents briefly the
+      <command>&dhpackage;</command> command.</para>
+
+    <para><command>&dhpackage;</command> is a mail service.</para>
+
+  </refsect1>
+  <refsect1>
+    <title>GENERIC OPTIONS</title>
+
+    <para>This program follows the usual GNU command line syntax,
+      with long options starting with two dashes (`-').  A summary of
+      options is included below.</para>
+
+    <variablelist>
+      <varlistentry>
+        <term><option>--author</option>
+        </term>
+        <listitem>
+          <para>Show author information.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--help</option>
+        </term>
+        <listitem>
+          <para>Show help about options.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--help-all</option>
+        </term>
+        <listitem>
+          <para>Show all options.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--help-kde</option>
+        </term>
+        <listitem>
+          <para>Show KDE specific options.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--help-qt</option>
+        </term>
+        <listitem>
+          <para>Show Qt specific options.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--license</option>
+        </term>
+        <listitem>
+          <para>Show license information.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>-v</option>, <option>--version</option>
+        </term>
+        <listitem>
+          <para>Show version information.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+  <refsect1>
+    <title>QT OPTIONS</title>
+
+    <variablelist>
+      <varlistentry>
+        <term><option>--bg</option>, <option>--background <replaceable>color</replaceable></option>
+        </term>
+        <listitem>
+          <para>Sets the default background color and an application palette (light and dark shades are calculated).</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--btn</option>, <option>--button <replaceable>color</replaceable></option>
+        </term>
+        <listitem>
+          <para>Sets the default button color.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--cmap</option>
+        </term>
+        <listitem>
+          <para>Causes the application to install a private color map on an 8-bit display.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--display <replaceable>displayname</replaceable></option>
+        </term>
+        <listitem>
+          <para>Use the X-server display 'displayname'.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--dograb</option>
+        </term>
+        <listitem>
+          <para>Running under a debugger can cause an implicit --nograb, use --dograb to override.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--fg</option>, <option>--foreground <replaceable>color</replaceable></option>
+        </term>
+        <listitem>
+          <para>Sets the default foreground color.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--fn</option>, <option>--font <replaceable>fontname</replaceable></option>
+        </term>
+        <listitem>
+          <para>Defines the application font.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--im <replaceable>XIMserver</replaceable></option>
+        </term>
+        <listitem>
+          <para>Set XIM server.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--inputstyle <replaceable>inputstyle</replaceable></option>
+        </term>
+        <listitem>
+          <para>Sets XIM (X Input Method) input style. Possible values are onthespot, overthespot, offthespot and root.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--name <replaceable>name</replaceable></option>
+        </term>
+        <listitem>
+          <para>Sets the application name.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--ncols <replaceable>count</replaceable></option>
+        </term>
+        <listitem>
+          <para>Limits the number of colors allocated in the color cube on an 8-bit display, if the application is using the QApplication::ManyColor color specification.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--nograb</option>
+        </term>
+        <listitem>
+          <para>Tells Qt to never grab the mouse or the keyboard.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--noxim</option>
+        </term>
+        <listitem>
+          <para>Disable XIM.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--reverse</option>
+        </term>
+        <listitem>
+          <para>Mirrors the whole layout of widgets.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--session <replaceable>sessionId</replaceable></option>
+        </term>
+        <listitem>
+          <para>Restore the application for the given 'sessionId'.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--sync</option>
+        </term>
+        <listitem>
+          <para>Switches to synchronous mode for debugging.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--title <replaceable>title</replaceable></option>
+        </term>
+        <listitem>
+          <para>Sets the application title (caption).</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--visual TrueColor</option>
+        </term>
+        <listitem>
+          <para>Forces the application to use a TrueColor visual on an 8-bit display.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+  <refsect1>
+    <title>KDE OPTIONS</title>
+
+    <variablelist>
+      <varlistentry>
+        <term><option>--caption <replaceable>caption</replaceable></option>
+        </term>
+        <listitem>
+          <para>Use 'caption' as name in the titlebar.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--config <replaceable>filename</replaceable></option>
+        </term>
+        <listitem>
+          <para>Use alternative configuration file.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--dcopserver <replaceable>server</replaceable></option>
+        </term>
+        <listitem>
+          <para>Use the DCOP Server specified by 'server'.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--geometry <replaceable>geometry</replaceable></option>
+        </term>
+        <listitem>
+          <para>Sets the client geometry of the main widget.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--icon <replaceable>icon</replaceable></option>
+        </term>
+        <listitem>
+          <para>Use 'icon' as the application icon.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--miniicon <replaceable>icon</replaceable></option>
+        </term>
+        <listitem>
+          <para>Use 'icon' as the icon in the titlebar.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--nocrashhandler</option>
+        </term>
+        <listitem>
+          <para>Disable crash handler, to get core dumps.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--style <replaceable>style</replaceable></option>
+        </term>
+        <listitem>
+          <para>Sets the application GUI style.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--waitforwm</option>
+        </term>
+        <listitem>
+          <para>Waits for a WM_NET compatible windowmanager.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+  <refsect1>
+    <title>AUTHOR</title>
+
+    <para>This manual page was written by &dhusername;
+      &lt;&dhemail;&gt; for the &debian; system (but may be used by
+      others).  Permission is granted to copy, distribute and/or
+      modify this document under the terms of the &gnu; General Public
+      License, Version 2 or any later version published by the Free
+      Software Foundation.
+    </para>
+
+    <para>On Debian systems, the complete text of the GNU General
+      Public License can be found in /usr/share/common-licenses/GPL.
+    </para>
+
+  </refsect1>
+</refentry>
+
+<!-- Keep this comment at the end of the file
+Local variables:
+mode: sgml
+sgml-omittag:t
+sgml-shorttag:t
+sgml-minimize-attributes:nil
+sgml-always-quote-attributes:t
+sgml-indent-step:2
+sgml-indent-data:t
+sgml-parent-document:nil
+sgml-default-dtd-file:nil
+sgml-exposed-tags:nil
+sgml-local-catalogs:nil
+sgml-local-ecat-files:nil
+End:
+-->
--- kdelibs-3.5.7.orig/debian/man/kdeinit_shutdown.1
+++ kdelibs-3.5.7/debian/man/kdeinit_shutdown.1
@@ -0,0 +1,22 @@
+.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
+.TH KDEINIT_SHUTDOWN 1 "Jun 2006" "K Desktop Environment" ""
+.SH NAME
+kdeinit_shutdown
+\- shuts down kdeinit master process
+.SH SYNOPSIS
+\fBkdeinit_shutdown
+.SH DESCRIPTION
+\fBkdeinit_shutdown\fP shuts down kdeinit master process and terminates all processes spawned from it.
+.SH SEE ALSO
+.BR kdeinit (1)
+.SH AUTHORS
+.nf
+The KDE project
+
+.br
+.fi
+Please use http://bugs.kde.org to report bugs.
+.PP
+This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the \fBDebian\fP Project (but may be used by others). Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
+.PP
+On \fBDebian\fP systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
--- kdelibs-3.5.7.orig/debian/man/dcopref.1
+++ kdelibs-3.5.7/debian/man/dcopref.1
@@ -0,0 +1,27 @@
+.TH DCOPREF 1 "Jun 2006" "K Desktop Environment" ""
+.SH NAME
+dcopref
+\- creates a DCOP reference of a KDE service from application id and object
+.SH SYNOPSIS
+.B dcopref
+.RI [ dcopclient ]\ [ dcopobject ]
+.SH DESCRIPTION
+\fBdcopref\fP creates a DCOPRef from an application id and an object id.
+.SH EXAMPLES
+.TP
+.B Create a DCOPRef from application id of a konqueror instance and its main window as object
+DREF=`dcopref 'konqueror\-6140' 'konqueror\-mainwindow#1'`
+.SH SEE ALSO
+.BR dcop (1),\  dcopclient (1),\  dcopfind (1),\  dcopobject (1),\  dcopquit (1)
+.SH AUTHORS
+.nf
+Waldo Bastian <bastian@kde.org>
+.br
+
+.br
+.fi
+Please use http://bugs.kde.org to report bugs, do not mail the author directly.
+.PP
+This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the \fBDebian\fP Project (but may be used by others). Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
+.PP
+On \fBDebian\fP systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
--- kdelibs-3.5.7.orig/debian/man/kshell.1
+++ kdelibs-3.5.7/debian/man/kshell.1
@@ -0,0 +1,60 @@
+.TH KSHELL 1 "Jun 2006" "K Desktop Environment" ""
+.SH NAME
+kdeinit_wrapper, kshell, kwrapper
+\- start applications via kdeinit
+.SH SYNOPSIS
+\fBkdeinit_wrapper\fP application [arguments]
+.sp 1
+\fBkshell\fP application [arguments]
+.sp 1
+\fBkwrapper\fP application [arguments]
+.SH DESCRIPTION
+\fBkdeinit_wrapper\fP, \fBkshell\fP and \fBkwrapper\fP start applications via \fBkdeinit\fP.
+.sp 1
+\fBkdeinit_wrapper\fP simply passes application name and arguments to \fBkdeinit\fP.
+.sp 1
+\fBkshell\fP passes application name, arguments, complete environment and current working directory to \fBkdeinit\fP.
+.sp 1
+\fBkwrapper\fP tries to make the application look like it was actually started directly and not via \fBkdeinit\fP. Like \fBkshell\fP it passes application name, arguments, complete environment and current working directory to \fBkdeinit\fP.
+.br
+Additionally it
+.IP "    \-"
+tries to redirect application output to the console from which \fBkwrapper\fP was started
+.IP "    \-"
+waits for the application to finish (but does not return its return value)
+.IP "    \-"
+passes most signals it gets to the process of the started application
+.PP
+The signal passing allows you to use Ctrl\-C to break the started application or Ctrl\-Z to stop it.
+.sp 1
+Note: With the use of \fBkwrapper\fP you will have one more process running and also the signal passing and output redirection may not work properly.
+.SH OPTIONS
+.TP
+.B application
+application to start
+.TP
+.B arguments
+arguments of application to start
+.SS 
+.SH SEE ALSO
+.BR kdeinit (1)
+.br
+.SH AUTHORS
+.nf
+\fBkshell\fP:
+.br
+Oswald Buddenhagen <ossi@kde.org>
+
+\fBkwrapper\fP and \fBkdeinit_wrapper\fP:
+.br
+Waldo Bastian <bastian@kde.org>
+Mario Weilguni <mweilguni@sime.org>
+Lubos Lunak <l.lunak@kde.org>
+
+.br
+.fi
+Please use http://bugs.kde.org to report bugs, do not mail the authors directly.
+.PP
+This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the \fBDebian\fP Project (but may be used by others). Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
+.PP
+On \fBDebian\fP systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
--- kdelibs-3.5.7.orig/debian/man/kgrantpty.1
+++ kdelibs-3.5.7/debian/man/kgrantpty.1
@@ -0,0 +1,26 @@
+.TH KGRANTPTY 1 "Jun 2006" "K Desktop Environment" "KDE internal"
+.SH NAME
+kgrantpty
+\- KDE helper program to fix terminal permissions
+.SH DESCRIPTION
+!!! \fBkgrantpty\fP needs to be installed setuid root to function. !!!
+.br
+!!! It is not intended to be called from the command line. !!!
+.sp 1
+\fBkgrantpty\fP is a helper program for the KDE core libraries to fix terminal permissions.
+.SH SEE ALSO
+.BR pts (4)
+.SH AUTHORS
+.nf
+Zack Weinberg <zack@rabi.phys.columbia.edu>
+.br
+Lars Doelle <lars.doelle@on\-line.de>
+.br
+
+.br
+.fi
+Please use http://bugs.kde.org to report bugs, do not mail the authors directly.
+.PP
+This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the \fBDebian\fP Project (but may be used by others). Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
+.PP
+On \fBDebian\fP systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
--- kdelibs-3.5.7.orig/debian/man/kdeinit.1
+++ kdelibs-3.5.7/debian/man/kdeinit.1
@@ -0,0 +1,48 @@
+.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
+.TH KDEINIT 1 "Jun 2006" "K Desktop Environment" "process launcher"
+.SH NAME
+kdeinit
+\- KDE process launcher
+.SH SYNOPSIS
+\fBkdeinit\fP [options]
+.SH DESCRIPTION
+\fBkdeinit\fP is a process launcher similar to \fBinit\fP used for booting UNIX.
+.sp 1
+\fBkdeinit\fP is used to start all other KDE programs. It can start binary program files as well as kdeinit loadable modules (KLMs).
+.sp 1
+When \fBkdeinit\fP starts for the first time it launches \fBdcopserver\fP, \fBklauncher\fP, \fBkded\fP and some additional programs specified on its command line in the \fBstartkde\fP script (normally \fBkcminit\fP and \fBknotify\fP).
+.sp 1
+The \fBkdeinit\fP master process can be used to start additional KDE programs via \fBkdeinit_wrapper\fP, \fBkshell\fP and \fBkwrapper\fP.
+.sp 1
+KLMs are dynamic libraries that work like binary programs but can be started more efficiently.
+Starting KLMs via \fBkdeinit\fP is much faster and more memory efficient because \fBkdeinit\fP is linked against all libraries a standard KDE application needs. To start a KLM \fBkdeinit\fP forks and loads the dynamic library.
+.SH OPTIONS
+.TP
+.B \-\-no\-kded
+Do not start kded
+.TP
+.B \-\-suicide
+Terminate when no KDE applications are left running
+.SS
+.SH FILES
+.TP
+.I /usr/lib/kde3
+directory with KLMs (kdeinit loadable modules)
+.SH SEE ALSO
+.BR dcopserver (1),\  kded (1),\  kcminit (1),\  kdeinit_wrapper (1),\  klauncher (1),\  kshell (1),\  kwrapper (1),\  startkde (1)
+.SH AUTHORS
+.nf
+Waldo Bastian <bastian@kde.org>
+.br
+Mario Weilguni <mweilguni@sime.com>
+.br
+Lubos Lunak <l.lunak@kde.org>
+.br
+
+.br
+.fi
+Please use http://bugs.kde.org to report bugs, do not mail the authors directly.
+.PP
+This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the \fBDebian\fP Project (but may be used by others). Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
+.PP
+On \fBDebian\fP systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
--- kdelibs-3.5.7.orig/debian/man/ktelnetservice.sgml
+++ kdelibs-3.5.7/debian/man/ktelnetservice.sgml
@@ -0,0 +1,373 @@
+<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
+
+<!-- Process this file with docbook-to-man to generate an nroff manual
+     page: `docbook-to-man manpage.sgml > manpage.1'.  You may view
+     the manual page with: `docbook-to-man manpage.sgml | nroff -man |
+     less'.  A typical entry in a Makefile or Makefile.am is:
+
+manpage.1: manpage.sgml
+	docbook-to-man $< > $@
+
+    
+	The docbook-to-man binary is found in the docbook-to-man package.
+	Please remember that if you create the nroff version in one of the
+	debian/rules file targets (such as build), you will need to include
+	docbook-to-man in your Build-Depends control field.
+
+  -->
+
+  <!-- Fill in your name for FIRSTNAME and SURNAME. -->
+  <!ENTITY dhfirstname "<firstname>Chris</firstname>">
+  <!ENTITY dhsurname   "<surname>Cheney</surname>">
+  <!-- Please adjust the date whenever revising the manpage. -->
+  <!ENTITY dhdate      "<date>November  6, 2002</date>">
+  <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
+       allowed: see man(7), man(1). -->
+  <!ENTITY dhsection   "<manvolnum>1</manvolnum>">
+  <!ENTITY dhemail     "<email>ccheney@debian.org</email>">
+  <!ENTITY dhusername  "Chris Cheney">
+  <!ENTITY dhucpackage "<refentrytitle>KTELNETSERVICE</refentrytitle>">
+  <!ENTITY dhpackage   "ktelnetservice">
+
+  <!ENTITY debian      "<productname>Debian</productname>">
+  <!ENTITY gnu         "<acronym>GNU</acronym>">
+]>
+
+<refentry>
+  <refentryinfo>
+    <address>
+      &dhemail;
+    </address>
+    <author>
+      &dhfirstname;
+      &dhsurname;
+    </author>
+    <copyright>
+      <year>2002</year>
+      <holder>&dhusername;</holder>
+    </copyright>
+    &dhdate;
+  </refentryinfo>
+  <refmeta>
+    &dhucpackage;
+
+    &dhsection;
+  </refmeta>
+  <refnamediv>
+    <refname>&dhpackage;</refname>
+
+    <refpurpose>telnet service</refpurpose>
+  </refnamediv>
+  <refsynopsisdiv>
+    <cmdsynopsis>
+      <command>&dhpackage;</command>
+
+      <arg><option><replaceable>Qt-options</replaceable></option></arg>
+      <arg><option><replaceable>KDE-options</replaceable></option></arg>
+      <arg><option><replaceable>url</replaceable></option></arg>
+
+    </cmdsynopsis>
+  </refsynopsisdiv>
+  <refsect1>
+    <title>DESCRIPTION</title>
+
+    <para>This manual page documents briefly the
+      <command>&dhpackage;</command> command.</para>
+
+    <para><command>&dhpackage;</command> is a telnet service.</para>
+
+  </refsect1>
+  <refsect1>
+    <title>GENERIC OPTIONS</title>
+
+    <para>This program follows the usual GNU command line syntax,
+      with long options starting with two dashes (`-').  A summary of
+      options is included below.</para>
+
+    <variablelist>
+      <varlistentry>
+        <term><option>--author</option>
+        </term>
+        <listitem>
+          <para>Show author information.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--help</option>
+        </term>
+        <listitem>
+          <para>Show help about options.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--help-all</option>
+        </term>
+        <listitem>
+          <para>Show all options.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--help-kde</option>
+        </term>
+        <listitem>
+          <para>Show KDE specific options.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--help-qt</option>
+        </term>
+        <listitem>
+          <para>Show Qt specific options.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--license</option>
+        </term>
+        <listitem>
+          <para>Show license information.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>-v</option>, <option>--version</option>
+        </term>
+        <listitem>
+          <para>Show version information.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+  <refsect1>
+    <title>QT OPTIONS</title>
+
+    <variablelist>
+      <varlistentry>
+        <term><option>--bg</option>, <option>--background <replaceable>color</replaceable></option>
+        </term>
+        <listitem>
+          <para>Sets the default background color and an application palette (light and dark shades are calculated).</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--btn</option>, <option>--button <replaceable>color</replaceable></option>
+        </term>
+        <listitem>
+          <para>Sets the default button color.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--cmap</option>
+        </term>
+        <listitem>
+          <para>Causes the application to install a private color map on an 8-bit display.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--display <replaceable>displayname</replaceable></option>
+        </term>
+        <listitem>
+          <para>Use the X-server display 'displayname'.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--dograb</option>
+        </term>
+        <listitem>
+          <para>Running under a debugger can cause an implicit --nograb, use --dograb to override.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--fg</option>, <option>--foreground <replaceable>color</replaceable></option>
+        </term>
+        <listitem>
+          <para>Sets the default foreground color.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--fn</option>, <option>--font <replaceable>fontname</replaceable></option>
+        </term>
+        <listitem>
+          <para>Defines the application font.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--im <replaceable>XIMserver</replaceable></option>
+        </term>
+        <listitem>
+          <para>Set XIM server.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--inputstyle <replaceable>inputstyle</replaceable></option>
+        </term>
+        <listitem>
+          <para>Sets XIM (X Input Method) input style. Possible values are onthespot, overthespot, offthespot and root.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--name <replaceable>name</replaceable></option>
+        </term>
+        <listitem>
+          <para>Sets the application name.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--ncols <replaceable>count</replaceable></option>
+        </term>
+        <listitem>
+          <para>Limits the number of colors allocated in the color cube on an 8-bit display, if the application is using the QApplication::ManyColor color specification.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--nograb</option>
+        </term>
+        <listitem>
+          <para>Tells Qt to never grab the mouse or the keyboard.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--noxim</option>
+        </term>
+        <listitem>
+          <para>Disable XIM.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--reverse</option>
+        </term>
+        <listitem>
+          <para>Mirrors the whole layout of widgets.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--session <replaceable>sessionId</replaceable></option>
+        </term>
+        <listitem>
+          <para>Restore the application for the given 'sessionId'.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--sync</option>
+        </term>
+        <listitem>
+          <para>Switches to synchronous mode for debugging.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--title <replaceable>title</replaceable></option>
+        </term>
+        <listitem>
+          <para>Sets the application title (caption).</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--visual TrueColor</option>
+        </term>
+        <listitem>
+          <para>Forces the application to use a TrueColor visual on an 8-bit display.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+  <refsect1>
+    <title>KDE OPTIONS</title>
+
+    <variablelist>
+      <varlistentry>
+        <term><option>--caption <replaceable>caption</replaceable></option>
+        </term>
+        <listitem>
+          <para>Use 'caption' as name in the titlebar.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--config <replaceable>filename</replaceable></option>
+        </term>
+        <listitem>
+          <para>Use alternative configuration file.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--dcopserver <replaceable>server</replaceable></option>
+        </term>
+        <listitem>
+          <para>Use the DCOP Server specified by 'server'.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--geometry <replaceable>geometry</replaceable></option>
+        </term>
+        <listitem>
+          <para>Sets the client geometry of the main widget.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--icon <replaceable>icon</replaceable></option>
+        </term>
+        <listitem>
+          <para>Use 'icon' as the application icon.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--miniicon <replaceable>icon</replaceable></option>
+        </term>
+        <listitem>
+          <para>Use 'icon' as the icon in the titlebar.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--nocrashhandler</option>
+        </term>
+        <listitem>
+          <para>Disable crash handler, to get core dumps.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--style <replaceable>style</replaceable></option>
+        </term>
+        <listitem>
+          <para>Sets the application GUI style.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--waitforwm</option>
+        </term>
+        <listitem>
+          <para>Waits for a WM_NET compatible windowmanager.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+  <refsect1>
+    <title>AUTHOR</title>
+
+    <para>This manual page was written by &dhusername;
+      &lt;&dhemail;&gt; for the &debian; system (but may be used by
+      others).  Permission is granted to copy, distribute and/or
+      modify this document under the terms of the &gnu; General Public
+      License, Version 2 or any later version published by the Free
+      Software Foundation.
+    </para>
+
+    <para>On Debian systems, the complete text of the GNU General
+      Public License can be found in /usr/share/common-licenses/GPL.
+    </para>
+
+  </refsect1>
+</refentry>
+
+<!-- Keep this comment at the end of the file
+Local variables:
+mode: sgml
+sgml-omittag:t
+sgml-shorttag:t
+sgml-minimize-attributes:nil
+sgml-always-quote-attributes:t
+sgml-indent-step:2
+sgml-indent-data:t
+sgml-parent-document:nil
+sgml-default-dtd-file:nil
+sgml-exposed-tags:nil
+sgml-local-catalogs:nil
+sgml-local-ecat-files:nil
+End:
+-->
--- kdelibs-3.5.7.orig/debian/man/kaddprinterwizard.sgml
+++ kdelibs-3.5.7/debian/man/kaddprinterwizard.sgml
@@ -0,0 +1,394 @@
+<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
+
+<!-- Process this file with docbook-to-man to generate an nroff manual
+     page: `docbook-to-man manpage.sgml > manpage.1'.  You may view
+     the manual page with: `docbook-to-man manpage.sgml | nroff -man |
+     less'.  A typical entry in a Makefile or Makefile.am is:
+
+manpage.1: manpage.sgml
+	docbook-to-man $< > $@
+
+    
+	The docbook-to-man binary is found in the docbook-to-man package.
+	Please remember that if you create the nroff version in one of the
+	debian/rules file targets (such as build), you will need to include
+	docbook-to-man in your Build-Depends control field.
+
+  -->
+
+  <!-- Fill in your name for FIRSTNAME and SURNAME. -->
+  <!ENTITY dhfirstname "<firstname>Chris</firstname>">
+  <!ENTITY dhsurname   "<surname>Cheney</surname>">
+  <!-- Please adjust the date whenever revising the manpage. -->
+  <!ENTITY dhdate      "<date>November  6, 2002</date>">
+  <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
+       allowed: see man(7), man(1). -->
+  <!ENTITY dhsection   "<manvolnum>1</manvolnum>">
+  <!ENTITY dhemail     "<email>ccheney@debian.org</email>">
+  <!ENTITY dhusername  "Chris Cheney">
+  <!ENTITY dhucpackage "<refentrytitle>KADDPRINTERWIZARD</refentrytitle>">
+  <!ENTITY dhpackage   "kaddprinterwizard">
+
+  <!ENTITY debian      "<productname>Debian</productname>">
+  <!ENTITY gnu         "<acronym>GNU</acronym>">
+]>
+
+<refentry>
+  <refentryinfo>
+    <address>
+      &dhemail;
+    </address>
+    <author>
+      &dhfirstname;
+      &dhsurname;
+    </author>
+    <copyright>
+      <year>2002</year>
+      <holder>&dhusername;</holder>
+    </copyright>
+    &dhdate;
+  </refentryinfo>
+  <refmeta>
+    &dhucpackage;
+
+    &dhsection;
+  </refmeta>
+  <refnamediv>
+    <refname>&dhpackage;</refname>
+
+    <refpurpose>Start the add printer wizard</refpurpose>
+  </refnamediv>
+  <refsynopsisdiv>
+    <cmdsynopsis>
+      <command>&dhpackage;</command>
+
+      <arg><option><replaceable>Qt-options</replaceable></option></arg>
+      <arg><option><replaceable>KDE-options</replaceable></option></arg>
+      <arg><option>--kdeconfig</option></arg>
+      <arg><option>--serverconfig</option></arg>
+
+    </cmdsynopsis>
+  </refsynopsisdiv>
+  <refsect1>
+    <title>DESCRIPTION</title>
+
+    <para>This manual page documents briefly the
+      <command>&dhpackage;</command> command.</para>
+
+    <para><command>&dhpackage;</command> starts the add printer wizard.</para>
+
+  </refsect1>
+  <refsect1>
+    <title>GENERIC OPTIONS</title>
+
+    <para>This program follows the usual GNU command line syntax,
+      with long options starting with two dashes (`-').  A summary of
+      options is included below.</para>
+
+    <variablelist>
+      <varlistentry>
+        <term><option>--author</option>
+        </term>
+        <listitem>
+          <para>Show author information.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--help</option>
+        </term>
+        <listitem>
+          <para>Show help about options.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--help-all</option>
+        </term>
+        <listitem>
+          <para>Show all options.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--help-kde</option>
+        </term>
+        <listitem>
+          <para>Show KDE specific options.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--help-qt</option>
+        </term>
+        <listitem>
+          <para>Show Qt specific options.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--license</option>
+        </term>
+        <listitem>
+          <para>Show license information.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>-v</option>, <option>--version</option>
+        </term>
+        <listitem>
+          <para>Show version information.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+  <refsect1>
+    <title>QT OPTIONS</title>
+
+    <variablelist>
+      <varlistentry>
+        <term><option>--bg</option>, <option>--background <replaceable>color</replaceable></option>
+        </term>
+        <listitem>
+          <para>Sets the default background color and an application palette (light and dark shades are calculated).</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--btn</option>, <option>--button <replaceable>color</replaceable></option>
+        </term>
+        <listitem>
+          <para>Sets the default button color.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--cmap</option>
+        </term>
+        <listitem>
+          <para>Causes the application to install a private color map on an 8-bit display.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--display <replaceable>displayname</replaceable></option>
+        </term>
+        <listitem>
+          <para>Use the X-server display 'displayname'.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--dograb</option>
+        </term>
+        <listitem>
+          <para>Running under a debugger can cause an implicit --nograb, use --dograb to override.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--fg</option>, <option>--foreground <replaceable>color</replaceable></option>
+        </term>
+        <listitem>
+          <para>Sets the default foreground color.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--fn</option>, <option>--font <replaceable>fontname</replaceable></option>
+        </term>
+        <listitem>
+          <para>Defines the application font.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--im <replaceable>XIMserver</replaceable></option>
+        </term>
+        <listitem>
+          <para>Set XIM server.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--inputstyle <replaceable>inputstyle</replaceable></option>
+        </term>
+        <listitem>
+          <para>Sets XIM (X Input Method) input style. Possible values are onthespot, overthespot, offthespot and root.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--name <replaceable>name</replaceable></option>
+        </term>
+        <listitem>
+          <para>Sets the application name.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--ncols <replaceable>count</replaceable></option>
+        </term>
+        <listitem>
+          <para>Limits the number of colors allocated in the color cube on an 8-bit display, if the application is using the QApplication::ManyColor color specification.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--nograb</option>
+        </term>
+        <listitem>
+          <para>Tells Qt to never grab the mouse or the keyboard.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--noxim</option>
+        </term>
+        <listitem>
+          <para>Disable XIM.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--reverse</option>
+        </term>
+        <listitem>
+          <para>Mirrors the whole layout of widgets.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--session <replaceable>sessionId</replaceable></option>
+        </term>
+        <listitem>
+          <para>Restore the application for the given 'sessionId'.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--sync</option>
+        </term>
+        <listitem>
+          <para>Switches to synchronous mode for debugging.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--title <replaceable>title</replaceable></option>
+        </term>
+        <listitem>
+          <para>Sets the application title (caption).</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--visual TrueColor</option>
+        </term>
+        <listitem>
+          <para>Forces the application to use a TrueColor visual on an 8-bit display.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+  <refsect1>
+    <title>KDE OPTIONS</title>
+
+    <variablelist>
+      <varlistentry>
+        <term><option>--caption <replaceable>caption</replaceable></option>
+        </term>
+        <listitem>
+          <para>Use 'caption' as name in the titlebar.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--config <replaceable>filename</replaceable></option>
+        </term>
+        <listitem>
+          <para>Use alternative configuration file.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--dcopserver <replaceable>server</replaceable></option>
+        </term>
+        <listitem>
+          <para>Use the DCOP Server specified by 'server'.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--geometry <replaceable>geometry</replaceable></option>
+        </term>
+        <listitem>
+          <para>Sets the client geometry of the main widget.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--icon <replaceable>icon</replaceable></option>
+        </term>
+        <listitem>
+          <para>Use 'icon' as the application icon.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--miniicon <replaceable>icon</replaceable></option>
+        </term>
+        <listitem>
+          <para>Use 'icon' as the icon in the titlebar.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--nocrashhandler</option>
+        </term>
+        <listitem>
+          <para>Disable crash handler, to get core dumps.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--style <replaceable>style</replaceable></option>
+        </term>
+        <listitem>
+          <para>Sets the application GUI style.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--waitforwm</option>
+        </term>
+        <listitem>
+          <para>Waits for a WM_NET compatible windowmanager.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+  <refsect1>
+    <title>APP OPTIONS</title>
+
+    <variablelist>
+      <varlistentry>
+        <term><option>--kdeconfig</option>
+        </term>
+        <listitem>
+          <para>Configure KDE Print.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--serverconfig</option>
+        </term>
+        <listitem>
+          <para>Configure print server.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+  <refsect1>
+    <title>AUTHOR</title>
+
+    <para>This manual page was written by &dhusername;
+      &lt;&dhemail;&gt; for the &debian; system (but may be used by
+      others).  Permission is granted to copy, distribute and/or
+      modify this document under the terms of the &gnu; General Public
+      License, Version 2 or any later version published by the Free
+      Software Foundation.
+    </para>
+
+    <para>On Debian systems, the complete text of the GNU General
+      Public License can be found in /usr/share/common-licenses/GPL.
+    </para>
+
+  </refsect1>
+</refentry>
+
+<!-- Keep this comment at the end of the file
+Local variables:
+mode: sgml
+sgml-omittag:t
+sgml-shorttag:t
+sgml-minimize-attributes:nil
+sgml-always-quote-attributes:t
+sgml-indent-step:2
+sgml-indent-data:t
+sgml-parent-document:nil
+sgml-default-dtd-file:nil
+sgml-exposed-tags:nil
+sgml-local-catalogs:nil
+sgml-local-ecat-files:nil
+End:
+-->
--- kdelibs-3.5.7.orig/debian/man/kfile.sgml
+++ kdelibs-3.5.7/debian/man/kfile.sgml
@@ -0,0 +1,457 @@
+<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
+
+<!-- Process this file with docbook-to-man to generate an nroff manual
+     page: `docbook-to-man manpage.sgml > manpage.1'.  You may view
+     the manual page with: `docbook-to-man manpage.sgml | nroff -man |
+     less'.  A typical entry in a Makefile or Makefile.am is:
+
+manpage.1: manpage.sgml
+	docbook-to-man $< > $@
+
+    
+	The docbook-to-man binary is found in the docbook-to-man package.
+	Please remember that if you create the nroff version in one of the
+	debian/rules file targets (such as build), you will need to include
+	docbook-to-man in your Build-Depends control field.
+
+  -->
+
+  <!-- Fill in your name for FIRSTNAME and SURNAME. -->
+  <!ENTITY dhfirstname "<firstname>Chris</firstname>">
+  <!ENTITY dhsurname   "<surname>Cheney</surname>">
+  <!-- Please adjust the date whenever revising the manpage. -->
+  <!ENTITY dhdate      "<date>November  6, 2002</date>">
+  <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
+       allowed: see man(7), man(1). -->
+  <!ENTITY dhsection   "<manvolnum>1</manvolnum>">
+  <!ENTITY dhemail     "<email>ccheney@debian.org</email>">
+  <!ENTITY dhusername  "Chris Cheney">
+  <!ENTITY dhucpackage "<refentrytitle>KFILE</refentrytitle>">
+  <!ENTITY dhpackage   "kfile">
+
+  <!ENTITY debian      "<productname>Debian</productname>">
+  <!ENTITY gnu         "<acronym>GNU</acronym>">
+]>
+
+<refentry>
+  <refentryinfo>
+    <address>
+      &dhemail;
+    </address>
+    <author>
+      &dhfirstname;
+      &dhsurname;
+    </author>
+    <copyright>
+      <year>2002</year>
+      <holder>&dhusername;</holder>
+    </copyright>
+    &dhdate;
+  </refentryinfo>
+  <refmeta>
+    &dhucpackage;
+
+    &dhsection;
+  </refmeta>
+  <refnamediv>
+    <refname>&dhpackage;</refname>
+
+    <refpurpose>A commandline tool to read and modify metadata of files</refpurpose>
+  </refnamediv>
+  <refsynopsisdiv>
+    <cmdsynopsis>
+      <command>&dhpackage;</command>
+
+      <arg><option><replaceable>Qt-options</replaceable></option></arg>
+      <arg><option><replaceable>KDE-options</replaceable></option></arg>
+      <arg><option><replaceable>options</replaceable></option></arg>
+      <arg><option><replaceable>files</replaceable></option></arg>
+
+    </cmdsynopsis>
+  </refsynopsisdiv>
+  <refsect1>
+    <title>DESCRIPTION</title>
+
+    <para>This manual page documents briefly the
+      <command>&dhpackage;</command> command.</para>
+
+    <para><command>&dhpackage;</command> is a commandline tool to read and modify metadata of files.</para>
+
+  </refsect1>
+  <refsect1>
+    <title>GENERIC OPTIONS</title>
+
+    <para>This program follows the usual GNU command line syntax,
+      with long options starting with two dashes (`-').  A summary of
+      options is included below.</para>
+
+    <variablelist>
+      <varlistentry>
+        <term><option>--author</option>
+        </term>
+        <listitem>
+          <para>Show author information.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--help</option>
+        </term>
+        <listitem>
+          <para>Show help about options.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--help-all</option>
+        </term>
+        <listitem>
+          <para>Show all options.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--help-kde</option>
+        </term>
+        <listitem>
+          <para>Show KDE specific options.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--help-qt</option>
+        </term>
+        <listitem>
+          <para>Show Qt specific options.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--license</option>
+        </term>
+        <listitem>
+          <para>Show license information.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>-v</option>, <option>--version</option>
+        </term>
+        <listitem>
+          <para>Show version information.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+  <refsect1>
+    <title>QT OPTIONS</title>
+
+    <variablelist>
+      <varlistentry>
+        <term><option>--bg</option>, <option>--background <replaceable>color</replaceable></option>
+        </term>
+        <listitem>
+          <para>Sets the default background color and an application palette (light and dark shades are calculated).</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--btn</option>, <option>--button <replaceable>color</replaceable></option>
+        </term>
+        <listitem>
+          <para>Sets the default button color.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--cmap</option>
+        </term>
+        <listitem>
+          <para>Causes the application to install a private color map on an 8-bit display.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--display <replaceable>displayname</replaceable></option>
+        </term>
+        <listitem>
+          <para>Use the X-server display 'displayname'.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--dograb</option>
+        </term>
+        <listitem>
+          <para>Running under a debugger can cause an implicit --nograb, use --dograb to override.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--fg</option>, <option>--foreground <replaceable>color</replaceable></option>
+        </term>
+        <listitem>
+          <para>Sets the default foreground color.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--fn</option>, <option>--font <replaceable>fontname</replaceable></option>
+        </term>
+        <listitem>
+          <para>Defines the application font.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--im <replaceable>XIMserver</replaceable></option>
+        </term>
+        <listitem>
+          <para>Set XIM server.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--inputstyle <replaceable>inputstyle</replaceable></option>
+        </term>
+        <listitem>
+          <para>Sets XIM (X Input Method) input style. Possible values are onthespot, overthespot, offthespot and root.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--name <replaceable>name</replaceable></option>
+        </term>
+        <listitem>
+          <para>Sets the application name.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--ncols <replaceable>count</replaceable></option>
+        </term>
+        <listitem>
+          <para>Limits the number of colors allocated in the color cube on an 8-bit display, if the application is using the QApplication::ManyColor color specification.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--nograb</option>
+        </term>
+        <listitem>
+          <para>Tells Qt to never grab the mouse or the keyboard.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--noxim</option>
+        </term>
+        <listitem>
+          <para>Disable XIM.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--reverse</option>
+        </term>
+        <listitem>
+          <para>Mirrors the whole layout of widgets.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--session <replaceable>sessionId</replaceable></option>
+        </term>
+        <listitem>
+          <para>Restore the application for the given 'sessionId'.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--sync</option>
+        </term>
+        <listitem>
+          <para>Switches to synchronous mode for debugging.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--title <replaceable>title</replaceable></option>
+        </term>
+        <listitem>
+          <para>Sets the application title (caption).</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--visual TrueColor</option>
+        </term>
+        <listitem>
+          <para>Forces the application to use a TrueColor visual on an 8-bit display.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+  <refsect1>
+    <title>KDE OPTIONS</title>
+
+    <variablelist>
+      <varlistentry>
+        <term><option>--caption <replaceable>caption</replaceable></option>
+        </term>
+        <listitem>
+          <para>Use 'caption' as name in the titlebar.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--config <replaceable>filename</replaceable></option>
+        </term>
+        <listitem>
+          <para>Use alternative configuration file.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--dcopserver <replaceable>server</replaceable></option>
+        </term>
+        <listitem>
+          <para>Use the DCOP Server specified by 'server'.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--geometry <replaceable>geometry</replaceable></option>
+        </term>
+        <listitem>
+          <para>Sets the client geometry of the main widget.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--icon <replaceable>icon</replaceable></option>
+        </term>
+        <listitem>
+          <para>Use 'icon' as the application icon.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--miniicon <replaceable>icon</replaceable></option>
+        </term>
+        <listitem>
+          <para>Use 'icon' as the icon in the titlebar.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--nocrashhandler</option>
+        </term>
+        <listitem>
+          <para>Disable crash handler, to get core dumps.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--style <replaceable>style</replaceable></option>
+        </term>
+        <listitem>
+          <para>Sets the application GUI style.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--waitforwm</option>
+        </term>
+        <listitem>
+          <para>Waits for a WM_NET compatible windowmanager.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+  <refsect1>
+    <title>APP OPTIONS</title>
+
+    <variablelist>
+      <varlistentry>
+        <term><option>--av</option>, <option>--allValues</option>
+        </term>
+        <listitem>
+          <para>Prints all metadata values, available in the given file(s).</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--dialog</option>
+        </term>
+        <listitem>
+          <para>Opens a KDE properties dialog to allow viewing and modifying of metadata of the given file(s).</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--getValue <replaceable>key</replaceable></option>
+        </term>
+        <listitem>
+          <para>Prints the value for 'key' of the given file(s). 'key' may also be a comma-separated list of keys.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--la</option>, <option>--listavailable</option>
+        </term>
+        <listitem>
+          <para>List all metadata keys which have a value in the given file(s).</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--lp</option>, <option>--listpreferred <replaceable>mimetype</replaceable></option>
+        </term>
+        <listitem>
+          <para>List all preferred metadata keys of the given file(s). If mimetype is not specified, the mimetype of the given files is used.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--ls</option>, <option>--listsupported <replaceable>mimetype</replaceable></option>
+        </term>
+        <listitem>
+          <para>List all supported metadata keys of the given file(s). If mimetype is not specified, the mimetype of the given files is used.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>-m</option>, <option>--nomimetype</option>
+        </term>
+        <listitem>
+          <para>Print the mimetype of the given file(s).</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--pv</option>, <option>--preferredValues</option>
+        </term>
+        <listitem>
+          <para>Prints the preferred metadata values, available in the given file(s).</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>-q</option>, <option>--quiet</option>
+        </term>
+        <listitem>
+          <para>Don't print a warning when more than one file was given and they don't have all the same mimetype.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--setValue <replaceable>key=value</replaceable></option>
+        </term>
+        <listitem>
+          <para>Attempts to set the value 'value' for the metadata key 'key' for the given file(s).</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--sm</option>, <option>--supportedMimetypes</option>
+        </term>
+        <listitem>
+          <para>Prints all mimetypes for which metadata support is available.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+  <refsect1>
+    <title>AUTHOR</title>
+
+    <para>This manual page was written by &dhusername;
+      &lt;&dhemail;&gt; for the &debian; system (but may be used by
+      others).  Permission is granted to copy, distribute and/or
+      modify this document under the terms of the &gnu; General Public
+      License, Version 2 or any later version published by the Free
+      Software Foundation.
+    </para>
+
+    <para>On Debian systems, the complete text of the GNU General
+      Public License can be found in /usr/share/common-licenses/GPL.
+    </para>
+
+  </refsect1>
+</refentry>
+
+<!-- Keep this comment at the end of the file
+Local variables:
+mode: sgml
+sgml-omittag:t
+sgml-shorttag:t
+sgml-minimize-attributes:nil
+sgml-always-quote-attributes:t
+sgml-indent-step:2
+sgml-indent-data:t
+sgml-parent-document:nil
+sgml-default-dtd-file:nil
+sgml-exposed-tags:nil
+sgml-local-catalogs:nil
+sgml-local-ecat-files:nil
+End:
+-->
--- kdelibs-3.5.7.orig/debian/man/preparetips.1
+++ kdelibs-3.5.7/debian/man/preparetips.1
@@ -0,0 +1,24 @@
+.TH PREPARETIPS 1 "Jun 2006" "K Desktop Environment" "translation tool"
+.SH NAME
+preparetips
+\- extract text from tips file
+.SH SYNOPSIS
+\fBpreparetips\fP
+.SH DESCRIPTION
+\fBpreparetips\fP is a script to extract the text from a tips file. It outputs the text so \fBxgettext\fP can add the tips to a PO file. PO files provide a human\-readable string format used for translations.
+.sp 1
+\fBpreparetips\fP looks for \fIdata/tips\-en\fP as tips file.
+.SH SEE ALSO
+.BR xgettext (1)
+.SH AUTHORS
+.nf
+Matthias Kiefer <matthias.kiefer@gmx.de>
+.br
+
+.br
+.fi
+Please use http://bugs.kde.org to report bugs, do not mail the author directly.
+.PP
+This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the \fBDebian\fP Project (but may be used by others). Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
+.PP
+On \fBDebian\fP systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
--- kdelibs-3.5.7.orig/debian/man/kab2kabc.1
+++ kdelibs-3.5.7/debian/man/kab2kabc.1
@@ -0,0 +1,155 @@
+.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
+.TH KAB2KABC 1 "Jun 2006" "K Desktop Environment" "Kab to Kabc converter"
+.SH NAME
+kab2kabc
+\- KDE address book converter
+.SH SYNOPSIS
+\fBkab2kabc\fP [Qt\-options] [KDE\-options] [options] 
+.SH DESCRIPTION
+\fBkab2kabc\fP converts a KDE address book from old Kab format to new Kabc format.
+.SH OPTIONS
+.SS Options:
+.TP
+.B  \-\-disable\-autostart  
+Disable automatic startup on login
+.TP
+.B  \-\-quiet  
+
+.TP
+.B \-o,  \-\-override  
+Override existing entries [1]
+.SS Generic options:
+.TP
+.B  \-\-help  
+Show help about options
+.TP
+.B  \-\-help\-qt  
+Show Qt specific options
+.TP
+.B  \-\-help\-kde  
+Show KDE specific options
+.TP
+.B  \-\-help\-all  
+Show all options
+.TP
+.B  \-\-author  
+Show author information
+.TP
+.B \-v,  \-\-version  
+Show version information
+.TP
+.B  \-\-license  
+Show license information
+.TP
+.B  \-\-  
+End of options
+.SS 
+.SS KDE options:
+.TP
+.B  \-\-caption  <caption>
+Use 'caption' as name in the titlebar
+.TP
+.B  \-\-icon  <icon>
+Use 'icon' as the application icon
+.TP
+.B  \-\-miniicon  <icon>
+Use 'icon' as the icon in the titlebar
+.TP
+.B  \-\-config  <filename>
+Use alternative configuration file
+.TP
+.B  \-\-dcopserver  <server>
+Use the DCOP Server specified by 'server'
+.TP
+.B  \-\-nocrashhandler  
+Disable crash handler, to get core dumps
+.TP
+.B  \-\-waitforwm  
+Waits for a WM_NET compatible windowmanager
+.TP
+.B  \-\-style  <style>
+sets the application GUI style
+.TP
+.B  \-\-geometry  <geometry>
+sets the client geometry of the main widget \- see man X for the argument format
+.SS 
+.SS Qt options:
+.TP
+.B  \-\-display  <displayname>
+Use the X\-server display 'displayname'
+.TP
+.B  \-\-session  <sessionId>
+Restore the application for the given 'sessionId'
+.TP
+.B  \-\-cmap  
+Causes the application to install a private color
+map on an 8\-bit display
+.TP
+.B  \-\-ncols  <count>
+Limits the number of colors allocated in the color
+cube on an 8\-bit display, if the application is
+using the QApplication::ManyColor color
+specification
+.TP
+.B  \-\-nograb  
+tells Qt to never grab the mouse or the keyboard
+.TP
+.B  \-\-dograb  
+running under a debugger can cause an implicit
+\-nograb, use \-dograb to override
+.TP
+.B  \-\-sync  
+switches to synchronous mode for debugging
+.TP
+.B \-\-fn,  \-\-font  <fontname>
+defines the application font
+.TP
+.B \-\-bg,  \-\-background  <color>
+sets the default background color and an
+application palette (light and dark shades are
+calculated)
+.TP
+.B \-\-fg,  \-\-foreground  <color>
+sets the default foreground color
+.TP
+.B \-\-btn,  \-\-button  <color>
+sets the default button color
+.TP
+.B  \-\-name  <name>
+sets the application name
+.TP
+.B  \-\-title  <title>
+sets the application title (caption)
+.TP
+.B  \-\-visual  TrueColor
+forces the application to use a TrueColor visual on
+an 8\-bit display
+.TP
+.B  \-\-inputstyle  <inputstyle>
+sets XIM (X Input Method) input style. Possible
+values are onthespot, overthespot, offthespot and
+root
+.TP
+.B  \-\-im  <XIM server>
+set XIM server
+.TP
+.B  \-\-noxim  
+disable XIM
+.TP
+.B  \-\-reverse  
+mirrors the whole layout of widgets
+.SS 
+.SH SEE ALSO
+.BR kaddressbook (1)
+.SH AUTHORS
+.nf
+Cornelius Schumacher <schumacher@kde.org>
+.br
+
+.br
+.fi
+Please use http://bugs.kde.org to report bugs, do not mail the author directly.
+.PP
+This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the \fBDebian\fP Project (but may be used by others). Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
+.PP
+On \fBDebian\fP systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
--- kdelibs-3.5.7.orig/debian/man/kstartupconfig.1
+++ kdelibs-3.5.7/debian/man/kstartupconfig.1
@@ -0,0 +1,57 @@
+.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
+.TH KSTARTUPCONFIG 1 "Jun 2006" "K Desktop Environment" "configuration options loader"
+.SH NAME
+kstartupconfig, kdostartupconfig
+\- KDE configuration options loader
+.SH SYNOPSIS
+\fBkstartupconfig\fP [$KDEHOME]
+.sp 1
+\fBkdostartupconfig\fP
+.SH DESCRIPTION
+\fBkstartupconfig\fP loads configuration options for use in \fBstartkde\fP. It saves loading time as there is no need to launch programs linked to KDE libraries. \fBstartupconfig\fP uses a cache of some Kconfig options that are updated by \fBkdostartupconfig\fP. The cache is implemented as script file that is sourced and provides the options as shell variables.
+.sp 1
+The configuration options to load are stored in \fIstartupconfigkeys\fP as one option per line. They follow the format <file> <group> <key> <default>. A complete group is addressed as <file> [<group>]. The configuration options are processed in the specified order so the missing default values for groups can be specified as single options after the group option.
+.sp 1
+\fBkstartupconfig\fP stores every line from \fIstartupconfigkeys\fP in \fIstartupconfigfiles\fP followed by the paths of all files relevant to the option. Lines with non\-existent files start with '!' in case they are created later. The list of files is terminated by a line starting with '*'.
+.sp 1
+If the timestamps of all relevant files are older than the timestamp of \fIstartupconfigfile\fP there is no need to update anything. Otherwise \fBkdostartupconfig\fP is launched to create or update the necessary files.
+.sp 1
+\fBkdostartupconfig\fP writes values of the options to \fIstartupconfig\fP. \fIstartupconfig\fP is a shell script that sets the values to shell variables. The variables are named <file>_<group>_<key>.
+.sp 1
+\fBNotes:\fP
+.IP "     \-"
+the \fIkdeglobals\fP config file is not used as a dependency for other config files
+.IP "     \-"
+do not use frequently changed config files since the checking is timestamp\-based
+.IP "     \-"
+if \fBkconf_update\fP is used to update an option also touch the matching global config file to allow \fBkstartupconfig\fP to see changes
+.SH OPTIONS
+.TP
+.B $KDEHOME
+KDE home directory, if different to ~/.kde
+.SS
+.SH FILES
+In case $KDEHOME is not set ~/.kde is assumed.
+.TP
+.I $KDEHOME/share/config/startupconfig
+script, sourced to set shell variables with configuration options
+.TP
+.I $KDEHOME/share/config/startupconfigfiles
+configuration options and files they belong to
+.TP
+.I $KDEHOME/share/config/startupconfigkeys
+configuration options to load
+.SH SEE ALSO
+.BR kconf_update (1),\  startkde (1)
+.SH AUTHORS
+.nf
+Lubos Lunak <l.lunak@kde.org>
+.br
+
+.br
+.fi
+Please use http://bugs.kde.org to report bugs, do not mail the author directly.
+.PP
+This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the \fBDebian\fP Project (but may be used by others). Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
+.PP
+On \fBDebian\fP systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
--- kdelibs-3.5.7.orig/debian/man/kconf_update.sgml
+++ kdelibs-3.5.7/debian/man/kconf_update.sgml
@@ -0,0 +1,387 @@
+<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
+
+<!-- Process this file with docbook-to-man to generate an nroff manual
+     page: `docbook-to-man manpage.sgml > manpage.1'.  You may view
+     the manual page with: `docbook-to-man manpage.sgml | nroff -man |
+     less'.  A typical entry in a Makefile or Makefile.am is:
+
+manpage.1: manpage.sgml
+	docbook-to-man $< > $@
+
+    
+	The docbook-to-man binary is found in the docbook-to-man package.
+	Please remember that if you create the nroff version in one of the
+	debian/rules file targets (such as build), you will need to include
+	docbook-to-man in your Build-Depends control field.
+
+  -->
+
+  <!-- Fill in your name for FIRSTNAME and SURNAME. -->
+  <!ENTITY dhfirstname "<firstname>Chris</firstname>">
+  <!ENTITY dhsurname   "<surname>Cheney</surname>">
+  <!-- Please adjust the date whenever revising the manpage. -->
+  <!ENTITY dhdate      "<date>November  6, 2002</date>">
+  <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
+       allowed: see man(7), man(1). -->
+  <!ENTITY dhsection   "<manvolnum>1</manvolnum>">
+  <!ENTITY dhemail     "<email>ccheney@debian.org</email>">
+  <!ENTITY dhusername  "Chris Cheney">
+  <!ENTITY dhucpackage "<refentrytitle>KCONF_UPDATE</refentrytitle>">
+  <!ENTITY dhpackage   "kconf_update">
+
+  <!ENTITY debian      "<productname>Debian</productname>">
+  <!ENTITY gnu         "<acronym>GNU</acronym>">
+]>
+
+<refentry>
+  <refentryinfo>
+    <address>
+      &dhemail;
+    </address>
+    <author>
+      &dhfirstname;
+      &dhsurname;
+    </author>
+    <copyright>
+      <year>2002</year>
+      <holder>&dhusername;</holder>
+    </copyright>
+    &dhdate;
+  </refentryinfo>
+  <refmeta>
+    &dhucpackage;
+
+    &dhsection;
+  </refmeta>
+  <refnamediv>
+    <refname>&dhpackage;</refname>
+
+    <refpurpose>KDE Tool for updating user configuration files</refpurpose>
+  </refnamediv>
+  <refsynopsisdiv>
+    <cmdsynopsis>
+      <command>&dhpackage;</command>
+
+      <arg><option><replaceable>Qt-options</replaceable></option></arg>
+      <arg><option><replaceable>KDE-options</replaceable></option></arg>
+      <arg><option>--check <replaceable>update-file</replaceable></option></arg>
+      <arg><option><replaceable>file</replaceable></option></arg>
+
+    </cmdsynopsis>
+  </refsynopsisdiv>
+  <refsect1>
+    <title>DESCRIPTION</title>
+
+    <para>This manual page documents briefly the
+      <command>&dhpackage;</command> command.</para>
+
+    <para><command>&dhpackage;</command> is a KDE Tool for updating user configuration files.</para>
+
+  </refsect1>
+  <refsect1>
+    <title>GENERIC OPTIONS</title>
+
+    <para>This program follows the usual GNU command line syntax,
+      with long options starting with two dashes (`-').  A summary of
+      options is included below.</para>
+
+    <variablelist>
+      <varlistentry>
+        <term><option>--author</option>
+        </term>
+        <listitem>
+          <para>Show author information.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--help</option>
+        </term>
+        <listitem>
+          <para>Show help about options.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--help-all</option>
+        </term>
+        <listitem>
+          <para>Show all options.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--help-kde</option>
+        </term>
+        <listitem>
+          <para>Show KDE specific options.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--help-qt</option>
+        </term>
+        <listitem>
+          <para>Show Qt specific options.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--license</option>
+        </term>
+        <listitem>
+          <para>Show license information.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>-v</option>, <option>--version</option>
+        </term>
+        <listitem>
+          <para>Show version information.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+  <refsect1>
+    <title>QT OPTIONS</title>
+
+    <variablelist>
+      <varlistentry>
+        <term><option>--bg</option>, <option>--background <replaceable>color</replaceable></option>
+        </term>
+        <listitem>
+          <para>Sets the default background color and an application palette (light and dark shades are calculated).</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--btn</option>, <option>--button <replaceable>color</replaceable></option>
+        </term>
+        <listitem>
+          <para>Sets the default button color.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--cmap</option>
+        </term>
+        <listitem>
+          <para>Causes the application to install a private color map on an 8-bit display.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--display <replaceable>displayname</replaceable></option>
+        </term>
+        <listitem>
+          <para>Use the X-server display 'displayname'.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--dograb</option>
+        </term>
+        <listitem>
+          <para>Running under a debugger can cause an implicit --nograb, use --dograb to override.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--fg</option>, <option>--foreground <replaceable>color</replaceable></option>
+        </term>
+        <listitem>
+          <para>Sets the default foreground color.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--fn</option>, <option>--font <replaceable>fontname</replaceable></option>
+        </term>
+        <listitem>
+          <para>Defines the application font.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--im <replaceable>XIMserver</replaceable></option>
+        </term>
+        <listitem>
+          <para>Set XIM server.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--inputstyle <replaceable>inputstyle</replaceable></option>
+        </term>
+        <listitem>
+          <para>Sets XIM (X Input Method) input style. Possible values are onthespot, overthespot, offthespot and root.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--name <replaceable>name</replaceable></option>
+        </term>
+        <listitem>
+          <para>Sets the application name.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--ncols <replaceable>count</replaceable></option>
+        </term>
+        <listitem>
+          <para>Limits the number of colors allocated in the color cube on an 8-bit display, if the application is using the QApplication::ManyColor color specification.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--nograb</option>
+        </term>
+        <listitem>
+          <para>Tells Qt to never grab the mouse or the keyboard.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--noxim</option>
+        </term>
+        <listitem>
+          <para>Disable XIM.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--reverse</option>
+        </term>
+        <listitem>
+          <para>Mirrors the whole layout of widgets.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--session <replaceable>sessionId</replaceable></option>
+        </term>
+        <listitem>
+          <para>Restore the application for the given 'sessionId'.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--sync</option>
+        </term>
+        <listitem>
+          <para>Switches to synchronous mode for debugging.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--title <replaceable>title</replaceable></option>
+        </term>
+        <listitem>
+          <para>Sets the application title (caption).</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--visual TrueColor</option>
+        </term>
+        <listitem>
+          <para>Forces the application to use a TrueColor visual on an 8-bit display.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+  <refsect1>
+    <title>KDE OPTIONS</title>
+
+    <variablelist>
+      <varlistentry>
+        <term><option>--caption <replaceable>caption</replaceable></option>
+        </term>
+        <listitem>
+          <para>Use 'caption' as name in the titlebar.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--config <replaceable>filename</replaceable></option>
+        </term>
+        <listitem>
+          <para>Use alternative configuration file.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--dcopserver <replaceable>server</replaceable></option>
+        </term>
+        <listitem>
+          <para>Use the DCOP Server specified by 'server'.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--geometry <replaceable>geometry</replaceable></option>
+        </term>
+        <listitem>
+          <para>Sets the client geometry of the main widget.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--icon <replaceable>icon</replaceable></option>
+        </term>
+        <listitem>
+          <para>Use 'icon' as the application icon.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--miniicon <replaceable>icon</replaceable></option>
+        </term>
+        <listitem>
+          <para>Use 'icon' as the icon in the titlebar.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--nocrashhandler</option>
+        </term>
+        <listitem>
+          <para>Disable crash handler, to get core dumps.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--style <replaceable>style</replaceable></option>
+        </term>
+        <listitem>
+          <para>Sets the application GUI style.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--waitforwm</option>
+        </term>
+        <listitem>
+          <para>Waits for a WM_NET compatible windowmanager.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+  <refsect1>
+    <title>APP OPTIONS</title>
+
+    <variablelist>
+      <varlistentry>
+        <term><option>--check <replaceable>style</replaceable></option>
+        </term>
+        <listitem>
+          <para>Check whether config file itself requires updating.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+  <refsect1>
+    <title>AUTHOR</title>
+
+    <para>This manual page was written by &dhusername;
+      &lt;&dhemail;&gt; for the &debian; system (but may be used by
+      others).  Permission is granted to copy, distribute and/or
+      modify this document under the terms of the &gnu; General Public
+      License, Version 2 or any later version published by the Free
+      Software Foundation.
+    </para>
+
+    <para>On Debian systems, the complete text of the GNU General
+      Public License can be found in /usr/share/common-licenses/GPL.
+    </para>
+
+  </refsect1>
+</refentry>
+
+<!-- Keep this comment at the end of the file
+Local variables:
+mode: sgml
+sgml-omittag:t
+sgml-shorttag:t
+sgml-minimize-attributes:nil
+sgml-always-quote-attributes:t
+sgml-indent-step:2
+sgml-indent-data:t
+sgml-parent-document:nil
+sgml-default-dtd-file:nil
+sgml-exposed-tags:nil
+sgml-local-catalogs:nil
+sgml-local-ecat-files:nil
+End:
+-->
--- kdelibs-3.5.7.orig/debian/man/kde-menu.1
+++ kdelibs-3.5.7/debian/man/kde-menu.1
@@ -0,0 +1,176 @@
+.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
+.TH KDE\-MENU 1 "Jun 2006" "K Desktop Environment" "KDE menu query tool"
+.SH NAME
+kde\-menu
+\- KDE Menu query tool.
+.SH SYNOPSIS
+\fBkde\-menu\fP [Qt\-options] [KDE\-options] [options] <application\-id> 
+.SH DESCRIPTION
+\fBkde\-menu\fP is a KDE menu query tool. It is used to find the menu in which a specific application is shown.
+.br
+The \fB\-\-highlight\fP option visually indicates the location of a specific application in the KDE menu.
+.SH OPTIONS
+.SS
+.SS Arguments:
+.TP
+.B <application\-id>
+The id of the menu entry to locate
+.SS Options:
+.TP
+.B  \-\-utf8
+Output data in UTF\-8 instead of local encoding
+.TP
+.B  \-\-print\-menu\-id  
+Print menu\-id of the menu that contains
+the application
+.TP
+.B  \-\-print\-menu\-name  
+Print menu name (caption) of the menu that
+contains the application
+.TP
+.B  \-\-highlight  
+Highlight the entry in the menu
+.TP
+.B  \-\-nocache\-update  
+Do not check if sycoca database is up to date
+.SS 
+.SS Generic options:
+.TP
+.B  \-\-help  
+Show help about options
+.TP
+.B  \-\-help\-qt  
+Show Qt specific options
+.TP
+.B  \-\-help\-kde  
+Show KDE specific options
+.TP
+.B  \-\-help\-all  
+Show all options
+.TP
+.B  \-\-author  
+Show author information
+.TP
+.B \-v,  \-\-version  
+Show version information
+.TP
+.B  \-\-license  
+Show license information
+.TP
+.B  \-\-  
+End of options
+.SS 
+.SS KDE options:
+.TP
+.B  \-\-caption  <caption>
+Use 'caption' as name in the titlebar
+.TP
+.B  \-\-icon  <icon>
+Use 'icon' as the application icon
+.TP
+.B  \-\-miniicon  <icon>
+Use 'icon' as the icon in the titlebar
+.TP
+.B  \-\-config  <filename>
+Use alternative configuration file
+.TP
+.B  \-\-dcopserver  <server>
+Use the DCOP Server specified by 'server'
+.TP
+.B  \-\-nocrashhandler  
+Disable crash handler, to get core dumps
+.TP
+.B  \-\-waitforwm  
+Waits for a WM_NET compatible windowmanager
+.TP
+.B  \-\-style  <style>
+sets the application GUI style
+.TP
+.B  \-\-geometry  <geometry>
+sets the client geometry of the main widget \- see man X for the argument format
+.SS 
+.SS Qt options:
+.TP
+.B  \-\-display  <displayname>
+Use the X\-server display 'displayname'
+.TP
+.B  \-\-session  <sessionId>
+Restore the application for the given 'sessionId'
+.TP
+.B  \-\-cmap  
+Causes the application to install a private color
+map on an 8\-bit display
+.TP
+.B  \-\-ncols  <count>
+Limits the number of colors allocated in the color
+cube on an 8\-bit display, if the application is
+using the QApplication::ManyColor color
+specification
+.TP
+.B  \-\-nograb  
+tells Qt to never grab the mouse or the keyboard
+.TP
+.B  \-\-dograb  
+running under a debugger can cause an implicit
+\-nograb, use \-dograb to override
+.TP
+.B  \-\-sync  
+switches to synchronous mode for debugging
+.TP
+.B \-\-fn,  \-\-font  <fontname>
+defines the application font
+.TP
+.B \-\-bg,  \-\-background  <color>
+sets the default background color and an
+application palette (light and dark shades are
+calculated)
+.TP
+.B \-\-fg,  \-\-foreground  <color>
+sets the default foreground color
+.TP
+.B \-\-btn,  \-\-button  <color>
+sets the default button color
+.TP
+.B  \-\-name  <name>
+sets the application name
+.TP
+.B  \-\-title  <title>
+sets the application title (caption)
+.TP
+.B  \-\-visual  TrueColor
+forces the application to use a TrueColor visual on
+an 8\-bit display
+.TP
+.B  \-\-inputstyle  <inputstyle>
+sets XIM (X Input Method) input style. Possible
+values are onthespot, overthespot, offthespot and
+root
+.TP
+.B  \-\-im  <XIM server>
+set XIM server
+.TP
+.B  \-\-noxim  
+disable XIM
+.TP
+.B  \-\-reverse  
+mirrors the whole layout of widgets
+.SS 
+.SH SEE ALSO
+Full user documentation is available through the KDE Help Center.  You can also enter the URL
+.BR help:/kde\-menu/
+directly into konqueror or you can run 
+.BR "`khelpcenter help:/kde\-menu/'"
+from the command\-line.
+.br
+.SH AUTHORS
+.nf
+Waldo Bastian <bastian@kde.org>
+.br
+
+.br
+.fi
+Please use http://bugs.kde.org to report bugs, do not mail the author directly.
+.PP
+This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the \fBDebian\fP Project (but may be used by others). Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
+.PP
+On \fBDebian\fP systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
--- kdelibs-3.5.7.orig/debian/man/dcopstart.sgml
+++ kdelibs-3.5.7/debian/man/dcopstart.sgml
@@ -0,0 +1,137 @@
+<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
+
+<!-- Process this file with docbook-to-man to generate an nroff manual
+     page: `docbook-to-man manpage.sgml > manpage.1'.  You may view
+     the manual page with: `docbook-to-man manpage.sgml | nroff -man |
+     less'.  A typical entry in a Makefile or Makefile.am is:
+
+manpage.1: manpage.sgml
+	docbook-to-man $< > $@
+
+    
+	The docbook-to-man binary is found in the docbook-to-man package.
+	Please remember that if you create the nroff version in one of the
+	debian/rules file targets (such as build), you will need to include
+	docbook-to-man in your Build-Depends control field.
+
+  -->
+
+  <!-- Fill in your name for FIRSTNAME and SURNAME. -->
+  <!ENTITY dhfirstname "<firstname>Johannes</firstname>">
+  <!ENTITY dhsurname   "<surname>Ranke</surname>">
+  <!-- Please adjust the date whenever revising the manpage. -->
+  <!ENTITY dhdate      "<date>March 25, 2006</date>">
+  <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
+       allowed: see man(7), man(1). -->
+  <!ENTITY dhsection   "<manvolnum>1</manvolnum>">
+  <!ENTITY dhemail     "<email>jranke@uni-bremen.de</email>">
+  <!ENTITY dhusername  "Johannes Ranke">
+  <!ENTITY dhucpackage "<refentrytitle>DCOPSTART</refentrytitle>">
+  <!ENTITY dhpackage   "dcopstart">
+
+  <!ENTITY debian      "<productname>Debian</productname>">
+  <!ENTITY gnu         "<acronym>GNU</acronym>">
+]>
+
+<refentry>
+  <refentryinfo>
+    <address>
+      &dhemail;
+    </address>
+    <author>
+      &dhfirstname;
+      &dhsurname;
+    </author>
+    <copyright>
+      <year>2006</year>
+      <holder>&dhusername;</holder>
+    </copyright>
+    &dhdate;
+  </refentryinfo>
+  <refmeta>
+    &dhucpackage;
+
+    &dhsection;
+  </refmeta>
+  <refnamediv>
+    <refname>&dhpackage;</refname>
+
+    <refpurpose>Start a KDE service and return its DCOP reference</refpurpose>
+  </refnamediv>
+  <refsynopsisdiv>
+    <cmdsynopsis>
+      <command>&dhpackage;</command>
+
+      <arg choice='req'><replaceable>service</replaceable></arg>
+      <arg><replaceable>...</replaceable></arg>
+
+    </cmdsynopsis>
+  </refsynopsisdiv>
+  <refsect1>
+    <title>DESCRIPTION</title>
+
+    <para><command>&dhpackage;</command> starts a KDE service (i.e. an application
+	that is registered in the KDE system of .desktop files) and returns its
+	reference for later use in shell scripts. If the service is not scriptable
+	via DCOP, dcopstart returns nothing, but starts the service.</para>
+
+  </refsect1>
+  <refsect1>
+    <title>OPTIONS</title>
+
+    <variablelist>
+      <varlistentry>
+        <term><option>--help</option>
+        </term>
+        <listitem>
+          <para>Show usage information.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+  <refsect1>
+    <title>EXAMPLES</title>
+    
+    <para><example>
+      <title>Get the DCOP reference for a newly started konqueror instance</title>
+        <blockquote><literallayout>
+KONQ_ID=$(dcopstart konqueror http://www.kde.org)
+        </literallayout></blockquote>
+    </example></para>
+
+  </refsect1>
+  <refsect1>
+    <title>AUTHOR</title>
+
+    <para>This manual page was written by &dhusername; &lt;&dhemail;&gt; for 
+	  the &debian; system (but may be used by others).  Permission is granted
+	  to copy, distribute and/or modify this document under the terms of the
+	  &gnu; General Public License, Version 2 or any later version published by
+	  the Free Software Foundation.</para>
+
+	<para>On Debian systems, the complete text of the GNU General Public
+	  License can be found in /usr/share/common-licenses/GPL.</para>
+
+  </refsect1>
+  <refsect1>
+    <title>SEE ALSO</title>
+      <para><application>dcop</application>(1), <application>dcopfind</application>(1)</para>
+  </refsect1>
+</refentry>
+
+<!-- Keep this comment at the end of the file
+Local variables:
+mode: sgml
+sgml-omittag:t
+sgml-shorttag:t
+sgml-minimize-attributes:nil
+sgml-always-quote-attributes:t
+sgml-indent-step:2
+sgml-indent-data:t
+sgml-parent-document:nil
+sgml-default-dtd-file:nil
+sgml-exposed-tags:nil
+sgml-local-catalogs:nil
+sgml-local-ecat-files:nil
+End:
+-->
--- kdelibs-3.5.7.orig/debian/man/dcopserver_shutdown.1
+++ kdelibs-3.5.7/debian/man/dcopserver_shutdown.1
@@ -0,0 +1,32 @@
+.TH DCOPSERVER_SHUTDOWN 1 "Jun 2006" "K Desktop Environment" ""
+.SH NAME
+dcopserver_shutdown
+\- shuts down the KDE DCOP service
+.SH SYNOPSIS
+.BR dcopserver_shutdown \ [ \-\-nokill \ |\  \-\-wait ]
+.SH DESCRIPTION
+\fBdcopserver_shutdown\fP shuts down the KDE DCOP service. When called without \fB\-\-nokill\fP the dcopserver will be terminated.
+.SH OPTIONS
+.TP
+.B \-\-nokill
+do not terminate DCOP server
+.TP
+.B \-\-wait
+wait for dcopserver to terminate before returning from program
+.SH SEE ALSO
+.BR dcopserver (1)
+.SH AUTHORS
+.nf
+Waldo Bastian <bastian@kde.org>
+.br
+Mario Weilguni <mweilguni@sime.com>
+.br
+Lubos Lunak <l.lunak@kde.org>
+
+.br
+.fi
+Please use http://bugs.kde.org to report bugs, do not mail the authors directly.
+.PP
+This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the \fBDebian\fP Project (but may be used by others). Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
+.PP
+On \fBDebian\fP systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
--- kdelibs-3.5.7.orig/debian/man/kde-config.sgml
+++ kdelibs-3.5.7/debian/man/kde-config.sgml
@@ -0,0 +1,442 @@
+<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
+
+<!-- Process this file with docbook-to-man to generate an nroff manual
+     page: `docbook-to-man manpage.sgml > manpage.1'.  You may view
+     the manual page with: `docbook-to-man manpage.sgml | nroff -man |
+     less'.  A typical entry in a Makefile or Makefile.am is:
+
+manpage.1: manpage.sgml
+	docbook-to-man $< > $@
+
+    
+	The docbook-to-man binary is found in the docbook-to-man package.
+	Please remember that if you create the nroff version in one of the
+	debian/rules file targets (such as build), you will need to include
+	docbook-to-man in your Build-Depends control field.
+
+  -->
+
+  <!-- Fill in your name for FIRSTNAME and SURNAME. -->
+  <!ENTITY dhfirstname "<firstname>Chris</firstname>">
+  <!ENTITY dhsurname   "<surname>Cheney</surname>">
+  <!-- Please adjust the date whenever revising the manpage. -->
+  <!ENTITY dhdate      "<date>November  6, 2002</date>">
+  <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
+       allowed: see man(7), man(1). -->
+  <!ENTITY dhsection   "<manvolnum>1</manvolnum>">
+  <!ENTITY dhemail     "<email>ccheney@debian.org</email>">
+  <!ENTITY dhusername  "Chris Cheney">
+  <!ENTITY dhucpackage "<refentrytitle>KDE-CONFIG</refentrytitle>">
+  <!ENTITY dhpackage   "kde-config">
+
+  <!ENTITY debian      "<productname>Debian</productname>">
+  <!ENTITY gnu         "<acronym>GNU</acronym>">
+]>
+
+<refentry>
+  <refentryinfo>
+    <address>
+      &dhemail;
+    </address>
+    <author>
+      &dhfirstname;
+      &dhsurname;
+    </author>
+    <copyright>
+      <year>2002</year>
+      <holder>&dhusername;</holder>
+    </copyright>
+    &dhdate;
+  </refentryinfo>
+  <refmeta>
+    &dhucpackage;
+
+    &dhsection;
+  </refmeta>
+  <refnamediv>
+    <refname>&dhpackage;</refname>
+
+    <refpurpose>A little program to output installation paths</refpurpose>
+  </refnamediv>
+  <refsynopsisdiv>
+    <cmdsynopsis>
+      <command>&dhpackage;</command>
+
+      <arg><option><replaceable>Qt-options</replaceable></option></arg>
+      <arg><option><replaceable>KDE-options</replaceable></option></arg>
+      <arg><option>--exec-prefix</option></arg>
+      <arg><option>--expandvars</option></arg>
+      <arg><option>--install <replaceable>type</replaceable></option></arg>
+      <arg><option>--localprefix</option></arg>
+      <arg><option>--path <replaceable>type</replaceable></option></arg>
+      <arg><option>--prefix</option></arg>
+      <arg><option>--types</option></arg>
+      <arg><option>--userpath <replaceable>type</replaceable></option></arg>
+
+    </cmdsynopsis>
+  </refsynopsisdiv>
+  <refsect1>
+    <title>DESCRIPTION</title>
+
+    <para>This manual page documents briefly the
+      <command>&dhpackage;</command> command.</para>
+
+    <para><command>&dhpackage;</command> is a little program to output installation paths.</para>
+
+  </refsect1>
+  <refsect1>
+    <title>GENERIC OPTIONS</title>
+
+    <para>This program follows the usual GNU command line syntax,
+      with long options starting with two dashes (`-').  A summary of
+      options is included below.</para>
+
+    <variablelist>
+      <varlistentry>
+        <term><option>--author</option>
+        </term>
+        <listitem>
+          <para>Show author information.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--help</option>
+        </term>
+        <listitem>
+          <para>Show help about options.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--help-all</option>
+        </term>
+        <listitem>
+          <para>Show all options.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--help-kde</option>
+        </term>
+        <listitem>
+          <para>Show KDE specific options.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--help-qt</option>
+        </term>
+        <listitem>
+          <para>Show Qt specific options.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--license</option>
+        </term>
+        <listitem>
+          <para>Show license information.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>-v</option>, <option>--version</option>
+        </term>
+        <listitem>
+          <para>Show version information.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+  <refsect1>
+    <title>QT OPTIONS</title>
+
+    <variablelist>
+      <varlistentry>
+        <term><option>--bg</option>, <option>--background <replaceable>color</replaceable></option>
+        </term>
+        <listitem>
+          <para>Sets the default background color and an application palette (light and dark shades are calculated).</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--btn</option>, <option>--button <replaceable>color</replaceable></option>
+        </term>
+        <listitem>
+          <para>Sets the default button color.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--cmap</option>
+        </term>
+        <listitem>
+          <para>Causes the application to install a private color map on an 8-bit display.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--display <replaceable>displayname</replaceable></option>
+        </term>
+        <listitem>
+          <para>Use the X-server display 'displayname'.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--dograb</option>
+        </term>
+        <listitem>
+          <para>Running under a debugger can cause an implicit --nograb, use --dograb to override.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--fg</option>, <option>--foreground <replaceable>color</replaceable></option>
+        </term>
+        <listitem>
+          <para>Sets the default foreground color.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--fn</option>, <option>--font <replaceable>fontname</replaceable></option>
+        </term>
+        <listitem>
+          <para>Defines the application font.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--im <replaceable>XIMserver</replaceable></option>
+        </term>
+        <listitem>
+          <para>Set XIM server.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--inputstyle <replaceable>inputstyle</replaceable></option>
+        </term>
+        <listitem>
+          <para>Sets XIM (X Input Method) input style. Possible values are onthespot, overthespot, offthespot and root.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--name <replaceable>name</replaceable></option>
+        </term>
+        <listitem>
+          <para>Sets the application name.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--ncols <replaceable>count</replaceable></option>
+        </term>
+        <listitem>
+          <para>Limits the number of colors allocated in the color cube on an 8-bit display, if the application is using the QApplication::ManyColor color specification.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--nograb</option>
+        </term>
+        <listitem>
+          <para>Tells Qt to never grab the mouse or the keyboard.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--noxim</option>
+        </term>
+        <listitem>
+          <para>Disable XIM.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--reverse</option>
+        </term>
+        <listitem>
+          <para>Mirrors the whole layout of widgets.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--session <replaceable>sessionId</replaceable></option>
+        </term>
+        <listitem>
+          <para>Restore the application for the given 'sessionId'.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--sync</option>
+        </term>
+        <listitem>
+          <para>Switches to synchronous mode for debugging.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--title <replaceable>title</replaceable></option>
+        </term>
+        <listitem>
+          <para>Sets the application title (caption).</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--visual TrueColor</option>
+        </term>
+        <listitem>
+          <para>Forces the application to use a TrueColor visual on an 8-bit display.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+  <refsect1>
+    <title>KDE OPTIONS</title>
+
+    <variablelist>
+      <varlistentry>
+        <term><option>--caption <replaceable>caption</replaceable></option>
+        </term>
+        <listitem>
+          <para>Use 'caption' as name in the titlebar.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--config <replaceable>filename</replaceable></option>
+        </term>
+        <listitem>
+          <para>Use alternative configuration file.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--dcopserver <replaceable>server</replaceable></option>
+        </term>
+        <listitem>
+          <para>Use the DCOP Server specified by 'server'.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--geometry <replaceable>geometry</replaceable></option>
+        </term>
+        <listitem>
+          <para>Sets the client geometry of the main widget.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--icon <replaceable>icon</replaceable></option>
+        </term>
+        <listitem>
+          <para>Use 'icon' as the application icon.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--miniicon <replaceable>icon</replaceable></option>
+        </term>
+        <listitem>
+          <para>Use 'icon' as the icon in the titlebar.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--nocrashhandler</option>
+        </term>
+        <listitem>
+          <para>Disable crash handler, to get core dumps.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--style <replaceable>style</replaceable></option>
+        </term>
+        <listitem>
+          <para>Sets the application GUI style.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--waitforwm</option>
+        </term>
+        <listitem>
+          <para>Waits for a WM_NET compatible windowmanager.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+  <refsect1>
+    <title>APP OPTIONS</title>
+
+    <variablelist>
+      <varlistentry>
+        <term><option>--exec-prefix</option>
+        </term>
+        <listitem>
+          <para>Compiled in exec_prefix for KDE libraries.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--expandvars</option>
+        </term>
+        <listitem>
+          <para>Expand ${prefix} and ${exec_prefix} in output.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--install <replaceable>type</replaceable></option>
+        </term>
+        <listitem>
+          <para>Prefix to install resource files to.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--localprefix</option>
+        </term>
+        <listitem>
+          <para>Prefix in $HOME used to write files.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--path <replaceable>type</replaceable></option>
+        </term>
+        <listitem>
+          <para>Search path for resource type.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--prefix</option>
+        </term>
+        <listitem>
+          <para>Compiled in prefix for KDE libraries.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--types</option>
+        </term>
+        <listitem>
+          <para>Available KDE resource types.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--userpath <replaceable>type</replaceable></option>
+        </term>
+        <listitem>
+          <para>User path: desktop|autostart|trash|document.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+  <refsect1>
+    <title>AUTHOR</title>
+
+    <para>This manual page was written by &dhusername;
+      &lt;&dhemail;&gt; for the &debian; system (but may be used by
+      others).  Permission is granted to copy, distribute and/or
+      modify this document under the terms of the &gnu; General Public
+      License, Version 2 or any later version published by the Free
+      Software Foundation.
+    </para>
+
+    <para>On Debian systems, the complete text of the GNU General
+      Public License can be found in /usr/share/common-licenses/GPL.
+    </para>
+
+  </refsect1>
+</refentry>
+
+<!-- Keep this comment at the end of the file
+Local variables:
+mode: sgml
+sgml-omittag:t
+sgml-shorttag:t
+sgml-minimize-attributes:nil
+sgml-always-quote-attributes:t
+sgml-indent-step:2
+sgml-indent-data:t
+sgml-parent-document:nil
+sgml-default-dtd-file:nil
+sgml-exposed-tags:nil
+sgml-local-catalogs:nil
+sgml-local-ecat-files:nil
+End:
+-->
--- kdelibs-3.5.7.orig/debian/man/kconfig_compiler.1
+++ kdelibs-3.5.7/debian/man/kconfig_compiler.1
@@ -0,0 +1,167 @@
+.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
+.TH KCONFIG_COMPILER 1 "Jun 2006" "K Desktop Environment" "programming tool"
+.SH NAME
+kconfig_compiler
+\- KDE configuration compiler
+.SH SYNOPSIS
+\fBkconfig_compiler\fP [Qt\-options] [KDE\-options] [options]
+.I file.kcfg file.kcfgc 
+.SH DESCRIPTION
+\fBkconfig_compiler\fP generates C++ source code from two files. The first file (.kcfg) contains information about configuration options and the second file (.kcfgc) provides the code generation options.
+.br
+The generated source code contains a class based on \fBKConfigSkeleton\fP that provides an API to access the applications configuration data.
+.SH OPTIONS
+.SS
+.SS Arguments:
+.TP
+.I file.kcfg
+Input kcfg XML file
+.TP
+.I file.kcfgc
+Code generation options file
+.SS Options:
+.TP
+.B \-d,  \-\-directory  <dir>
+Directory to generate files in [.]
+.SS 
+.SS Generic options:
+.TP
+.B  \-\-help  
+Show help about options
+.TP
+.B  \-\-help\-qt  
+Show Qt specific options
+.TP
+.B  \-\-help\-kde  
+Show KDE specific options
+.TP
+.B  \-\-help\-all  
+Show all options
+.TP
+.B  \-\-author  
+Show author information
+.TP
+.B \-v,  \-\-version  
+Show version information
+.TP
+.B  \-\-license  
+Show license information
+.TP
+.B  \-\-  
+End of options
+.SS 
+.SS KDE options:
+.TP
+.B  \-\-caption  <caption>
+Use 'caption' as name in the titlebar
+.TP
+.B  \-\-icon  <icon>
+Use 'icon' as the application icon
+.TP
+.B  \-\-miniicon  <icon>
+Use 'icon' as the icon in the titlebar
+.TP
+.B  \-\-config  <filename>
+Use alternative configuration file
+.TP
+.B  \-\-dcopserver  <server>
+Use the DCOP Server specified by 'server'
+.TP
+.B  \-\-nocrashhandler  
+Disable crash handler, to get core dumps
+.TP
+.B  \-\-waitforwm  
+Waits for a WM_NET compatible windowmanager
+.TP
+.B  \-\-style  <style>
+sets the application GUI style
+.TP
+.B  \-\-geometry  <geometry>
+sets the client geometry of the main widget \- see man X for the argument format
+.SS 
+.SS Qt options:
+.TP
+.B  \-\-display  <displayname>
+Use the X\-server display 'displayname'
+.TP
+.B  \-\-session  <sessionId>
+Restore the application for the given 'sessionId'
+.TP
+.B  \-\-cmap  
+Causes the application to install a private color
+map on an 8\-bit display
+.TP
+.B  \-\-ncols  <count>
+Limits the number of colors allocated in the color
+cube on an 8\-bit display, if the application is
+using the QApplication::ManyColor color
+specification
+.TP
+.B  \-\-nograb  
+tells Qt to never grab the mouse or the keyboard
+.TP
+.B  \-\-dograb  
+running under a debugger can cause an implicit
+\-nograb, use \-dograb to override
+.TP
+.B  \-\-sync  
+switches to synchronous mode for debugging
+.TP
+.B \-\-fn,  \-\-font  <fontname>
+defines the application font
+.TP
+.B \-\-bg,  \-\-background  <color>
+sets the default background color and an
+application palette (light and dark shades are
+calculated)
+.TP
+.B \-\-fg,  \-\-foreground  <color>
+sets the default foreground color
+.TP
+.B \-\-btn,  \-\-button  <color>
+sets the default button color
+.TP
+.B  \-\-name  <name>
+sets the application name
+.TP
+.B  \-\-title  <title>
+sets the application title (caption)
+.TP
+.B  \-\-visual  TrueColor
+forces the application to use a TrueColor visual on
+an 8\-bit display
+.TP
+.B  \-\-inputstyle  <inputstyle>
+sets XIM (X Input Method) input style. Possible
+values are onthespot, overthespot, offthespot and
+root
+.TP
+.B  \-\-im  <XIM server>
+set XIM server
+.TP
+.B  \-\-noxim  
+disable XIM
+.TP
+.B  \-\-reverse  
+mirrors the whole layout of widgets
+.SS 
+.SH SEE ALSO
+.TP
+.B http://developer.kde.org
+KDE Developer's Corner website
+.SH AUTHORS
+.nf
+Cornelius Schumacher <schumacher@kde.org>
+.br
+Waldo Bastian <bastian@kde.org>
+.br
+Zack Rusin <zack@kde.org>
+.br
+
+.br
+.fi
+Please use http://bugs.kde.org to report bugs, do not mail the authors directly.
+.PP
+This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the \fBDebian\fP Project (but may be used by others). Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
+.PP
+On \fBDebian\fP systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
--- kdelibs-3.5.7.orig/debian/man/kpac_dhcp_helper.1
+++ kdelibs-3.5.7/debian/man/kpac_dhcp_helper.1
@@ -0,0 +1,26 @@
+.TH KPAC_DHCP_HELPER 1 "Jun 2006" "K Desktop Environment" "KDE internal"
+.SH NAME
+kpac_dhcp_helper
+\- KDE helper program for automatic proxy discovery via DHCP
+.SH DESCRIPTION
+!!! \fBkpac_dhcp_helper\fP needs to be installed setuid root to function. !!!
+.br
+!!! It is not intended to be called from the command line. !!!
+.sp 1
+\fBkpac_dhcp_helper\fP is a helper program for automatic proxy discovery via DHCP.
+It makes use of \fBProxy Auto Configuration\fP (\fBPAC\fP) files and is used by \fBKonqueror\fP.
+.SH SEE ALSO
+.TP
+.B http://l10n.kde.org/docs/admin/konqueror.html
+KDE Administrators Guide, Chapter 7, Konqueror: Automatic Proxy Discovery
+.SH AUTHORS
+.nf
+The KDE project
+
+.br
+.fi
+Please use http://bugs.kde.org to report bugs.
+.PP
+This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the \fBDebian\fP Project (but may be used by others). Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
+.PP
+On \fBDebian\fP systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
--- kdelibs-3.5.7.orig/debian/man/dcopobject.1
+++ kdelibs-3.5.7/debian/man/dcopobject.1
@@ -0,0 +1,30 @@
+.TH DCOPOBJECT 1 "Jun 2006" "K Desktop Environment" ""
+.SH NAME
+dcopobject
+\- extracts the object id from a DCOP reference of a KDE service
+.SH SYNOPSIS
+.B dcopobject
+.RI [ dcopref ]
+.SH DESCRIPTION
+\fBdcopobject\fP extracts the object id from a DCOP reference given in the form DCOPRef(application id,object id).
+.SH EXAMPLES
+.TP
+.B Return object id of a DCOP reference to the main window object of a Konqueror instance
+OBJID=`dcopobject 'DCOPRef(konqueror\-6140,
+.br
+.RS 26
+konqueror\-mainwindow#1)'`
+.SH SEE ALSO
+.BR dcop (1),\  dcopclient (1),\  dcopfind (1),\  dcopquit (1),\  dcopref (1)
+.SH AUTHORS
+.nf
+Waldo Bastian <bastian@kde.org>
+.br
+
+.br
+.fi
+Please use http://bugs.kde.org to report bugs, do not mail the author directly.
+.PP
+This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the \fBDebian\fP Project (but may be used by others). Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
+.PP
+On \fBDebian\fP systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
--- kdelibs-3.5.7.orig/debian/man/kbuildsycoca.sgml
+++ kdelibs-3.5.7/debian/man/kbuildsycoca.sgml
@@ -0,0 +1,402 @@
+<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
+
+<!-- Process this file with docbook-to-man to generate an nroff manual
+     page: `docbook-to-man manpage.sgml > manpage.1'.  You may view
+     the manual page with: `docbook-to-man manpage.sgml | nroff -man |
+     less'.  A typical entry in a Makefile or Makefile.am is:
+
+manpage.1: manpage.sgml
+	docbook-to-man $< > $@
+
+    
+	The docbook-to-man binary is found in the docbook-to-man package.
+	Please remember that if you create the nroff version in one of the
+	debian/rules file targets (such as build), you will need to include
+	docbook-to-man in your Build-Depends control field.
+
+  -->
+
+  <!-- Fill in your name for FIRSTNAME and SURNAME. -->
+  <!ENTITY dhfirstname "<firstname>Chris</firstname>">
+  <!ENTITY dhsurname   "<surname>Cheney</surname>">
+  <!-- Please adjust the date whenever revising the manpage. -->
+  <!ENTITY dhdate      "<date>November  6, 2002</date>">
+  <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
+       allowed: see man(7), man(1). -->
+  <!ENTITY dhsection   "<manvolnum>1</manvolnum>">
+  <!ENTITY dhemail     "<email>ccheney@debian.org</email>">
+  <!ENTITY dhusername  "Chris Cheney">
+  <!ENTITY dhucpackage "<refentrytitle>KBUILDSYCOCA</refentrytitle>">
+  <!ENTITY dhpackage   "kbuildsycoca">
+
+  <!ENTITY debian      "<productname>Debian</productname>">
+  <!ENTITY gnu         "<acronym>GNU</acronym>">
+]>
+
+<refentry>
+  <refentryinfo>
+    <address>
+      &dhemail;
+    </address>
+    <author>
+      &dhfirstname;
+      &dhsurname;
+    </author>
+    <copyright>
+      <year>2002</year>
+      <holder>&dhusername;</holder>
+    </copyright>
+    &dhdate;
+  </refentryinfo>
+  <refmeta>
+    &dhucpackage;
+
+    &dhsection;
+  </refmeta>
+  <refnamediv>
+    <refname>&dhpackage;</refname>
+
+    <refpurpose>Rebuilds the system configuration cache</refpurpose>
+  </refnamediv>
+  <refsynopsisdiv>
+    <cmdsynopsis>
+      <command>&dhpackage;</command>
+
+      <arg><option><replaceable>Qt-options</replaceable></option></arg>
+      <arg><option><replaceable>KDE-options</replaceable></option></arg>
+      <arg><option>--checkstamps</option></arg>
+      <arg><option>--incremental</option></arg>
+      <arg><option>--nosignal</option></arg>
+
+    </cmdsynopsis>
+  </refsynopsisdiv>
+  <refsect1>
+    <title>DESCRIPTION</title>
+
+    <para>This manual page documents briefly the
+      <command>&dhpackage;</command> command.</para>
+
+    <para><command>&dhpackage;</command> rebuilds the system configuration cache.</para>
+
+  </refsect1>
+  <refsect1>
+    <title>GENERIC OPTIONS</title>
+
+    <para>This program follows the usual GNU command line syntax,
+      with long options starting with two dashes (`-').  A summary of
+      options is included below.</para>
+
+    <variablelist>
+      <varlistentry>
+        <term><option>--author</option>
+        </term>
+        <listitem>
+          <para>Show author information.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--help</option>
+        </term>
+        <listitem>
+          <para>Show help about options.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--help-all</option>
+        </term>
+        <listitem>
+          <para>Show all options.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--help-kde</option>
+        </term>
+        <listitem>
+          <para>Show KDE specific options.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--help-qt</option>
+        </term>
+        <listitem>
+          <para>Show Qt specific options.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--license</option>
+        </term>
+        <listitem>
+          <para>Show license information.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>-v</option>, <option>--version</option>
+        </term>
+        <listitem>
+          <para>Show version information.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+  <refsect1>
+    <title>QT OPTIONS</title>
+
+    <variablelist>
+      <varlistentry>
+        <term><option>--bg</option>, <option>--background <replaceable>color</replaceable></option>
+        </term>
+        <listitem>
+          <para>Sets the default background color and an application palette (light and dark shades are calculated).</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--btn</option>, <option>--button <replaceable>color</replaceable></option>
+        </term>
+        <listitem>
+          <para>Sets the default button color.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--cmap</option>
+        </term>
+        <listitem>
+          <para>Causes the application to install a private color map on an 8-bit display.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--display <replaceable>displayname</replaceable></option>
+        </term>
+        <listitem>
+          <para>Use the X-server display 'displayname'.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--dograb</option>
+        </term>
+        <listitem>
+          <para>Running under a debugger can cause an implicit --nograb, use --dograb to override.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--fg</option>, <option>--foreground <replaceable>color</replaceable></option>
+        </term>
+        <listitem>
+          <para>Sets the default foreground color.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--fn</option>, <option>--font <replaceable>fontname</replaceable></option>
+        </term>
+        <listitem>
+          <para>Defines the application font.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--im <replaceable>XIMserver</replaceable></option>
+        </term>
+        <listitem>
+          <para>Set XIM server.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--inputstyle <replaceable>inputstyle</replaceable></option>
+        </term>
+        <listitem>
+          <para>Sets XIM (X Input Method) input style. Possible values are onthespot, overthespot, offthespot and root.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--name <replaceable>name</replaceable></option>
+        </term>
+        <listitem>
+          <para>Sets the application name.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--ncols <replaceable>count</replaceable></option>
+        </term>
+        <listitem>
+          <para>Limits the number of colors allocated in the color cube on an 8-bit display, if the application is using the QApplication::ManyColor color specification.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--nograb</option>
+        </term>
+        <listitem>
+          <para>Tells Qt to never grab the mouse or the keyboard.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--noxim</option>
+        </term>
+        <listitem>
+          <para>Disable XIM.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--reverse</option>
+        </term>
+        <listitem>
+          <para>Mirrors the whole layout of widgets.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--session <replaceable>sessionId</replaceable></option>
+        </term>
+        <listitem>
+          <para>Restore the application for the given 'sessionId'.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--sync</option>
+        </term>
+        <listitem>
+          <para>Switches to synchronous mode for debugging.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--title <replaceable>title</replaceable></option>
+        </term>
+        <listitem>
+          <para>Sets the application title (caption).</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--visual TrueColor</option>
+        </term>
+        <listitem>
+          <para>Forces the application to use a TrueColor visual on an 8-bit display.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+  <refsect1>
+    <title>KDE OPTIONS</title>
+
+    <variablelist>
+      <varlistentry>
+        <term><option>--caption <replaceable>caption</replaceable></option>
+        </term>
+        <listitem>
+          <para>Use 'caption' as name in the titlebar.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--config <replaceable>filename</replaceable></option>
+        </term>
+        <listitem>
+          <para>Use alternative configuration file.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--dcopserver <replaceable>server</replaceable></option>
+        </term>
+        <listitem>
+          <para>Use the DCOP Server specified by 'server'.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--geometry <replaceable>geometry</replaceable></option>
+        </term>
+        <listitem>
+          <para>Sets the client geometry of the main widget.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--icon <replaceable>icon</replaceable></option>
+        </term>
+        <listitem>
+          <para>Use 'icon' as the application icon.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--miniicon <replaceable>icon</replaceable></option>
+        </term>
+        <listitem>
+          <para>Use 'icon' as the icon in the titlebar.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--nocrashhandler</option>
+        </term>
+        <listitem>
+          <para>Disable crash handler, to get core dumps.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--style <replaceable>style</replaceable></option>
+        </term>
+        <listitem>
+          <para>Sets the application GUI style.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--waitforwm</option>
+        </term>
+        <listitem>
+          <para>Waits for a WM_NET compatible windowmanager.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+  <refsect1>
+    <title>APP OPTIONS</title>
+
+    <variablelist>
+      <varlistentry>
+        <term><option>--checkstamps</option>
+        </term>
+        <listitem>
+          <para>Check file timestamps.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--incremental</option>
+        </term>
+        <listitem>
+          <para>Incremental update.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--nosignal</option>
+        </term>
+        <listitem>
+          <para>Don't signal applications.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+  <refsect1>
+    <title>AUTHOR</title>
+
+    <para>This manual page was written by &dhusername;
+      &lt;&dhemail;&gt; for the &debian; system (but may be used by
+      others).  Permission is granted to copy, distribute and/or
+      modify this document under the terms of the &gnu; General Public
+      License, Version 2 or any later version published by the Free
+      Software Foundation.
+    </para>
+
+    <para>On Debian systems, the complete text of the GNU General
+      Public License can be found in /usr/share/common-licenses/GPL.
+    </para>
+
+  </refsect1>
+</refentry>
+
+<!-- Keep this comment at the end of the file
+Local variables:
+mode: sgml
+sgml-omittag:t
+sgml-shorttag:t
+sgml-minimize-attributes:nil
+sgml-always-quote-attributes:t
+sgml-indent-step:2
+sgml-indent-data:t
+sgml-parent-document:nil
+sgml-default-dtd-file:nil
+sgml-exposed-tags:nil
+sgml-local-catalogs:nil
+sgml-local-ecat-files:nil
+End:
+-->
--- kdelibs-3.5.7.orig/debian/man/dcopserver.sgml
+++ kdelibs-3.5.7/debian/man/dcopserver.sgml
@@ -0,0 +1,165 @@
+<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
+
+<!-- Process this file with docbook-to-man to generate an nroff manual
+     page: `docbook-to-man manpage.sgml > manpage.1'.  You may view
+     the manual page with: `docbook-to-man manpage.sgml | nroff -man |
+     less'.  A typical entry in a Makefile or Makefile.am is:
+
+manpage.1: manpage.sgml
+	docbook-to-man $< > $@
+
+    
+	The docbook-to-man binary is found in the docbook-to-man package.
+	Please remember that if you create the nroff version in one of the
+	debian/rules file targets (such as build), you will need to include
+	docbook-to-man in your Build-Depends control field.
+
+  -->
+
+  <!-- Fill in your name for FIRSTNAME and SURNAME. -->
+  <!ENTITY dhfirstname "<firstname>Chris</firstname>">
+  <!ENTITY dhsurname   "<surname>Cheney</surname>">
+  <!-- Please adjust the date whenever revising the manpage. -->
+  <!ENTITY dhdate      "<date>November  6, 2002</date>">
+  <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
+       allowed: see man(7), man(1). -->
+  <!ENTITY dhsection   "<manvolnum>1</manvolnum>">
+  <!ENTITY dhemail     "<email>ccheney@debian.org</email>">
+  <!ENTITY dhusername  "Chris Cheney">
+  <!ENTITY dhucpackage "<refentrytitle>DCOPSERVER</refentrytitle>">
+  <!ENTITY dhpackage   "dcopserver">
+
+  <!ENTITY debian      "<productname>Debian</productname>">
+  <!ENTITY gnu         "<acronym>GNU</acronym>">
+]>
+
+<refentry>
+  <refentryinfo>
+    <address>
+      &dhemail;
+    </address>
+    <author>
+      &dhfirstname;
+      &dhsurname;
+    </author>
+    <copyright>
+      <year>2002</year>
+      <holder>&dhusername;</holder>
+    </copyright>
+    &dhdate;
+  </refentryinfo>
+  <refmeta>
+    &dhucpackage;
+
+    &dhsection;
+  </refmeta>
+  <refnamediv>
+    <refname>&dhpackage;</refname>
+
+    <refpurpose>KDE DCOP server</refpurpose>
+  </refnamediv>
+  <refsynopsisdiv>
+    <cmdsynopsis>
+      <command>&dhpackage;</command>
+
+      <arg><option>--nofork<replaceable></replaceable></option></arg>
+      <arg><option>--nolocal<replaceable></replaceable></option></arg>
+      <arg><option>--nosid<replaceable></replaceable></option></arg>
+      <arg><option>--suicide<replaceable></replaceable></option></arg>
+
+    </cmdsynopsis>
+    <cmdsynopsis>
+      <command>&dhpackage;</command>
+
+      <arg><option>--serverid<replaceable></replaceable></option></arg>
+
+    </cmdsynopsis>
+  </refsynopsisdiv>
+  <refsect1>
+    <title>DESCRIPTION</title>
+
+    <para>This manual page documents briefly the
+      <command>&dhpackage;</command> command.</para>
+
+    <para><command>&dhpackage;</command> is the server for KDE's Desktop Communications Protocol.</para>
+
+  </refsect1>
+  <refsect1>
+    <title>OPTIONS</title>
+
+    <para>This program follows the usual GNU command line syntax,
+      with long options starting with two dashes (`-').  A summary of
+      options is included below.</para>
+
+    <variablelist>
+      <varlistentry>
+        <term><option>--nofork</option>
+        </term>
+        <listitem>
+          <para>Causes dcopserver not to fork off like a daemon, but run in the current process.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--nolocal</option>
+        </term>
+        <listitem>
+          <para>Allow network clients to this dcopserver. Without this option, only local clients are allowed.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--nosid</option>
+        </term>
+        <listitem>
+          <para>Do not create a new session for the program.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--serverid</option>
+        </term>
+        <listitem>
+          <para>Display the server ID of the running dcopserver.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--suicide</option>
+        </term>
+        <listitem>
+          <para>Tell dcopserver to automatically terminate if no transactions are made within 10 seconds.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+  <refsect1>
+    <title>AUTHOR</title>
+
+    <para>This manual page was written by &dhusername;
+      &lt;&dhemail;&gt; for the &debian; system (but may be used by
+      others).  Permission is granted to copy, distribute and/or
+      modify this document under the terms of the &gnu; General Public
+      License, Version 2 or any later version published by the Free
+      Software Foundation.
+    </para>
+
+    <para>On Debian systems, the complete text of the GNU General
+      Public License can be found in /usr/share/common-licenses/GPL.
+    </para>
+
+  </refsect1>
+</refentry>
+
+<!-- Keep this comment at the end of the file
+Local variables:
+mode: sgml
+sgml-omittag:t
+sgml-shorttag:t
+sgml-minimize-attributes:nil
+sgml-always-quote-attributes:t
+sgml-indent-step:2
+sgml-indent-data:t
+sgml-parent-document:nil
+sgml-default-dtd-file:nil
+sgml-exposed-tags:nil
+sgml-local-catalogs:nil
+sgml-local-ecat-files:nil
+End:
+-->
--- kdelibs-3.5.7.orig/debian/man/fileshareset.1
+++ kdelibs-3.5.7/debian/man/fileshareset.1
@@ -0,0 +1,49 @@
+.TH FILESHARESET 1 "Jun 2006" "K Desktop Environment" "file share tool"
+.SH NAME
+fileshareset, filesharelist
+\- add/remove/list NFS and Samba file shares
+.SH SYNOPSIS
+.BR fileshareset \ [ \-\-add ]\ [  \-\-remove ]\  \fIdir\fP
+.sp 1
+.BR filesharelist
+.SH DESCRIPTION
+\fBfileshareset\fP allows users to add or remove NFS and Samba file shares.
+.sp 1
+\fBfilesharelist\fP allows users to list NFS and Samba file shares.
+.sp 1
+Both commands are implemented as one single script.
+.SH OPTIONS
+(\fBfileshareset\fP only)
+.SS Options:
+.TP
+.B  \-\-add
+add file share
+.TP
+.B \-\-remove
+remove file share
+.SS Arguments:
+.TP
+.I dir
+directory to add/remove as file share
+.SH FILES
+.TP
+.I /etc/security/fileshare.conf
+main configuration file
+.TP
+.I /etc/exports
+NFS shares
+.TP
+.I /etc/samba/smb.conf
+Samba configuration file
+.SH AUTHORS
+.nf
+MandrakeSoft <pixel@mandrakesoft.com>
+.br
+
+.br
+.fi
+Please use http://bugs.kde.org to report bugs, do not mail the author directly.
+.PP
+This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the \fBDebian\fP Project (but may be used by others). Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
+.PP
+On \fBDebian\fP systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
--- kdelibs-3.5.7.orig/debian/man/artsmessage.sgml
+++ kdelibs-3.5.7/debian/man/artsmessage.sgml
@@ -0,0 +1,401 @@
+<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
+
+<!-- Process this file with docbook-to-man to generate an nroff manual
+     page: `docbook-to-man manpage.sgml > manpage.1'.  You may view
+     the manual page with: `docbook-to-man manpage.sgml | nroff -man |
+     less'.  A typical entry in a Makefile or Makefile.am is:
+
+manpage.1: manpage.sgml
+	docbook-to-man $< > $@
+
+    
+	The docbook-to-man binary is found in the docbook-to-man package.
+	Please remember that if you create the nroff version in one of the
+	debian/rules file targets (such as build), you will need to include
+	docbook-to-man in your Build-Depends control field.
+
+  -->
+
+  <!-- Fill in your name for FIRSTNAME and SURNAME. -->
+  <!ENTITY dhfirstname "<firstname>Chris</firstname>">
+  <!ENTITY dhsurname   "<surname>Cheney</surname>">
+  <!-- Please adjust the date whenever revising the manpage. -->
+  <!ENTITY dhdate      "<date>November  6, 2002</date>">
+  <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
+       allowed: see man(7), man(1). -->
+  <!ENTITY dhsection   "<manvolnum>1</manvolnum>">
+  <!ENTITY dhemail     "<email>ccheney@debian.org</email>">
+  <!ENTITY dhusername  "Chris Cheney">
+  <!ENTITY dhucpackage "<refentrytitle>ARTSMESSAGE</refentrytitle>">
+  <!ENTITY dhpackage   "artsmessage">
+
+  <!ENTITY debian      "<productname>Debian</productname>">
+  <!ENTITY gnu         "<acronym>GNU</acronym>">
+]>
+
+<refentry>
+  <refentryinfo>
+    <address>
+      &dhemail;
+    </address>
+    <author>
+      &dhfirstname;
+      &dhsurname;
+    </author>
+    <copyright>
+      <year>2002</year>
+      <holder>&dhusername;</holder>
+    </copyright>
+    &dhdate;
+  </refentryinfo>
+  <refmeta>
+    &dhucpackage;
+
+    &dhsection;
+  </refmeta>
+  <refnamediv>
+    <refname>&dhpackage;</refname>
+
+    <refpurpose>Utility to display aRts error messages</refpurpose>
+  </refnamediv>
+  <refsynopsisdiv>
+    <cmdsynopsis>
+      <command>&dhpackage;</command>
+
+      <arg><option><replaceable>Qt-options</replaceable></option></arg>
+      <arg><option><replaceable>KDE-options</replaceable></option></arg>
+      <arg><option>-eiw</option></arg>
+      <arg><option><replaceable>message</replaceable></option></arg>
+
+    </cmdsynopsis>
+  </refsynopsisdiv>
+  <refsect1>
+    <title>DESCRIPTION</title>
+
+    <para>This manual page documents briefly the
+      <command>&dhpackage;</command> command.</para>
+
+    <para><command>&dhpackage;</command> is a utility to display aRts error messages.</para>
+
+  </refsect1>
+  <refsect1>
+    <title>GENERIC OPTIONS</title>
+
+    <para>This program follows the usual GNU command line syntax,
+      with long options starting with two dashes (`-').  A summary of
+      options is included below.</para>
+
+    <variablelist>
+      <varlistentry>
+        <term><option>--author</option>
+        </term>
+        <listitem>
+          <para>Show author information.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--help</option>
+        </term>
+        <listitem>
+          <para>Show help about options.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--help-all</option>
+        </term>
+        <listitem>
+          <para>Show all options.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--help-kde</option>
+        </term>
+        <listitem>
+          <para>Show KDE specific options.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--help-qt</option>
+        </term>
+        <listitem>
+          <para>Show Qt specific options.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--license</option>
+        </term>
+        <listitem>
+          <para>Show license information.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>-v</option>, <option>--version</option>
+        </term>
+        <listitem>
+          <para>Show version information.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+  <refsect1>
+    <title>QT OPTIONS</title>
+
+    <variablelist>
+      <varlistentry>
+        <term><option>--bg</option>, <option>--background <replaceable>color</replaceable></option>
+        </term>
+        <listitem>
+          <para>Sets the default background color and an application palette (light and dark shades are calculated).</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--btn</option>, <option>--button <replaceable>color</replaceable></option>
+        </term>
+        <listitem>
+          <para>Sets the default button color.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--cmap</option>
+        </term>
+        <listitem>
+          <para>Causes the application to install a private color map on an 8-bit display.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--display <replaceable>displayname</replaceable></option>
+        </term>
+        <listitem>
+          <para>Use the X-server display 'displayname'.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--dograb</option>
+        </term>
+        <listitem>
+          <para>Running under a debugger can cause an implicit --nograb, use --dograb to override.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--fg</option>, <option>--foreground <replaceable>color</replaceable></option>
+        </term>
+        <listitem>
+          <para>Sets the default foreground color.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--fn</option>, <option>--font <replaceable>fontname</replaceable></option>
+        </term>
+        <listitem>
+          <para>Defines the application font.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--im <replaceable>XIMserver</replaceable></option>
+        </term>
+        <listitem>
+          <para>Set XIM server.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--inputstyle <replaceable>inputstyle</replaceable></option>
+        </term>
+        <listitem>
+          <para>Sets XIM (X Input Method) input style. Possible values are onthespot, overthespot, offthespot and root.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--name <replaceable>name</replaceable></option>
+        </term>
+        <listitem>
+          <para>Sets the application name.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--ncols <replaceable>count</replaceable></option>
+        </term>
+        <listitem>
+          <para>Limits the number of colors allocated in the color cube on an 8-bit display, if the application is using the QApplication::ManyColor color specification.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--nograb</option>
+        </term>
+        <listitem>
+          <para>Tells Qt to never grab the mouse or the keyboard.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--noxim</option>
+        </term>
+        <listitem>
+          <para>Disable XIM.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--reverse</option>
+        </term>
+        <listitem>
+          <para>Mirrors the whole layout of widgets.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--session <replaceable>sessionId</replaceable></option>
+        </term>
+        <listitem>
+          <para>Restore the application for the given 'sessionId'.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--sync</option>
+        </term>
+        <listitem>
+          <para>Switches to synchronous mode for debugging.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--title <replaceable>title</replaceable></option>
+        </term>
+        <listitem>
+          <para>Sets the application title (caption).</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--visual TrueColor</option>
+        </term>
+        <listitem>
+          <para>Forces the application to use a TrueColor visual on an 8-bit display.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+  <refsect1>
+    <title>KDE OPTIONS</title>
+
+    <variablelist>
+      <varlistentry>
+        <term><option>--caption <replaceable>caption</replaceable></option>
+        </term>
+        <listitem>
+          <para>Use 'caption' as name in the titlebar.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--config <replaceable>filename</replaceable></option>
+        </term>
+        <listitem>
+          <para>Use alternative configuration file.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--dcopserver <replaceable>server</replaceable></option>
+        </term>
+        <listitem>
+          <para>Use the DCOP Server specified by 'server'.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--geometry <replaceable>geometry</replaceable></option>
+        </term>
+        <listitem>
+          <para>Sets the client geometry of the main widget.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--icon <replaceable>icon</replaceable></option>
+        </term>
+        <listitem>
+          <para>Use 'icon' as the application icon.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--miniicon <replaceable>icon</replaceable></option>
+        </term>
+        <listitem>
+          <para>Use 'icon' as the icon in the titlebar.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--nocrashhandler</option>
+        </term>
+        <listitem>
+          <para>Disable crash handler, to get core dumps.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--style <replaceable>style</replaceable></option>
+        </term>
+        <listitem>
+          <para>Sets the application GUI style.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--waitforwm</option>
+        </term>
+        <listitem>
+          <para>Waits for a WM_NET compatible windowmanager.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+  <refsect1>
+    <title>APP OPTIONS</title>
+
+    <variablelist>
+      <varlistentry>
+        <term><option>-e</option>, <option>--error</option>
+        </term>
+        <listitem>
+          <para>Display error message (default).</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>-i</option>, <option>--info</option>
+        </term>
+        <listitem>
+          <para>Display informational message.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>-w</option>, <option>--warning</option>
+        </term>
+        <listitem>
+          <para>Display warning message.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+  <refsect1>
+    <title>AUTHOR</title>
+
+    <para>This manual page was written by &dhusername;
+      &lt;&dhemail;&gt; for the &debian; system (but may be used by
+      others).  Permission is granted to copy, distribute and/or
+      modify this document under the terms of the &gnu; General Public
+      License, Version 2 or any later version published by the Free
+      Software Foundation.
+    </para>
+
+    <para>On Debian systems, the complete text of the GNU General
+      Public License can be found in /usr/share/common-licenses/GPL.
+    </para>
+
+  </refsect1>
+</refentry>
+
+<!-- Keep this comment at the end of the file
+Local variables:
+mode: sgml
+sgml-omittag:t
+sgml-shorttag:t
+sgml-minimize-attributes:nil
+sgml-always-quote-attributes:t
+sgml-indent-step:2
+sgml-indent-data:t
+sgml-parent-document:nil
+sgml-default-dtd-file:nil
+sgml-exposed-tags:nil
+sgml-local-catalogs:nil
+sgml-local-ecat-files:nil
+End:
+-->
--- kdelibs-3.5.7.orig/debian/man/ksvgtopng.1
+++ kdelibs-3.5.7/debian/man/ksvgtopng.1
@@ -0,0 +1,37 @@
+.TH KSVGTOPNG 1 "Jun 2006" "K Desktop Environment" "SVG to PNG Filter"
+.SH NAME
+ksvgtopng
+\- svg to png filter
+.SH SYNOPSIS
+.B ksvgtopng
+.I width height svgfilename outputfilename
+.SH DESCRIPTION
+\fBksvgtopng\fP converts image files from SVG format to PNG format.
+.SH OPTIONS
+.SS Arguments:
+.TP
+.I  width
+width of target image
+.TP
+.I height
+height of target image
+.TP
+.I svgfilename
+image file to convert
+.TP
+.I outputfilename
+name of converted image file
+.SH SEE ALSO
+.BR imagetops (1)
+.SH AUTHORS
+.nf
+The KDE project
+.br
+
+.br
+.fi
+Please use http://bugs.kde.org to report bugs.
+.PP
+This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the \fBDebian\fP Project (but may be used by others). Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
+.PP
+On \fBDebian\fP systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
--- kdelibs-3.5.7.orig/debian/man/kcookiejar.sgml
+++ kdelibs-3.5.7/debian/man/kcookiejar.sgml
@@ -0,0 +1,410 @@
+<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
+
+<!-- Process this file with docbook-to-man to generate an nroff manual
+     page: `docbook-to-man manpage.sgml > manpage.1'.  You may view
+     the manual page with: `docbook-to-man manpage.sgml | nroff -man |
+     less'.  A typical entry in a Makefile or Makefile.am is:
+
+manpage.1: manpage.sgml
+	docbook-to-man $< > $@
+
+    
+	The docbook-to-man binary is found in the docbook-to-man package.
+	Please remember that if you create the nroff version in one of the
+	debian/rules file targets (such as build), you will need to include
+	docbook-to-man in your Build-Depends control field.
+
+  -->
+
+  <!-- Fill in your name for FIRSTNAME and SURNAME. -->
+  <!ENTITY dhfirstname "<firstname>Chris</firstname>">
+  <!ENTITY dhsurname   "<surname>Cheney</surname>">
+  <!-- Please adjust the date whenever revising the manpage. -->
+  <!ENTITY dhdate      "<date>November  6, 2002</date>">
+  <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
+       allowed: see man(7), man(1). -->
+  <!ENTITY dhsection   "<manvolnum>1</manvolnum>">
+  <!ENTITY dhemail     "<email>ccheney@debian.org</email>">
+  <!ENTITY dhusername  "Chris Cheney">
+  <!ENTITY dhucpackage "<refentrytitle>KCOOKIEJAR</refentrytitle>">
+  <!ENTITY dhpackage   "kcookiejar">
+
+  <!ENTITY debian      "<productname>Debian</productname>">
+  <!ENTITY gnu         "<acronym>GNU</acronym>">
+]>
+
+<refentry>
+  <refentryinfo>
+    <address>
+      &dhemail;
+    </address>
+    <author>
+      &dhfirstname;
+      &dhsurname;
+    </author>
+    <copyright>
+      <year>2002</year>
+      <holder>&dhusername;</holder>
+    </copyright>
+    &dhdate;
+  </refentryinfo>
+  <refmeta>
+    &dhucpackage;
+
+    &dhsection;
+  </refmeta>
+  <refnamediv>
+    <refname>&dhpackage;</refname>
+
+    <refpurpose>HTTP Cookie Daemon</refpurpose>
+  </refnamediv>
+  <refsynopsisdiv>
+    <cmdsynopsis>
+      <command>&dhpackage;</command>
+
+      <arg><option><replaceable>Qt-options</replaceable></option></arg>
+      <arg><option><replaceable>KDE-options</replaceable></option></arg>
+      <arg><option>--reload-config</option></arg>
+      <arg><option>--remove <replaceable>domain</replaceable></option></arg>
+      <arg><option>--remove-all</option></arg>
+      <arg><option>--shutdown</option></arg>
+
+    </cmdsynopsis>
+  </refsynopsisdiv>
+  <refsect1>
+    <title>DESCRIPTION</title>
+
+    <para>This manual page documents briefly the
+      <command>&dhpackage;</command> command.</para>
+
+    <para><command>&dhpackage;</command> is a HTTP Cookie Daemon.</para>
+
+  </refsect1>
+  <refsect1>
+    <title>GENERIC OPTIONS</title>
+
+    <para>This program follows the usual GNU command line syntax,
+      with long options starting with two dashes (`-').  A summary of
+      options is included below.</para>
+
+    <variablelist>
+      <varlistentry>
+        <term><option>--author</option>
+        </term>
+        <listitem>
+          <para>Show author information.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--help</option>
+        </term>
+        <listitem>
+          <para>Show help about options.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--help-all</option>
+        </term>
+        <listitem>
+          <para>Show all options.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--help-kde</option>
+        </term>
+        <listitem>
+          <para>Show KDE specific options.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--help-qt</option>
+        </term>
+        <listitem>
+          <para>Show Qt specific options.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--license</option>
+        </term>
+        <listitem>
+          <para>Show license information.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>-v</option>, <option>--version</option>
+        </term>
+        <listitem>
+          <para>Show version information.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+  <refsect1>
+    <title>QT OPTIONS</title>
+
+    <variablelist>
+      <varlistentry>
+        <term><option>--bg</option>, <option>--background <replaceable>color</replaceable></option>
+        </term>
+        <listitem>
+          <para>Sets the default background color and an application palette (light and dark shades are calculated).</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--btn</option>, <option>--button <replaceable>color</replaceable></option>
+        </term>
+        <listitem>
+          <para>Sets the default button color.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--cmap</option>
+        </term>
+        <listitem>
+          <para>Causes the application to install a private color map on an 8-bit display.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--display <replaceable>displayname</replaceable></option>
+        </term>
+        <listitem>
+          <para>Use the X-server display 'displayname'.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--dograb</option>
+        </term>
+        <listitem>
+          <para>Running under a debugger can cause an implicit --nograb, use --dograb to override.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--fg</option>, <option>--foreground <replaceable>color</replaceable></option>
+        </term>
+        <listitem>
+          <para>Sets the default foreground color.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--fn</option>, <option>--font <replaceable>fontname</replaceable></option>
+        </term>
+        <listitem>
+          <para>Defines the application font.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--im <replaceable>XIMserver</replaceable></option>
+        </term>
+        <listitem>
+          <para>Set XIM server.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--inputstyle <replaceable>inputstyle</replaceable></option>
+        </term>
+        <listitem>
+          <para>Sets XIM (X Input Method) input style. Possible values are onthespot, overthespot, offthespot and root.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--name <replaceable>name</replaceable></option>
+        </term>
+        <listitem>
+          <para>Sets the application name.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--ncols <replaceable>count</replaceable></option>
+        </term>
+        <listitem>
+          <para>Limits the number of colors allocated in the color cube on an 8-bit display, if the application is using the QApplication::ManyColor color specification.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--nograb</option>
+        </term>
+        <listitem>
+          <para>Tells Qt to never grab the mouse or the keyboard.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--noxim</option>
+        </term>
+        <listitem>
+          <para>Disable XIM.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--reverse</option>
+        </term>
+        <listitem>
+          <para>Mirrors the whole layout of widgets.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--session <replaceable>sessionId</replaceable></option>
+        </term>
+        <listitem>
+          <para>Restore the application for the given 'sessionId'.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--sync</option>
+        </term>
+        <listitem>
+          <para>Switches to synchronous mode for debugging.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--title <replaceable>title</replaceable></option>
+        </term>
+        <listitem>
+          <para>Sets the application title (caption).</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--visual TrueColor</option>
+        </term>
+        <listitem>
+          <para>Forces the application to use a TrueColor visual on an 8-bit display.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+  <refsect1>
+    <title>KDE OPTIONS</title>
+
+    <variablelist>
+      <varlistentry>
+        <term><option>--caption <replaceable>caption</replaceable></option>
+        </term>
+        <listitem>
+          <para>Use 'caption' as name in the titlebar.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--config <replaceable>filename</replaceable></option>
+        </term>
+        <listitem>
+          <para>Use alternative configuration file.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--dcopserver <replaceable>server</replaceable></option>
+        </term>
+        <listitem>
+          <para>Use the DCOP Server specified by 'server'.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--geometry <replaceable>geometry</replaceable></option>
+        </term>
+        <listitem>
+          <para>Sets the client geometry of the main widget.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--icon <replaceable>icon</replaceable></option>
+        </term>
+        <listitem>
+          <para>Use 'icon' as the application icon.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--miniicon <replaceable>icon</replaceable></option>
+        </term>
+        <listitem>
+          <para>Use 'icon' as the icon in the titlebar.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--nocrashhandler</option>
+        </term>
+        <listitem>
+          <para>Disable crash handler, to get core dumps.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--style <replaceable>style</replaceable></option>
+        </term>
+        <listitem>
+          <para>Sets the application GUI style.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--waitforwm</option>
+        </term>
+        <listitem>
+          <para>Waits for a WM_NET compatible windowmanager.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+  <refsect1>
+    <title>APP OPTIONS</title>
+
+    <variablelist>
+      <varlistentry>
+        <term><option>--reload-config</option>
+        </term>
+        <listitem>
+          <para>Reload configuration file.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--remove <replaceable>domain</replaceable></option>
+        </term>
+        <listitem>
+          <para>Remove cookies for domain.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--remove-all</option>
+        </term>
+        <listitem>
+          <para>Remove all cookies.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--shutdown</option>
+        </term>
+        <listitem>
+          <para>Shut down cookie jar.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+  <refsect1>
+    <title>AUTHOR</title>
+
+    <para>This manual page was written by &dhusername;
+      &lt;&dhemail;&gt; for the &debian; system (but may be used by
+      others).  Permission is granted to copy, distribute and/or
+      modify this document under the terms of the &gnu; General Public
+      License, Version 2 or any later version published by the Free
+      Software Foundation.
+    </para>
+
+    <para>On Debian systems, the complete text of the GNU General
+      Public License can be found in /usr/share/common-licenses/GPL.
+    </para>
+
+  </refsect1>
+</refentry>
+
+<!-- Keep this comment at the end of the file
+Local variables:
+mode: sgml
+sgml-omittag:t
+sgml-shorttag:t
+sgml-minimize-attributes:nil
+sgml-always-quote-attributes:t
+sgml-indent-step:2
+sgml-indent-data:t
+sgml-parent-document:nil
+sgml-default-dtd-file:nil
+sgml-exposed-tags:nil
+sgml-local-catalogs:nil
+sgml-local-ecat-files:nil
+End:
+-->
--- kdelibs-3.5.7.orig/debian/man/dcopclient.1
+++ kdelibs-3.5.7/debian/man/dcopclient.1
@@ -0,0 +1,30 @@
+.TH DCOPCLIENT 1 "Jun 2006" "K Desktop Environment" ""
+.SH NAME
+dcopclient
+\- extracts the application id from a DCOP reference of a KDE service
+.SH SYNOPSIS
+.B dcopclient
+.RI [ dcopref ]
+.SH DESCRIPTION
+\fBdcopclient\fP extracts the application id from a DCOP reference given in the form DCOPRef(application id,object id).
+.SH EXAMPLES
+.TP
+.B Return application id of a DCOP reference to a Konqueror instance
+APPID=`dcopclient 'DCOPRef(konqueror\-6140,
+.br
+.RS 26
+konqueror\-mainwindow#1)'`
+.SH SEE ALSO
+.BR dcop (1),\  dcopfind (1),\  dcopobject (1),\  dcopquit (1),\  dcopref (1)
+.SH AUTHORS
+.nf
+Waldo Bastian <bastian@kde.org>
+.br
+
+.br
+.fi
+Please use http://bugs.kde.org to report bugs, do not mail the author directly.
+.PP
+This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the \fBDebian\fP Project (but may be used by others). Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
+.PP
+On \fBDebian\fP systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
--- kdelibs-3.5.7.orig/debian/man/kunittestmodrunner.1
+++ kdelibs-3.5.7/debian/man/kunittestmodrunner.1
@@ -0,0 +1,159 @@
+.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
+.TH KUNITTESTMODRUNNER 1 "Jun 2006" "K Desktop Environment" "KUnitTest modules runner"
+.SH NAME
+kunittestmodrunner
+\- a KDE command\-line application to run KUnitTest modules
+.SH SYNOPSIS
+\fBkunittestmodrunner\fP [Qt\-options] [KDE\-options] [options] 
+.SH DESCRIPTION
+\fBkunittestmodrunner\fP is a command\-line application to run KUnitTest modules.
+It loads all kunittest_*.la modules in the current directory. The exit code is the number of unexpected failures.
+.SH OPTIONS
+.SS Options:
+.TP
+.BR  \-\-query \ [ regexp ]
+Only run modules whose filenames match the regexp. [^kunittest_.*\.la$]
+.TP
+.BR  \-\-folder \ [ folder ]
+Only run tests modules which are found in the folder. Use the query option to select modules. [.]
+.TP
+.B  \-\-enable\-dbgcap  
+Disables debug capturing. You typically use this option when you use the GUI.
+.SS Generic options:
+.TP
+.B  \-\-help  
+Show help about options
+.TP
+.B  \-\-help\-qt  
+Show Qt specific options
+.TP
+.B  \-\-help\-kde  
+Show KDE specific options
+.TP
+.B  \-\-help\-all  
+Show all options
+.TP
+.B  \-\-author  
+Show author information
+.TP
+.B \-v,  \-\-version  
+Show version information
+.TP
+.B  \-\-license  
+Show license information
+.TP
+.B  \-\-  
+End of options
+.SS 
+.SS Qt options:
+.TP
+.B  \-\-display  <displayname>
+Use the X\-server display 'displayname'
+.TP
+.B  \-\-session  <sessionId>
+Restore the application for the given 'sessionId'
+.TP
+.B  \-\-cmap  
+Causes the application to install a private color
+map on an 8\-bit display
+.TP
+.B  \-\-ncols  <count>
+Limits the number of colors allocated in the color
+cube on an 8\-bit display, if the application is
+using the QApplication::ManyColor color
+specification
+.TP
+.B  \-\-nograb  
+tells Qt to never grab the mouse or the keyboard
+.TP
+.B  \-\-dograb  
+running under a debugger can cause an implicit
+\-nograb, use \-dograb to override
+.TP
+.B  \-\-sync  
+switches to synchronous mode for debugging
+.TP
+.B \-\-fn,  \-\-font  <fontname>
+defines the application font
+.TP
+.B \-\-bg,  \-\-background  <color>
+sets the default background color and an
+application palette (light and dark shades are
+calculated)
+.TP
+.B \-\-fg,  \-\-foreground  <color>
+sets the default foreground color
+.TP
+.B \-\-btn,  \-\-button  <color>
+sets the default button color
+.TP
+.B  \-\-name  <name>
+sets the application name
+.TP
+.B  \-\-title  <title>
+sets the application title (caption)
+.TP
+.B  \-\-visual  TrueColor
+forces the application to use a TrueColor visual on
+an 8\-bit display
+.TP
+.B  \-\-inputstyle  <inputstyle>
+sets XIM (X Input Method) input style. Possible
+values are onthespot, overthespot, offthespot and
+root
+.TP
+.B  \-\-im  <XIM server>
+set XIM server
+.TP
+.B  \-\-noxim  
+disable XIM
+.TP
+.B  \-\-reverse  
+mirrors the whole layout of widgets
+.SS 
+.SS KDE options:
+.TP
+.B  \-\-caption  <caption>
+Use 'caption' as name in the titlebar
+.TP
+.B  \-\-icon  <icon>
+Use 'icon' as the application icon
+.TP
+.B  \-\-miniicon  <icon>
+Use 'icon' as the icon in the titlebar
+.TP
+.B  \-\-config  <filename>
+Use alternative configuration file
+.TP
+.B  \-\-dcopserver  <server>
+Use the DCOP Server specified by 'server'
+.TP
+.B  \-\-nocrashhandler  
+Disable crash handler, to get core dumps
+.TP
+.B  \-\-waitforwm  
+Waits for a WM_NET compatible windowmanager
+.TP
+.B  \-\-style  <style>
+sets the application GUI style
+.TP
+.B  \-\-geometry  <geometry>
+sets the client geometry of the main widget \- see man X for the argument format
+.SS
+.SH SEE ALSO
+.BR kunittestguimodrunner (1)
+.sp 1
+.TP
+.BR http://developer.kde.org
+KDE Developers's Corner website
+.SH AUTHORS
+.nf
+Jeroen Wijnhout <Jeroen.Wijnhout@kdemail.net>
+
+.br
+.fi
+Please use http://bugs.kde.org to report bugs, do not mail the author directly.
+.PP
+This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the \fBDebian\fP Project (but may be used by others). Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
+.PP
+On \fBDebian\fP systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
--- kdelibs-3.5.7.orig/debian/man/cupsdconf.sgml
+++ kdelibs-3.5.7/debian/man/cupsdconf.sgml
@@ -0,0 +1,373 @@
+<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
+
+<!-- Process this file with docbook-to-man to generate an nroff manual
+     page: `docbook-to-man manpage.sgml > manpage.1'.  You may view
+     the manual page with: `docbook-to-man manpage.sgml | nroff -man |
+     less'.  A typical entry in a Makefile or Makefile.am is:
+
+manpage.1: manpage.sgml
+	docbook-to-man $< > $@
+
+    
+	The docbook-to-man binary is found in the docbook-to-man package.
+	Please remember that if you create the nroff version in one of the
+	debian/rules file targets (such as build), you will need to include
+	docbook-to-man in your Build-Depends control field.
+
+  -->
+
+  <!-- Fill in your name for FIRSTNAME and SURNAME. -->
+  <!ENTITY dhfirstname "<firstname>Chris</firstname>">
+  <!ENTITY dhsurname   "<surname>Cheney</surname>">
+  <!-- Please adjust the date whenever revising the manpage. -->
+  <!ENTITY dhdate      "<date>November  6, 2002</date>">
+  <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
+       allowed: see man(7), man(1). -->
+  <!ENTITY dhsection   "<manvolnum>1</manvolnum>">
+  <!ENTITY dhemail     "<email>ccheney@debian.org</email>">
+  <!ENTITY dhusername  "Chris Cheney">
+  <!ENTITY dhucpackage "<refentrytitle>CUPSDCONF</refentrytitle>">
+  <!ENTITY dhpackage   "cupsdconf">
+
+  <!ENTITY debian      "<productname>Debian</productname>">
+  <!ENTITY gnu         "<acronym>GNU</acronym>">
+]>
+
+<refentry>
+  <refentryinfo>
+    <address>
+      &dhemail;
+    </address>
+    <author>
+      &dhfirstname;
+      &dhsurname;
+    </author>
+    <copyright>
+      <year>2002</year>
+      <holder>&dhusername;</holder>
+    </copyright>
+    &dhdate;
+  </refentryinfo>
+  <refmeta>
+    &dhucpackage;
+
+    &dhsection;
+  </refmeta>
+  <refnamediv>
+    <refname>&dhpackage;</refname>
+
+    <refpurpose>A CUPS configuration tool</refpurpose>
+  </refnamediv>
+  <refsynopsisdiv>
+    <cmdsynopsis>
+      <command>&dhpackage;</command>
+
+      <arg><option><replaceable>Qt-options</replaceable></option></arg>
+      <arg><option><replaceable>KDE-options</replaceable></option></arg>
+      <arg><option><replaceable>file</replaceable></option></arg>
+
+    </cmdsynopsis>
+  </refsynopsisdiv>
+  <refsect1>
+    <title>DESCRIPTION</title>
+
+    <para>This manual page documents briefly the
+      <command>&dhpackage;</command> command.</para>
+
+    <para><command>&dhpackage;</command> is a CUPS configuration tool.</para>
+
+  </refsect1>
+  <refsect1>
+    <title>GENERIC OPTIONS</title>
+
+    <para>This program follows the usual GNU command line syntax,
+      with long options starting with two dashes (`-').  A summary of
+      options is included below.</para>
+
+    <variablelist>
+      <varlistentry>
+        <term><option>--author</option>
+        </term>
+        <listitem>
+          <para>Show author information.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--help</option>
+        </term>
+        <listitem>
+          <para>Show help about options.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--help-all</option>
+        </term>
+        <listitem>
+          <para>Show all options.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--help-kde</option>
+        </term>
+        <listitem>
+          <para>Show KDE specific options.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--help-qt</option>
+        </term>
+        <listitem>
+          <para>Show Qt specific options.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--license</option>
+        </term>
+        <listitem>
+          <para>Show license information.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>-v</option>, <option>--version</option>
+        </term>
+        <listitem>
+          <para>Show version information.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+  <refsect1>
+    <title>QT OPTIONS</title>
+
+    <variablelist>
+      <varlistentry>
+        <term><option>--bg</option>, <option>--background <replaceable>color</replaceable></option>
+        </term>
+        <listitem>
+          <para>Sets the default background color and an application palette (light and dark shades are calculated).</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--btn</option>, <option>--button <replaceable>color</replaceable></option>
+        </term>
+        <listitem>
+          <para>Sets the default button color.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--cmap</option>
+        </term>
+        <listitem>
+          <para>Causes the application to install a private color map on an 8-bit display.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--display <replaceable>displayname</replaceable></option>
+        </term>
+        <listitem>
+          <para>Use the X-server display 'displayname'.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--dograb</option>
+        </term>
+        <listitem>
+          <para>Running under a debugger can cause an implicit --nograb, use --dograb to override.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--fg</option>, <option>--foreground <replaceable>color</replaceable></option>
+        </term>
+        <listitem>
+          <para>Sets the default foreground color.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--fn</option>, <option>--font <replaceable>fontname</replaceable></option>
+        </term>
+        <listitem>
+          <para>Defines the application font.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--im <replaceable>XIMserver</replaceable></option>
+        </term>
+        <listitem>
+          <para>Set XIM server.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--inputstyle <replaceable>inputstyle</replaceable></option>
+        </term>
+        <listitem>
+          <para>Sets XIM (X Input Method) input style. Possible values are onthespot, overthespot, offthespot and root.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--name <replaceable>name</replaceable></option>
+        </term>
+        <listitem>
+          <para>Sets the application name.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--ncols <replaceable>count</replaceable></option>
+        </term>
+        <listitem>
+          <para>Limits the number of colors allocated in the color cube on an 8-bit display, if the application is using the QApplication::ManyColor color specification.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--nograb</option>
+        </term>
+        <listitem>
+          <para>Tells Qt to never grab the mouse or the keyboard.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--noxim</option>
+        </term>
+        <listitem>
+          <para>Disable XIM.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--reverse</option>
+        </term>
+        <listitem>
+          <para>Mirrors the whole layout of widgets.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--session <replaceable>sessionId</replaceable></option>
+        </term>
+        <listitem>
+          <para>Restore the application for the given 'sessionId'.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--sync</option>
+        </term>
+        <listitem>
+          <para>Switches to synchronous mode for debugging.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--title <replaceable>title</replaceable></option>
+        </term>
+        <listitem>
+          <para>Sets the application title (caption).</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--visual TrueColor</option>
+        </term>
+        <listitem>
+          <para>Forces the application to use a TrueColor visual on an 8-bit display.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+  <refsect1>
+    <title>KDE OPTIONS</title>
+
+    <variablelist>
+      <varlistentry>
+        <term><option>--caption <replaceable>caption</replaceable></option>
+        </term>
+        <listitem>
+          <para>Use 'caption' as name in the titlebar.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--config <replaceable>filename</replaceable></option>
+        </term>
+        <listitem>
+          <para>Use alternative configuration file.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--dcopserver <replaceable>server</replaceable></option>
+        </term>
+        <listitem>
+          <para>Use the DCOP Server specified by 'server'.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--geometry <replaceable>geometry</replaceable></option>
+        </term>
+        <listitem>
+          <para>Sets the client geometry of the main widget.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--icon <replaceable>icon</replaceable></option>
+        </term>
+        <listitem>
+          <para>Use 'icon' as the application icon.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--miniicon <replaceable>icon</replaceable></option>
+        </term>
+        <listitem>
+          <para>Use 'icon' as the icon in the titlebar.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--nocrashhandler</option>
+        </term>
+        <listitem>
+          <para>Disable crash handler, to get core dumps.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--style <replaceable>style</replaceable></option>
+        </term>
+        <listitem>
+          <para>Sets the application GUI style.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--waitforwm</option>
+        </term>
+        <listitem>
+          <para>Waits for a WM_NET compatible windowmanager.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+  <refsect1>
+    <title>AUTHOR</title>
+
+    <para>This manual page was written by &dhusername;
+      &lt;&dhemail;&gt; for the &debian; system (but may be used by
+      others).  Permission is granted to copy, distribute and/or
+      modify this document under the terms of the &gnu; General Public
+      License, Version 2 or any later version published by the Free
+      Software Foundation.
+    </para>
+
+    <para>On Debian systems, the complete text of the GNU General
+      Public License can be found in /usr/share/common-licenses/GPL.
+    </para>
+
+  </refsect1>
+</refentry>
+
+<!-- Keep this comment at the end of the file
+Local variables:
+mode: sgml
+sgml-omittag:t
+sgml-shorttag:t
+sgml-minimize-attributes:nil
+sgml-always-quote-attributes:t
+sgml-indent-step:2
+sgml-indent-data:t
+sgml-parent-document:nil
+sgml-default-dtd-file:nil
+sgml-exposed-tags:nil
+sgml-local-catalogs:nil
+sgml-local-ecat-files:nil
+End:
+-->
--- kdelibs-3.5.7.orig/debian/man/khotnewstuff.1
+++ kdelibs-3.5.7/debian/man/khotnewstuff.1
@@ -0,0 +1,163 @@
+.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
+.TH KHOTNEWSTUFF 1 "Jun 2006" "K Desktop Environment" "KDE tool"
+.SH NAME
+khotnewstuff
+\- KDE tool to test GHNS repositories
+.SH SYNOPSIS
+\fBkhotnewstuff\fP [Qt\-options] [KDE\-options] [options] [providerlist] 
+.SH DESCRIPTION
+\fBkhotnewstuff\fP is a tool to test GHNS repositories. It calls the download dialog for arbitrary GHNS repositories and can apply filters given on the command line.
+.sp 1
+GHNS means "Get Hot New Stuff" and is a data sharing concept. It allows you to install new stuff like applets, plugins, data, sounds and wallpapers for instant use in your KDE applications.
+.sp 1
+GHNS consists of server installations to provide repositories and a client\-side framework to use them. In KDE the client-side framework is called \fBKHotNewStuff\fP.
+.SH OPTIONS
+.SS
+.SS Arguments:
+.TP
+.B providerlist
+Provider list to use
+.SS Options:
+.TP
+.B  \-\-type  <type>
+Display only media of this type
+.SS 
+.SS Generic options:
+.TP
+.B  \-\-help  
+Show help about options
+.TP
+.B  \-\-help\-qt  
+Show Qt specific options
+.TP
+.B  \-\-help\-kde  
+Show KDE specific options
+.TP
+.B  \-\-help\-all  
+Show all options
+.TP
+.B  \-\-author  
+Show author information
+.TP
+.B \-v,  \-\-version  
+Show version information
+.TP
+.B  \-\-license  
+Show license information
+.TP
+.B  \-\-  
+End of options
+.SS 
+.SS KDE options:
+.TP
+.B  \-\-caption  <caption>
+Use 'caption' as name in the titlebar
+.TP
+.B  \-\-icon  <icon>
+Use 'icon' as the application icon
+.TP
+.B  \-\-miniicon  <icon>
+Use 'icon' as the icon in the titlebar
+.TP
+.B  \-\-config  <filename>
+Use alternative configuration file
+.TP
+.B  \-\-dcopserver  <server>
+Use the DCOP Server specified by 'server'
+.TP
+.B  \-\-nocrashhandler  
+Disable crash handler, to get core dumps
+.TP
+.B  \-\-waitforwm  
+Waits for a WM_NET compatible windowmanager
+.TP
+.B  \-\-style  <style>
+sets the application GUI style
+.TP
+.B  \-\-geometry  <geometry>
+sets the client geometry of the main widget \- see man X for the argument format
+.SS
+.SS Qt options:
+.TP
+.B  \-\-display  <displayname>
+Use the X\-server display 'displayname'
+.TP
+.B  \-\-session  <sessionId>
+Restore the application for the given 'sessionId'
+.TP
+.B  \-\-cmap  
+Causes the application to install a private color
+map on an 8\-bit display
+.TP
+.B  \-\-ncols  <count>
+Limits the number of colors allocated in the color
+cube on an 8\-bit display, if the application is
+using the QApplication::ManyColor color
+specification
+.TP
+.B  \-\-nograb  
+tells Qt to never grab the mouse or the keyboard
+.TP
+.B  \-\-dograb  
+running under a debugger can cause an implicit
+\-nograb, use \-dograb to override
+.TP
+.B  \-\-sync  
+switches to synchronous mode for debugging
+.TP
+.B \-\-fn,  \-\-font  <fontname>
+defines the application font
+.TP
+.B \-\-bg,  \-\-background  <color>
+sets the default background color and an
+application palette (light and dark shades are
+calculated)
+.TP
+.B \-\-fg,  \-\-foreground  <color>
+sets the default foreground color
+.TP
+.B \-\-btn,  \-\-button  <color>
+sets the default button color
+.TP
+.B  \-\-name  <name>
+sets the application name
+.TP
+.B  \-\-title  <title>
+sets the application title (caption)
+.TP
+.B  \-\-visual  TrueColor
+forces the application to use a TrueColor visual on
+an 8\-bit display
+.TP
+.B  \-\-inputstyle  <inputstyle>
+sets XIM (X Input Method) input style. Possible
+values are onthespot, overthespot, offthespot and
+root
+.TP
+.B  \-\-im  <XIM server>
+set XIM server
+.TP
+.B  \-\-noxim  
+disable XIM
+.TP
+.B  \-\-reverse  
+mirrors the whole layout of widgets
+.SS 
+.SH SEE ALSO
+.TP
+.B http://kstuff.org
+KDE\-specific GHNS home page
+.TP
+.B http://ghns.freedesktop.org
+"Get Hot New Stuff" home page
+.SH AUTHORS
+.nf
+Cornelius Schumacher <schumacher@kde.org>
+
+.br
+.fi
+Please use http://bugs.kde.org to report bugs, do not mail the author directly.
+.PP
+This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the \fBDebian\fP Project (but may be used by others). Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
+.PP
+On \fBDebian\fP systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
--- kdelibs-3.5.7.orig/debian/man/kdontchangethehostname.sgml
+++ kdelibs-3.5.7/debian/man/kdontchangethehostname.sgml
@@ -0,0 +1,374 @@
+<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
+
+<!-- Process this file with docbook-to-man to generate an nroff manual
+     page: `docbook-to-man manpage.sgml > manpage.1'.  You may view
+     the manual page with: `docbook-to-man manpage.sgml | nroff -man |
+     less'.  A typical entry in a Makefile or Makefile.am is:
+
+manpage.1: manpage.sgml
+	docbook-to-man $< > $@
+
+    
+	The docbook-to-man binary is found in the docbook-to-man package.
+	Please remember that if you create the nroff version in one of the
+	debian/rules file targets (such as build), you will need to include
+	docbook-to-man in your Build-Depends control field.
+
+  -->
+
+  <!-- Fill in your name for FIRSTNAME and SURNAME. -->
+  <!ENTITY dhfirstname "<firstname>Chris</firstname>">
+  <!ENTITY dhsurname   "<surname>Cheney</surname>">
+  <!-- Please adjust the date whenever revising the manpage. -->
+  <!ENTITY dhdate      "<date>November  6, 2002</date>">
+  <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
+       allowed: see man(7), man(1). -->
+  <!ENTITY dhsection   "<manvolnum>1</manvolnum>">
+  <!ENTITY dhemail     "<email>ccheney@debian.org</email>">
+  <!ENTITY dhusername  "Chris Cheney">
+  <!ENTITY dhucpackage "<refentrytitle>KDONTCHANGETHEHOSTNAME</refentrytitle>">
+  <!ENTITY dhpackage   "kdontchangethehostname">
+
+  <!ENTITY debian      "<productname>Debian</productname>">
+  <!ENTITY gnu         "<acronym>GNU</acronym>">
+]>
+
+<refentry>
+  <refentryinfo>
+    <address>
+      &dhemail;
+    </address>
+    <author>
+      &dhfirstname;
+      &dhsurname;
+    </author>
+    <copyright>
+      <year>2002</year>
+      <holder>&dhusername;</holder>
+    </copyright>
+    &dhdate;
+  </refentryinfo>
+  <refmeta>
+    &dhucpackage;
+
+    &dhsection;
+  </refmeta>
+  <refnamediv>
+    <refname>&dhpackage;</refname>
+
+    <refpurpose>Informs KDE about a change in hostname</refpurpose>
+  </refnamediv>
+  <refsynopsisdiv>
+    <cmdsynopsis>
+      <command>&dhpackage;</command>
+
+      <arg><option><replaceable>Qt-options</replaceable></option></arg>
+      <arg><option><replaceable>KDE-options</replaceable></option></arg>
+      <arg><option><replaceable>old</replaceable></option></arg>
+      <arg><option><replaceable>new</replaceable></option></arg>
+
+    </cmdsynopsis>
+  </refsynopsisdiv>
+  <refsect1>
+    <title>DESCRIPTION</title>
+
+    <para>This manual page documents briefly the
+      <command>&dhpackage;</command> command.</para>
+
+    <para><command>&dhpackage;</command> informs KDE about a change in hostname.</para>
+
+  </refsect1>
+  <refsect1>
+    <title>GENERIC OPTIONS</title>
+
+    <para>This program follows the usual GNU command line syntax,
+      with long options starting with two dashes (`-').  A summary of
+      options is included below.</para>
+
+    <variablelist>
+      <varlistentry>
+        <term><option>--author</option>
+        </term>
+        <listitem>
+          <para>Show author information.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--help</option>
+        </term>
+        <listitem>
+          <para>Show help about options.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--help-all</option>
+        </term>
+        <listitem>
+          <para>Show all options.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--help-kde</option>
+        </term>
+        <listitem>
+          <para>Show KDE specific options.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--help-qt</option>
+        </term>
+        <listitem>
+          <para>Show Qt specific options.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--license</option>
+        </term>
+        <listitem>
+          <para>Show license information.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>-v</option>, <option>--version</option>
+        </term>
+        <listitem>
+          <para>Show version information.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+  <refsect1>
+    <title>QT OPTIONS</title>
+
+    <variablelist>
+      <varlistentry>
+        <term><option>--bg</option>, <option>--background <replaceable>color</replaceable></option>
+        </term>
+        <listitem>
+          <para>Sets the default background color and an application palette (light and dark shades are calculated).</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--btn</option>, <option>--button <replaceable>color</replaceable></option>
+        </term>
+        <listitem>
+          <para>Sets the default button color.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--cmap</option>
+        </term>
+        <listitem>
+          <para>Causes the application to install a private color map on an 8-bit display.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--display <replaceable>displayname</replaceable></option>
+        </term>
+        <listitem>
+          <para>Use the X-server display 'displayname'.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--dograb</option>
+        </term>
+        <listitem>
+          <para>Running under a debugger can cause an implicit --nograb, use --dograb to override.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--fg</option>, <option>--foreground <replaceable>color</replaceable></option>
+        </term>
+        <listitem>
+          <para>Sets the default foreground color.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--fn</option>, <option>--font <replaceable>fontname</replaceable></option>
+        </term>
+        <listitem>
+          <para>Defines the application font.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--im <replaceable>XIMserver</replaceable></option>
+        </term>
+        <listitem>
+          <para>Set XIM server.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--inputstyle <replaceable>inputstyle</replaceable></option>
+        </term>
+        <listitem>
+          <para>Sets XIM (X Input Method) input style. Possible values are onthespot, overthespot, offthespot and root.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--name <replaceable>name</replaceable></option>
+        </term>
+        <listitem>
+          <para>Sets the application name.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--ncols <replaceable>count</replaceable></option>
+        </term>
+        <listitem>
+          <para>Limits the number of colors allocated in the color cube on an 8-bit display, if the application is using the QApplication::ManyColor color specification.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--nograb</option>
+        </term>
+        <listitem>
+          <para>Tells Qt to never grab the mouse or the keyboard.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--noxim</option>
+        </term>
+        <listitem>
+          <para>Disable XIM.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--reverse</option>
+        </term>
+        <listitem>
+          <para>Mirrors the whole layout of widgets.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--session <replaceable>sessionId</replaceable></option>
+        </term>
+        <listitem>
+          <para>Restore the application for the given 'sessionId'.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--sync</option>
+        </term>
+        <listitem>
+          <para>Switches to synchronous mode for debugging.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--title <replaceable>title</replaceable></option>
+        </term>
+        <listitem>
+          <para>Sets the application title (caption).</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--visual TrueColor</option>
+        </term>
+        <listitem>
+          <para>Forces the application to use a TrueColor visual on an 8-bit display.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+  <refsect1>
+    <title>KDE OPTIONS</title>
+
+    <variablelist>
+      <varlistentry>
+        <term><option>--caption <replaceable>caption</replaceable></option>
+        </term>
+        <listitem>
+          <para>Use 'caption' as name in the titlebar.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--config <replaceable>filename</replaceable></option>
+        </term>
+        <listitem>
+          <para>Use alternative configuration file.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--dcopserver <replaceable>server</replaceable></option>
+        </term>
+        <listitem>
+          <para>Use the DCOP Server specified by 'server'.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--geometry <replaceable>geometry</replaceable></option>
+        </term>
+        <listitem>
+          <para>Sets the client geometry of the main widget.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--icon <replaceable>icon</replaceable></option>
+        </term>
+        <listitem>
+          <para>Use 'icon' as the application icon.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--miniicon <replaceable>icon</replaceable></option>
+        </term>
+        <listitem>
+          <para>Use 'icon' as the icon in the titlebar.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--nocrashhandler</option>
+        </term>
+        <listitem>
+          <para>Disable crash handler, to get core dumps.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--style <replaceable>style</replaceable></option>
+        </term>
+        <listitem>
+          <para>Sets the application GUI style.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--waitforwm</option>
+        </term>
+        <listitem>
+          <para>Waits for a WM_NET compatible windowmanager.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+  <refsect1>
+    <title>AUTHOR</title>
+
+    <para>This manual page was written by &dhusername;
+      &lt;&dhemail;&gt; for the &debian; system (but may be used by
+      others).  Permission is granted to copy, distribute and/or
+      modify this document under the terms of the &gnu; General Public
+      License, Version 2 or any later version published by the Free
+      Software Foundation.
+    </para>
+
+    <para>On Debian systems, the complete text of the GNU General
+      Public License can be found in /usr/share/common-licenses/GPL.
+    </para>
+
+  </refsect1>
+</refentry>
+
+<!-- Keep this comment at the end of the file
+Local variables:
+mode: sgml
+sgml-omittag:t
+sgml-shorttag:t
+sgml-minimize-attributes:nil
+sgml-always-quote-attributes:t
+sgml-indent-step:2
+sgml-indent-data:t
+sgml-parent-document:nil
+sgml-default-dtd-file:nil
+sgml-exposed-tags:nil
+sgml-local-catalogs:nil
+sgml-local-ecat-files:nil
+End:
+-->
--- kdelibs-3.5.7.orig/debian/man/dcop.sgml
+++ kdelibs-3.5.7/debian/man/dcop.sgml
@@ -0,0 +1,194 @@
+<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
+
+<!-- Process this file with docbook-to-man to generate an nroff manual
+     page: `docbook-to-man manpage.sgml > manpage.1'.  You may view
+     the manual page with: `docbook-to-man manpage.sgml | nroff -man |
+     less'.  A typical entry in a Makefile or Makefile.am is:
+
+manpage.1: manpage.sgml
+	docbook-to-man $< > $@
+
+    
+	The docbook-to-man binary is found in the docbook-to-man package.
+	Please remember that if you create the nroff version in one of the
+	debian/rules file targets (such as build), you will need to include
+	docbook-to-man in your Build-Depends control field.
+
+  -->
+
+  <!-- Fill in your name for FIRSTNAME and SURNAME. -->
+  <!ENTITY dhfirstname "<firstname>Chris</firstname>">
+  <!ENTITY dhsurname   "<surname>Cheney</surname>">
+  <!-- Please adjust the date whenever revising the manpage. -->
+  <!ENTITY dhdate      "<date>October 13, 2004</date>">
+  <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
+       allowed: see man(7), man(1). -->
+  <!ENTITY dhsection   "<manvolnum>1</manvolnum>">
+  <!ENTITY dhemail     "<email>ccheney@debian.org</email>">
+  <!ENTITY dhusername  "Chris Cheney">
+  <!ENTITY dhucpackage "<refentrytitle>DCOP</refentrytitle>">
+  <!ENTITY dhpackage   "dcop">
+
+  <!ENTITY debian      "<productname>Debian</productname>">
+  <!ENTITY gnu         "<acronym>GNU</acronym>">
+]>
+
+<refentry>
+  <refentryinfo>
+    <address>
+      &dhemail;
+    </address>
+    <author>
+      &dhfirstname;
+      &dhsurname;
+    </author>
+    <copyright>
+      <year>2002</year>
+      <holder>&dhusername;</holder>
+    </copyright>
+    &dhdate;
+  </refentryinfo>
+  <refmeta>
+    &dhucpackage;
+
+    &dhsection;
+  </refmeta>
+  <refnamediv>
+    <refname>&dhpackage;</refname>
+
+    <refpurpose>Console DCOP client</refpurpose>
+  </refnamediv>
+  <refsynopsisdiv>
+    <cmdsynopsis>
+      <command>&dhpackage;</command>
+
+      <arg><option><replaceable>options</replaceable></option></arg>
+      <arg><option><replaceable>application <optional><replaceable>function <optional><replaceable>arg1</replaceable></optional> <optional><replaceable>arg2</replaceable></optional> ... </replaceable></optional> </replaceable></option></arg>
+
+    </cmdsynopsis>
+  </refsynopsisdiv>
+  <refsect1>
+    <title>DESCRIPTION</title>
+
+    <para>This manual page documents briefly the
+      <command>&dhpackage;</command> command.</para>
+
+    <para><command>&dhpackage;</command> is a console DCOP (Desktop Communications Protocol) client.</para>
+
+  </refsect1>
+  <refsect1>
+    <title>OPTIONS</title>
+
+    <para>This program follows the usual GNU command line syntax,
+      with long options starting with two dashes (`-').  A summary of
+      options is included below.</para>
+
+    <variablelist>
+      <varlistentry>
+        <term><option>--all-sessions</option>
+        </term>
+        <listitem>
+          <para>Send to all sessions found. Only works with the --user and --all-users options.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--all-users</option>
+        </term>
+        <listitem>
+          <para>Send the same DCOP call to all users with a running DCOP server. Only failed calls to existing DCOP servers will generate an error message. If no DCOP server is available at all, no error will be generated.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--help</option>
+        </term>
+        <listitem>
+          <para>Show help about options.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--list-sessions</option>
+        </term>
+        <listitem>
+          <para>List all active KDE session for a user or all users.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--pipe</option>
+        </term>
+        <listitem>
+          <para>Call DCOP for each line read from stdin.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--session <replaceable>session</replaceable></option>
+        </term>
+        <listitem>
+          <para>Send to the given KDE session. This option can only be used in combination with the --user option.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--user <replaceable>user</replaceable></option>
+        </term>
+        <listitem>
+          <para>Connect to the given user's DCOP server. This option will ignore the values of the environment vars $DCOPSERVER and $ICEAUTHORITY, even if they are set. If the user has more than one open session, you must also use one of the --list-sessions, --session or --all-sessions command-line options.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+  <refsect1>
+    <title>EXAMPLES</title>
+    
+    <para><example>
+      <title>Return number of the current desktop, e.g. 2</title>
+        <blockquote><literallayout>
+dcop kwin KWinInterface currentDesktop
+        </literallayout></blockquote>
+    </example></para>
+
+    <para><example>
+      <title>Jump to the next dektop</title>
+        <blockquote><literallayout>
+dcop kwin KWinInterface nextDesktop
+        </literallayout></blockquote>
+    </example></para>
+
+  </refsect1>
+  <refsect1>
+    <title>AUTHOR</title>
+
+    <para>This manual page was written by &dhusername;
+      &lt;&dhemail;&gt; for the &debian; system (but may be used by
+      others).  Permission is granted to copy, distribute and/or
+      modify this document under the terms of the &gnu; General Public
+      License, Version 2 or any later version published by the Free
+      Software Foundation.
+    </para>
+
+    <para>On Debian systems, the complete text of the GNU General
+      Public License can be found in /usr/share/common-licenses/GPL.
+    </para>
+
+  </refsect1>
+  <refsect1>
+    <title>SEE ALSO</title>
+      <para><application>kdcop</application>(1), <application>dcopserver</application>(1)</para>
+  </refsect1>
+
+</refentry>
+
+<!-- Keep this comment at the end of the file
+Local variables:
+mode: sgml
+sgml-omittag:t
+sgml-shorttag:t
+sgml-minimize-attributes:nil
+sgml-always-quote-attributes:t
+sgml-indent-step:2
+sgml-indent-data:t
+sgml-parent-document:nil
+sgml-default-dtd-file:nil
+sgml-exposed-tags:nil
+sgml-local-catalogs:nil
+sgml-local-ecat-files:nil
+End:
+-->
--- kdelibs-3.5.7.orig/debian/man/kioexec.1
+++ kdelibs-3.5.7/debian/man/kioexec.1
@@ -0,0 +1,169 @@
+.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
+.TH KIOEXEC 1 "Jun 2006" "K Desktop Environment" "network transparency support"
+.SH NAME
+kioexec, kfmexec
+\- open remote files, watch modifications, ask for upload
+.SH SYNOPSIS
+\fBkioexec\fP [Qt\-options] [KDE\-options] [options] command [URLs] 
+.SH DESCRIPTION
+\fBkioexec\fP offers network transparency to applications that only support local files.
+.sp 1
+\fBkioexec\fP downloads the remote file to a temporary location and starts a local application with the temporary file as argument. Then it  waits for the application to be exited and offers re\-uploading of the modified temporary file.
+.SH OPTIONS
+.SS
+.SS Arguments:
+.TP
+.B command
+Command to execute
+.TP
+.B URLs
+URL(s) or local file(s) used for 'command'
+.SS Options:
+.TP
+.B  \-\-tempfiles  
+Treat URLs as local files and delete them afterwards
+.TP
+.B  \-\-suggestedfilename  <file name>
+Suggested file name for the downloaded file
+.SS 
+.SS Generic options:
+.TP
+.B  \-\-help  
+Show help about options
+.TP
+.B  \-\-help\-qt  
+Show Qt specific options
+.TP
+.B  \-\-help\-kde  
+Show KDE specific options
+.TP
+.B  \-\-help\-all  
+Show all options
+.TP
+.B  \-\-author  
+Show author information
+.TP
+.B \-v,  \-\-version  
+Show version information
+.TP
+.B  \-\-license  
+Show license information
+.TP
+.B  \-\-  
+End of options
+.SS 
+.SS KDE options:
+.TP
+.B  \-\-caption  <caption>
+Use 'caption' as name in the titlebar
+.TP
+.B  \-\-icon  <icon>
+Use 'icon' as the application icon
+.TP
+.B  \-\-miniicon  <icon>
+Use 'icon' as the icon in the titlebar
+.TP
+.B  \-\-config  <filename>
+Use alternative configuration file
+.TP
+.B  \-\-dcopserver  <server>
+Use the DCOP Server specified by 'server'
+.TP
+.B  \-\-nocrashhandler  
+Disable crash handler, to get core dumps
+.TP
+.B  \-\-waitforwm  
+Waits for a WM_NET compatible windowmanager
+.TP
+.B  \-\-style  <style>
+sets the application GUI style
+.TP
+.B  \-\-geometry  <geometry>
+sets the client geometry of the main widget \- see man X for the argument format
+.SS 
+.SS Qt options:
+.TP
+.B  \-\-display  <displayname>
+Use the X\-server display 'displayname'
+.TP
+.B  \-\-session  <sessionId>
+Restore the application for the given 'sessionId'
+.TP
+.B  \-\-cmap  
+Causes the application to install a private color
+map on an 8\-bit display
+.TP
+.B  \-\-ncols  <count>
+Limits the number of colors allocated in the color
+cube on an 8\-bit display, if the application is
+using the QApplication::ManyColor color
+specification
+.TP
+.B  \-\-nograb  
+tells Qt to never grab the mouse or the keyboard
+.TP
+.B  \-\-dograb  
+running under a debugger can cause an implicit
+\-nograb, use \-dograb to override
+.TP
+.B  \-\-sync  
+switches to synchronous mode for debugging
+.TP
+.B \-\-fn,  \-\-font  <fontname>
+defines the application font
+.TP
+.B \-\-bg,  \-\-background  <color>
+sets the default background color and an
+application palette (light and dark shades are
+calculated)
+.TP
+.B \-\-fg,  \-\-foreground  <color>
+sets the default foreground color
+.TP
+.B \-\-btn,  \-\-button  <color>
+sets the default button color
+.TP
+.B  \-\-name  <name>
+sets the application name
+.TP
+.B  \-\-title  <title>
+sets the application title (caption)
+.TP
+.B  \-\-visual  TrueColor
+forces the application to use a TrueColor visual on
+an 8\-bit display
+.TP
+.B  \-\-inputstyle  <inputstyle>
+sets XIM (X Input Method) input style. Possible
+values are onthespot, overthespot, offthespot and
+root
+.TP
+.B  \-\-im  <XIM server>
+set XIM server
+.TP
+.B  \-\-noxim  
+disable XIM
+.TP
+.B  \-\-reverse  
+mirrors the whole layout of widgets
+.SS 
+.SH AUTHORS
+.nf
+David Faure <faure@kde.org>
+.br
+Stephan Kulow <coolo@kde.org>
+.br
+Bernhard Rosenkraenzer <bero@arklinux.org>
+.br
+Waldo Bastian <bastian@kde.org>
+.br
+Oswald Buddenhagen <ossi@kde.org>
+.br
+
+.br
+.fi
+Please use http://bugs.kde.org to report bugs, do not mail the authors directly.
+.PP
+This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the \fBDebian\fP Project (but may be used by others). Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
+.PP
+On \fBDebian\fP systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
--- kdelibs-3.5.7.orig/debian/man/make_driver_db_cups.1
+++ kdelibs-3.5.7/debian/man/make_driver_db_cups.1
@@ -0,0 +1,47 @@
+.TH MAKE_DRIVER_DB_CUPS 1 "Jun 2006" "K Desktop Environment" ""
+.SH NAME
+make_driver_db_cups
+\- create a printer database from ppd files
+.SH SYNOPSIS
+.B make_driver_db_cups
+.RI [ db_directory ]\ [ output_filename ]
+.SH DESCRIPTION
+\fBmake_driver_db_cups\fP creates a printer database from PPD files. PPD files (Postscript Printer Description files) describe a specific printer. Nowadays they are also used for non\-Postscript printers.
+.sp 1
+\fBmake_driver_db_cups\fP prints all printer descriptions found in a given directory and all its subdirectories to stdout.
+The first line gives the number of all found printers. Every printer description block consists of the items FILE, MANUFACTURER, MODELNAME, MODEL and DESCRIPTION.
+The block is followed by the current block number.
+.sp 1
+If an output file is given \fBmake_driver_db_cups\fP suppresses all numbers.
+.sp 1
+The PPD files may be gzip compressed.
+.SH OPTIONS
+.SS Arguments:
+.TP
+.I db_directory
+directory with ppd files
+.TP
+.I output_filename
+write printer database into this file
+.SH FILES
+.TP
+.I $KDEHOME/share/apps/kdeprint/printerdb_cups.txt
+KDE printer database
+.br
+(if $KDEHOME is not set ~/.kde is used)
+.SH SEE ALSO
+.BR make_driver_db_lpr (1)
+.TP
+.B www.linuxprinting.org
+Information about printing under UNIX
+.SH AUTHORS
+.nf
+The KDE project
+
+.br
+.fi
+Please use http://bugs.kde.org to report bugs.
+.PP
+This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the \fBDebian\fP Project (but may be used by others). Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
+.PP
+On \fBDebian\fP systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
--- kdelibs-3.5.7.orig/debian/man/dcopfind.sgml
+++ kdelibs-3.5.7/debian/man/dcopfind.sgml
@@ -0,0 +1,155 @@
+<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
+
+<!-- Process this file with docbook-to-man to generate an nroff manual
+     page: `docbook-to-man manpage.sgml > manpage.1'.  You may view
+     the manual page with: `docbook-to-man manpage.sgml | nroff -man |
+     less'.  A typical entry in a Makefile or Makefile.am is:
+
+manpage.1: manpage.sgml
+	docbook-to-man $< > $@
+
+    
+	The docbook-to-man binary is found in the docbook-to-man package.
+	Please remember that if you create the nroff version in one of the
+	debian/rules file targets (such as build), you will need to include
+	docbook-to-man in your Build-Depends control field.
+
+  -->
+
+  <!-- Fill in your name for FIRSTNAME and SURNAME. -->
+  <!ENTITY dhfirstname "<firstname>Johannes</firstname>">
+  <!ENTITY dhsurname   "<surname>Ranke</surname>">
+  <!-- Please adjust the date whenever revising the manpage. -->
+  <!ENTITY dhdate      "<date>March 25, 2006</date>">
+  <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
+       allowed: see man(7), man(1). -->
+  <!ENTITY dhsection   "<manvolnum>1</manvolnum>">
+  <!ENTITY dhemail     "<email>jranke@uni-bremen.de</email>">
+  <!ENTITY dhusername  "Johannes Ranke">
+  <!ENTITY dhucpackage "<refentrytitle>DCOPFIND</refentrytitle>">
+  <!ENTITY dhpackage   "dcopfind">
+
+  <!ENTITY debian      "<productname>Debian</productname>">
+  <!ENTITY gnu         "<acronym>GNU</acronym>">
+]>
+
+<refentry>
+  <refentryinfo>
+    <address>
+      &dhemail;
+    </address>
+    <author>
+      &dhfirstname;
+      &dhsurname;
+    </author>
+    <copyright>
+      <year>2006</year>
+      <holder>&dhusername;</holder>
+    </copyright>
+    &dhdate;
+  </refentryinfo>
+  <refmeta>
+    &dhucpackage;
+
+    &dhsection;
+  </refmeta>
+  <refnamediv>
+    <refname>&dhpackage;</refname>
+
+    <refpurpose>Find the DCOP reference of a KDE service</refpurpose>
+  </refnamediv>
+  <refsynopsisdiv>
+    <cmdsynopsis>
+      <command>&dhpackage;</command>
+
+      <arg><option>-a</option></arg>
+      <arg><option>-l</option></arg>
+      <arg choice='req'><replaceable>service</replaceable></arg>
+	  <arg><replaceable>object</replaceable></arg>
+    </cmdsynopsis>
+  </refsynopsisdiv>
+  <refsect1>
+    <title>DESCRIPTION</title>
+
+	<para><command>&dhpackage;</command> returns a reference to the first
+	instance of the KDE service specified by
+	<replaceable>service</replaceable>. See also dcopstart, which starts a
+	service/application and immediately returns its reference.
+	</para>
+
+  </refsect1>
+  <refsect1>
+    <title>OPTIONS</title>
+
+    <variablelist>
+      <varlistentry>
+        <term><option>-a</option>
+        </term>
+        <listitem>
+		  <para>Print the application id. Without this argument, the
+		  application id will be returned in the form
+		  DCOPRef(application id,object id).
+		  </para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>-l</option>
+        </term>
+        <listitem>
+          <para>If the object is not found, run dcopstart and try again.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--help</option>
+        </term>
+        <listitem>
+          <para>Show usage information.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+  <refsect1>
+    <title>EXAMPLES</title>
+    
+    <para><example>
+      <title>Return reference to a Kate instance</title>
+        <blockquote><literallayout>
+KATE=`dcopfind -a 'kate-*'`
+        </literallayout></blockquote>
+    </example></para>
+  </refsect1>
+  <refsect1>
+    <title>AUTHOR</title>
+
+    <para>This manual page was written by &dhusername; &lt;&dhemail;&gt; for 
+	  the &debian; system (but may be used by others).  Permission is granted
+	  to copy, distribute and/or modify this document under the terms of the
+	  &gnu; General Public License, Version 2 or any later version published by
+	  the Free Software Foundation.</para>
+
+	<para>On Debian systems, the complete text of the GNU General Public
+	  License can be found in /usr/share/common-licenses/GPL.</para>
+
+  </refsect1>
+  <refsect1>
+    <title>SEE ALSO</title>
+      <para><application>dcopstart</application>(1), <application>dcop</application>(1)</para>
+  </refsect1>
+</refentry>
+
+<!-- Keep this comment at the end of the file
+Local variables:
+mode: sgml
+sgml-omittag:t
+sgml-shorttag:t
+sgml-minimize-attributes:nil
+sgml-always-quote-attributes:t
+sgml-indent-step:2
+sgml-indent-data:t
+sgml-parent-document:nil
+sgml-default-dtd-file:nil
+sgml-exposed-tags:nil
+sgml-local-catalogs:nil
+sgml-local-ecat-files:nil
+End:
+-->
--- kdelibs-3.5.7.orig/debian/man/dcopquit.1
+++ kdelibs-3.5.7/debian/man/dcopquit.1
@@ -0,0 +1,27 @@
+.TH DCOPQUIT 1 "Jun 2006" "K Desktop Environment" ""
+.SH NAME
+dcopquit
+\- terminates a KDE service
+.SH SYNOPSIS
+.B dcopquit
+.RI [ applicationid ]
+.SH DESCRIPTION
+\fBdcopquit\fP terminates a KDE service via its DCOP application id. You can use \fBdcopclient\fP to extract the application id from a DCOP reference.
+.SH EXAMPLES
+.TP
+.B Terminate Konqueror instance
+dcopquit 'konqueror\-9270'
+.SH SEE ALSO
+.BR dcop (1),\  dcopclient (1),\  dcopstart (1)
+.SH AUTHORS
+.nf
+Matthias Ettrich <ettrich@kde.org>
+.br
+
+.br
+.fi
+Please use http://bugs.kde.org to report bugs, do not mail the author directly.
+.PP
+This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the \fBDebian\fP Project (but may be used by others). Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
+.PP
+On \fBDebian\fP systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
--- kdelibs-3.5.7.orig/debian/man/imagetops.1
+++ kdelibs-3.5.7/debian/man/imagetops.1
@@ -0,0 +1,45 @@
+.TH IMAGETOPS 1 "Jun 2006" "K Desktop Environment" "Generic Image to PS Filter"
+.SH NAME
+imagetops
+\- generic image to ps filter
+.SH SYNOPSIS
+.BR imagetops \ [ \-gray ]\ [ arguments\ for\ pnmtops ]
+.RI [  filename ]
+.SH DESCRIPTION
+\fBimagetops\fP is a generic image to ps filter. It can be used as print filter in KDE.
+.sp 1
+\fBimagetops\fP works in two steps:
+.IP "    1."
+the given file is converted to PNM format by analyzing the file format and calling the appropriate conversion program.
+.IP "    2."
+the file in PNM format is converted to PS format by calling \fBpnmtops\fP.
+.PP
+The supported mime types are: jpeg, png, x\-png, bmp, x\-bmp, gif and tiff.
+.sp 1
+\fBimagetops\fP supports reading the parameters via stdin. A temporary file in \fI/tmp\fP is created then.
+.SH OPTIONS
+.SS Options:
+.TP
+.B  \-gray
+convert image to grayscale
+.SS Arguments:
+.TP
+.B arguments for pnmtops
+arguments passed to pnmtops
+.TP
+.I filename
+image file to convert
+.SH SEE ALSO
+.BR bmptoppm (1),\  giftopnm (1),\  jpegtopnm (1),\  pngtopnm (1),\  ppmtopgm (1),\  pnmtops (1)
+.SH AUTHORS
+.nf
+The KDE project
+.br
+
+.br
+.fi
+Please use http://bugs.kde.org to report bugs.
+.PP
+This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the \fBDebian\fP Project (but may be used by others). Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
+.PP
+On \fBDebian\fP systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
--- kdelibs-3.5.7.orig/debian/man/makekdewidgets.1
+++ kdelibs-3.5.7/debian/man/makekdewidgets.1
@@ -0,0 +1,162 @@
+.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
+.TH MAKEKDEWIDGETS 1 "Jun 2006" "K Desktop Environment" ""
+.SH NAME
+makekdewidgets
+\- Builds Qt widget plugins from an ini style description file.
+.SH SYNOPSIS
+\fBmakekdewidgets\fP [Qt\-options] [KDE\-options] file 
+.SH DESCRIPTION
+\fBmakekdewidgets\fP builds Qt widget plugins from an ini style description file.
+.SH OPTIONS
+.SS
+.SS Arguments:
+.TP
+.B file
+Input file
+.SS 
+.SS Options:
+.TP
+.B  \-o  <file>
+Output file
+.TP
+.B  \-n  <plugin name>
+Name of the plugin class to generate [WidgetsPlugin]
+.TP
+.B  \-g  <group>
+Default widget group name to display in designer [Custom]
+.TP
+.B  \-p  <pixmap dir>
+Embed pixmaps from a source directory
+.SS Generic options:
+.TP
+.B  \-\-help  
+Show help about options
+.TP
+.B  \-\-help\-qt  
+Show Qt specific options
+.TP
+.B  \-\-help\-kde  
+Show KDE specific options
+.TP
+.B  \-\-help\-all  
+Show all options
+.TP
+.B  \-\-author  
+Show author information
+.TP
+.B \-v,  \-\-version  
+Show version information
+.TP
+.B  \-\-license  
+Show license information
+.TP
+.B  \-\-  
+End of options
+.SS 
+.SS KDE options:
+.TP
+.B  \-\-caption  <caption>
+Use 'caption' as name in the titlebar
+.TP
+.B  \-\-icon  <icon>
+Use 'icon' as the application icon
+.TP
+.B  \-\-miniicon  <icon>
+Use 'icon' as the icon in the titlebar
+.TP
+.B  \-\-config  <filename>
+Use alternative configuration file
+.TP
+.B  \-\-dcopserver  <server>
+Use the DCOP Server specified by 'server'
+.TP
+.B  \-\-nocrashhandler  
+Disable crash handler, to get core dumps
+.TP
+.B  \-\-waitforwm  
+Waits for a WM_NET compatible windowmanager
+.TP
+.B  \-\-style  <style>
+sets the application GUI style
+.TP
+.B  \-\-geometry  <geometry>
+sets the client geometry of the main widget \- see man X for the argument format
+.SS 
+.SS Qt options:
+.TP
+.B  \-\-display  <displayname>
+Use the X\-server display 'displayname'
+.TP
+.B  \-\-session  <sessionId>
+Restore the application for the given 'sessionId'
+.TP
+.B  \-\-cmap  
+Causes the application to install a private color
+map on an 8\-bit display
+.TP
+.B  \-\-ncols  <count>
+Limits the number of colors allocated in the color
+cube on an 8\-bit display, if the application is
+using the QApplication::ManyColor color
+specification
+.TP
+.B  \-\-nograb  
+tells Qt to never grab the mouse or the keyboard
+.TP
+.B  \-\-dograb  
+running under a debugger can cause an implicit
+\-nograb, use \-dograb to override
+.TP
+.B  \-\-sync  
+switches to synchronous mode for debugging
+.TP
+.B \-\-fn,  \-\-font  <fontname>
+defines the application font
+.TP
+.B \-\-bg,  \-\-background  <color>
+sets the default background color and an
+application palette (light and dark shades are
+calculated)
+.TP
+.B \-\-fg,  \-\-foreground  <color>
+sets the default foreground color
+.TP
+.B \-\-btn,  \-\-button  <color>
+sets the default button color
+.TP
+.B  \-\-name  <name>
+sets the application name
+.TP
+.B  \-\-title  <title>
+sets the application title (caption)
+.TP
+.B  \-\-visual  TrueColor
+forces the application to use a TrueColor visual on
+an 8\-bit display
+.TP
+.B  \-\-inputstyle  <inputstyle>
+sets XIM (X Input Method) input style. Possible
+values are onthespot, overthespot, offthespot and
+root
+.TP
+.B  \-\-im  <XIM server>
+set XIM server
+.TP
+.B  \-\-noxim  
+disable XIM
+.TP
+.B  \-\-reverse  
+mirrors the whole layout of widgets
+.SS 
+.SH AUTHORS
+.nf
+Ian Reinhart Geiser <geiseri@kde.org>
+.br
+
+.br
+.fi
+Please use http://bugs.kde.org to report bugs, do not mail the author directly.
+.PP
+This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the \fBDebian\fP Project (but may be used by others). Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
+.PP
+On \fBDebian\fP systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
--- kdelibs-3.5.7.orig/debian/man/ktradertest.1
+++ kdelibs-3.5.7/debian/man/ktradertest.1
@@ -0,0 +1,162 @@
+.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
+.TH KTRADERTEST 1 "Jun 2006" "K Desktop Environment" "A KTrader testing tool"
+.SH NAME
+ktradertest
+\- A KTrader testing tool
+.SH SYNOPSIS
+\fBktradertest\fP [Qt\-options] [KDE\-options] query [genericServiceType] [constraint] [preference] 
+.SH DESCRIPTION
+\fBktradertest\fP is a command line tool to run trader queries.
+.sp 1
+KTrader uses .desktop files to store information on Servicetypes and services. It provides a way to query all KDE services (applications and components) that match a specific set of requirements.
+.sp 1
+A query to KTrader results in a list of services.
+.sp 1
+For example, \fBktradertest image/jpeg\fP shows a list of image manipulation programs.
+.SH OPTIONS
+.SS
+.SS Arguments:
+.TP
+.B query
+the query
+.TP
+.B genericServiceType
+Application (default), or KParts/ReadOnlyPart
+.TP
+.B constraint
+constraint
+.TP
+.B preference
+preference
+.SS Generic options:
+.TP
+.B  \-\-help  
+Show help about options
+.TP
+.B  \-\-help\-qt  
+Show Qt specific options
+.TP
+.B  \-\-help\-kde  
+Show KDE specific options
+.TP
+.B  \-\-help\-all  
+Show all options
+.TP
+.B  \-\-author  
+Show author information
+.TP
+.B \-v,  \-\-version  
+Show version information
+.TP
+.B  \-\-license  
+Show license information
+.TP
+.B  \-\-  
+End of options
+.SS 
+.SS KDE options:
+.TP
+.B  \-\-caption  <caption>
+Use 'caption' as name in the titlebar
+.TP
+.B  \-\-icon  <icon>
+Use 'icon' as the application icon
+.TP
+.B  \-\-miniicon  <icon>
+Use 'icon' as the icon in the titlebar
+.TP
+.B  \-\-config  <filename>
+Use alternative configuration file
+.TP
+.B  \-\-dcopserver  <server>
+Use the DCOP Server specified by 'server'
+.TP
+.B  \-\-nocrashhandler  
+Disable crash handler, to get core dumps
+.TP
+.B  \-\-waitforwm  
+Waits for a WM_NET compatible windowmanager
+.TP
+.B  \-\-style  <style>
+sets the application GUI style
+.TP
+.B  \-\-geometry  <geometry>
+sets the client geometry of the main widget \- see man X for the argument format
+.SS 
+.SS Qt options:
+.TP
+.B  \-\-display  <displayname>
+Use the X\-server display 'displayname'
+.TP
+.B  \-\-session  <sessionId>
+Restore the application for the given 'sessionId'
+.TP
+.B  \-\-cmap  
+Causes the application to install a private color
+map on an 8\-bit display
+.TP
+.B  \-\-ncols  <count>
+Limits the number of colors allocated in the color
+cube on an 8\-bit display, if the application is
+using the QApplication::ManyColor color
+specification
+.TP
+.B  \-\-nograb  
+tells Qt to never grab the mouse or the keyboard
+.TP
+.B  \-\-dograb  
+running under a debugger can cause an implicit
+\-nograb, use \-dograb to override
+.TP
+.B  \-\-sync  
+switches to synchronous mode for debugging
+.TP
+.B \-\-fn,  \-\-font  <fontname>
+defines the application font
+.TP
+.B \-\-bg,  \-\-background  <color>
+sets the default background color and an
+application palette (light and dark shades are
+calculated)
+.TP
+.B \-\-fg,  \-\-foreground  <color>
+sets the default foreground color
+.TP
+.B \-\-btn,  \-\-button  <color>
+sets the default button color
+.TP
+.B  \-\-name  <name>
+sets the application name
+.TP
+.B  \-\-title  <title>
+sets the application title (caption)
+.TP
+.B  \-\-visual  TrueColor
+forces the application to use a TrueColor visual on
+an 8\-bit display
+.TP
+.B  \-\-inputstyle  <inputstyle>
+sets XIM (X Input Method) input style. Possible
+values are onthespot, overthespot, offthespot and
+root
+.TP
+.B  \-\-im  <XIM server>
+set XIM server
+.TP
+.B  \-\-noxim  
+disable XIM
+.TP
+.B  \-\-reverse  
+mirrors the whole layout of widgets
+.SS 
+.SH AUTHORS
+.nf
+David Faure <faure@kde.org>
+
+.br
+.fi
+Please use http://bugs.kde.org to report bugs, do not mail the author directly.
+.PP
+This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the \fBDebian\fP Project (but may be used by others). Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
+.PP
+On \fBDebian\fP systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
--- kdelibs-3.5.7.orig/debian/man/kio_http_cache_cleaner.sgml
+++ kdelibs-3.5.7/debian/man/kio_http_cache_cleaner.sgml
@@ -0,0 +1,386 @@
+<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
+
+<!-- Process this file with docbook-to-man to generate an nroff manual
+     page: `docbook-to-man manpage.sgml > manpage.1'.  You may view
+     the manual page with: `docbook-to-man manpage.sgml | nroff -man |
+     less'.  A typical entry in a Makefile or Makefile.am is:
+
+manpage.1: manpage.sgml
+	docbook-to-man $< > $@
+
+    
+	The docbook-to-man binary is found in the docbook-to-man package.
+	Please remember that if you create the nroff version in one of the
+	debian/rules file targets (such as build), you will need to include
+	docbook-to-man in your Build-Depends control field.
+
+  -->
+
+  <!-- Fill in your name for FIRSTNAME and SURNAME. -->
+  <!ENTITY dhfirstname "<firstname>Chris</firstname>">
+  <!ENTITY dhsurname   "<surname>Cheney</surname>">
+  <!-- Please adjust the date whenever revising the manpage. -->
+  <!ENTITY dhdate      "<date>November  6, 2002</date>">
+  <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
+       allowed: see man(7), man(1). -->
+  <!ENTITY dhsection   "<manvolnum>1</manvolnum>">
+  <!ENTITY dhemail     "<email>ccheney@debian.org</email>">
+  <!ENTITY dhusername  "Chris Cheney">
+  <!ENTITY dhucpackage "<refentrytitle>KIO_HTTP_CACHE_CLEANER</refentrytitle>">
+  <!ENTITY dhpackage   "kio_http_cache_cleaner">
+
+  <!ENTITY debian      "<productname>Debian</productname>">
+  <!ENTITY gnu         "<acronym>GNU</acronym>">
+]>
+
+<refentry>
+  <refentryinfo>
+    <address>
+      &dhemail;
+    </address>
+    <author>
+      &dhfirstname;
+      &dhsurname;
+    </author>
+    <copyright>
+      <year>2002</year>
+      <holder>&dhusername;</holder>
+    </copyright>
+    &dhdate;
+  </refentryinfo>
+  <refmeta>
+    &dhucpackage;
+
+    &dhsection;
+  </refmeta>
+  <refnamediv>
+    <refname>&dhpackage;</refname>
+
+    <refpurpose>KDE HTTP cache maintenance tool</refpurpose>
+  </refnamediv>
+  <refsynopsisdiv>
+    <cmdsynopsis>
+      <command>&dhpackage;</command>
+
+      <arg><option><replaceable>Qt-options</replaceable></option></arg>
+      <arg><option><replaceable>KDE-options</replaceable></option></arg>
+      <arg><option>--clear-all</option></arg>
+
+    </cmdsynopsis>
+  </refsynopsisdiv>
+  <refsect1>
+    <title>DESCRIPTION</title>
+
+    <para>This manual page documents briefly the
+      <command>&dhpackage;</command> command.</para>
+
+    <para><command>&dhpackage;</command> is a KDE HTTP cache maintenance tool.</para>
+
+  </refsect1>
+  <refsect1>
+    <title>GENERIC OPTIONS</title>
+
+    <para>This program follows the usual GNU command line syntax,
+      with long options starting with two dashes (`-').  A summary of
+      options is included below.</para>
+
+    <variablelist>
+      <varlistentry>
+        <term><option>--author</option>
+        </term>
+        <listitem>
+          <para>Show author information.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--help</option>
+        </term>
+        <listitem>
+          <para>Show help about options.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--help-all</option>
+        </term>
+        <listitem>
+          <para>Show all options.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--help-kde</option>
+        </term>
+        <listitem>
+          <para>Show KDE specific options.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--help-qt</option>
+        </term>
+        <listitem>
+          <para>Show Qt specific options.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--license</option>
+        </term>
+        <listitem>
+          <para>Show license information.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>-v</option>, <option>--version</option>
+        </term>
+        <listitem>
+          <para>Show version information.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+  <refsect1>
+    <title>QT OPTIONS</title>
+
+    <variablelist>
+      <varlistentry>
+        <term><option>--bg</option>, <option>--background <replaceable>color</replaceable></option>
+        </term>
+        <listitem>
+          <para>Sets the default background color and an application palette (light and dark shades are calculated).</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--btn</option>, <option>--button <replaceable>color</replaceable></option>
+        </term>
+        <listitem>
+          <para>Sets the default button color.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--cmap</option>
+        </term>
+        <listitem>
+          <para>Causes the application to install a private color map on an 8-bit display.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--display <replaceable>displayname</replaceable></option>
+        </term>
+        <listitem>
+          <para>Use the X-server display 'displayname'.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--dograb</option>
+        </term>
+        <listitem>
+          <para>Running under a debugger can cause an implicit --nograb, use --dograb to override.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--fg</option>, <option>--foreground <replaceable>color</replaceable></option>
+        </term>
+        <listitem>
+          <para>Sets the default foreground color.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--fn</option>, <option>--font <replaceable>fontname</replaceable></option>
+        </term>
+        <listitem>
+          <para>Defines the application font.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--im <replaceable>XIMserver</replaceable></option>
+        </term>
+        <listitem>
+          <para>Set XIM server.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--inputstyle <replaceable>inputstyle</replaceable></option>
+        </term>
+        <listitem>
+          <para>Sets XIM (X Input Method) input style. Possible values are onthespot, overthespot, offthespot and root.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--name <replaceable>name</replaceable></option>
+        </term>
+        <listitem>
+          <para>Sets the application name.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--ncols <replaceable>count</replaceable></option>
+        </term>
+        <listitem>
+          <para>Limits the number of colors allocated in the color cube on an 8-bit display, if the application is using the QApplication::ManyColor color specification.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--nograb</option>
+        </term>
+        <listitem>
+          <para>Tells Qt to never grab the mouse or the keyboard.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--noxim</option>
+        </term>
+        <listitem>
+          <para>Disable XIM.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--reverse</option>
+        </term>
+        <listitem>
+          <para>Mirrors the whole layout of widgets.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--session <replaceable>sessionId</replaceable></option>
+        </term>
+        <listitem>
+          <para>Restore the application for the given 'sessionId'.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--sync</option>
+        </term>
+        <listitem>
+          <para>Switches to synchronous mode for debugging.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--title <replaceable>title</replaceable></option>
+        </term>
+        <listitem>
+          <para>Sets the application title (caption).</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--visual TrueColor</option>
+        </term>
+        <listitem>
+          <para>Forces the application to use a TrueColor visual on an 8-bit display.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+  <refsect1>
+    <title>KDE OPTIONS</title>
+
+    <variablelist>
+      <varlistentry>
+        <term><option>--caption <replaceable>caption</replaceable></option>
+        </term>
+        <listitem>
+          <para>Use 'caption' as name in the titlebar.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--config <replaceable>filename</replaceable></option>
+        </term>
+        <listitem>
+          <para>Use alternative configuration file.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--dcopserver <replaceable>server</replaceable></option>
+        </term>
+        <listitem>
+          <para>Use the DCOP Server specified by 'server'.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--geometry <replaceable>geometry</replaceable></option>
+        </term>
+        <listitem>
+          <para>Sets the client geometry of the main widget.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--icon <replaceable>icon</replaceable></option>
+        </term>
+        <listitem>
+          <para>Use 'icon' as the application icon.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--miniicon <replaceable>icon</replaceable></option>
+        </term>
+        <listitem>
+          <para>Use 'icon' as the icon in the titlebar.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--nocrashhandler</option>
+        </term>
+        <listitem>
+          <para>Disable crash handler, to get core dumps.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--style <replaceable>style</replaceable></option>
+        </term>
+        <listitem>
+          <para>Sets the application GUI style.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--waitforwm</option>
+        </term>
+        <listitem>
+          <para>Waits for a WM_NET compatible windowmanager.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+  <refsect1>
+    <title>APP OPTIONS</title>
+
+    <variablelist>
+      <varlistentry>
+        <term><option>--clear-all</option>
+        </term>
+        <listitem>
+          <para>Empty the cache.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+  <refsect1>
+    <title>AUTHOR</title>
+
+    <para>This manual page was written by &dhusername;
+      &lt;&dhemail;&gt; for the &debian; system (but may be used by
+      others).  Permission is granted to copy, distribute and/or
+      modify this document under the terms of the &gnu; General Public
+      License, Version 2 or any later version published by the Free
+      Software Foundation.
+    </para>
+
+    <para>On Debian systems, the complete text of the GNU General
+      Public License can be found in /usr/share/common-licenses/GPL.
+    </para>
+
+  </refsect1>
+</refentry>
+
+<!-- Keep this comment at the end of the file
+Local variables:
+mode: sgml
+sgml-omittag:t
+sgml-shorttag:t
+sgml-minimize-attributes:nil
+sgml-always-quote-attributes:t
+sgml-indent-step:2
+sgml-indent-data:t
+sgml-parent-document:nil
+sgml-default-dtd-file:nil
+sgml-exposed-tags:nil
+sgml-local-catalogs:nil
+sgml-local-ecat-files:nil
+End:
+-->
--- kdelibs-3.5.7.orig/debian/man/lnusertemp.sgml
+++ kdelibs-3.5.7/debian/man/lnusertemp.sgml
@@ -0,0 +1,168 @@
+<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
+
+<!-- Process this file with docbook-to-man to generate an nroff manual
+     page: `docbook-to-man manpage.sgml > manpage.1'.  You may view
+     the manual page with: `docbook-to-man manpage.sgml | nroff -man |
+     less'.  A typical entry in a Makefile or Makefile.am is:
+
+manpage.1: manpage.sgml
+	docbook-to-man $< > $@
+
+    
+	The docbook-to-man binary is found in the docbook-to-man package.
+	Please remember that if you create the nroff version in one of the
+	debian/rules file targets (such as build), you will need to include
+	docbook-to-man in your Build-Depends control field.
+
+  -->
+
+  <!-- Fill in your name for FIRSTNAME and SURNAME. -->
+  <!ENTITY dhfirstname "<firstname>Javier</firstname>">
+  <!ENTITY dhsurname   "<surname>Fernandez-Sanguino</surname>">
+  <!-- Please adjust the date whenever revising the manpage. -->
+  <!ENTITY dhdate      "<date>25 January, 2005</date>">
+  <!ENTITY dhsection   "<manvolnum>1</manvolnum>">
+  <!ENTITY dhemail     "<email>jfs@debian.org</email>">
+  <!ENTITY dhusername  "Javier Fernandez-Sanguino">
+  <!ENTITY dhucpackage "<refentrytitle>LNUSERTEMP</refentrytitle>">
+  <!ENTITY dhpackage   "lnusertemp">
+
+  <!ENTITY debian      "<productname>Debian</productname>">
+  <!ENTITY gnu         "<acronym>GNU</acronym>">
+]>
+
+<refentry>
+  <refentryinfo>
+    <address>
+      &dhemail;
+    </address>
+    <author>
+      &dhfirstname;
+      &dhsurname;
+    </author>
+    <copyright>
+      <year>2005</year>
+      <holder>&dhusername;</holder>
+    </copyright>
+    &dhdate;
+  </refentryinfo>
+  <refmeta>
+    &dhucpackage;
+
+    &dhsection;
+  </refmeta>
+  <refnamediv>
+    <refname>&dhpackage;</refname>
+
+    <refpurpose>tool to create KDE resources and symlinks to them</refpurpose>
+  </refnamediv>
+  <refsynopsisdiv>
+    <cmdsynopsis>
+      <command>&dhpackage;</command>
+
+      <arg><option><replaceable>tmp|socket|cache</replaceable></option></arg>
+
+    </cmdsynopsis>
+  </refsynopsisdiv>
+  <refsect1>
+    <title>DESCRIPTION</title>
+
+    <para>This manual page documents briefly the
+      <command>&dhpackage;</command> command.</para>
+
+    <para><command>&dhpackage;</command> is used to create KDE
+    resources in temporary directories and symlinks to them in
+    <envar>KDEHOME</envar>. The resource that needs to be created is
+    given as an argument and can be anyone of:</para>
+
+    <itemizedlist>
+
+    <listitem><para><emphasis>tmp</emphasis>: for the directory used
+    for storing temporary files. This directory should be preferably
+    on a local filesystem (available in KDE 2.x)</para> </listitem>
+
+    <listitem><para><emphasis>socket</emphasis>: for the directory
+    that holds temporary sockets. This directory needs to be on the
+    local filesystem (available in KDE 2.x)</para> </listitem>
+
+    <listitem><para><emphasis>cache</emphasis>: for the directory that
+    stores cached information such as the HTTP cache and favicons
+    (available since KDE 3.0)</para> </listitem>
+
+    </itemizedlist>
+
+    <para><command>&dhpackage;</command> will create the first two
+    resources in directories under <filename>/tmp</filename> (or
+    <envar>KDETMP</envar> if defined in the environment) and will use
+    <filename>/var/tmp</filename> (or <envar>KDEVARTMP</envar> if
+    defined in the environment) for the <emphasis>cache</emphasis>
+    resource (in order to survive system reboots). The temporary
+    directories created for resources are usually of the form
+    <filename>RESOURCE-USERNAME</filename>. The name might vary if
+    those filenames already exist and do not belong to the user for
+    which <command>&dhpackage;</command> is run, a temporary (unique)
+    name will be used if possible to prevent temporary symlink
+    attacks.  </para>
+
+    <para><command>&dhpackage;</command> is usually called by the
+    <command>startkde</command> script.</para>
+
+  </refsect1>
+  <refsect1>
+    <title>EXIT VALUES</title>
+
+    <para><command>&dhpackage;</command> will return 0 if it can
+    create the resource and symlink to it, or if the resource already
+    exists and is properly symlinked it will return 1 if it cannot
+    create the link or if the symlink is pointing to an incorrect
+    location.</para>
+
+  </refsect1>
+  <refsect1>
+    <title>SEE ALSO</title>
+
+    <para>You can find more information on the KDE's usage of
+    temporary files in the Chapter <ulink
+    url="http://i18n.kde.org/doc/admin/temp-files.html"><citetitle>Temporary
+    and Other Files KDE Uses</citetitle></ulink> of the <ulink
+    url="http://i18n.kde.org/doc/admin/"><citetitle>The KDE
+    Administrators Guide</citetitle></ulink>.  </para>
+
+  </refsect1>
+
+  <refsect1>
+
+    <title>AUTHOR</title>
+
+    <para>This manual page was written by &dhusername;
+      &lt;&dhemail;&gt; for the &debian; system (but may be used by
+      others).  Permission is granted to copy, distribute and/or
+      modify this document under the terms of the &gnu; General Public
+      License, Version 2 or any later version published by the Free
+      Software Foundation.  </para>
+
+    <para>
+          On Debian systems, the complete text of the GNU General
+          Public License can be found in
+          /usr/share/common-licenses/GPL. 
+    </para>
+
+  </refsect1>
+</refentry>
+
+<!-- Keep this comment at the end of the file
+Local variables:
+mode: sgml
+sgml-omittag:t
+sgml-shorttag:t
+sgml-minimize-attributes:nil
+sgml-always-quote-attributes:t
+sgml-indent-step:2
+sgml-indent-data:t
+sgml-parent-document:nil
+sgml-default-dtd-file:nil
+sgml-exposed-tags:nil
+sgml-local-catalogs:nil
+sgml-local-ecat-files:nil
+End:
+-->
--- kdelibs-3.5.7.orig/debian/man/kcmshell.1
+++ kdelibs-3.5.7/debian/man/kcmshell.1
@@ -0,0 +1,182 @@
+.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
+.TH KCMSHELL 1 "Jun 2006" "K Desktop Environment" "tool to start single KDE control modules"
+.SH NAME
+kcmshell
+\- tool to start single KDE control modules
+.SH SYNOPSIS
+kcmshell [Qt\-options] [KDE\-options] [options] module 
+.SH DESCRIPTION
+\fBkcmshell\fP is a tool to start single KDE control modules.
+.SH OPTIONS
+.SS
+.SS Arguments:
+.TP
+.B module
+Configuration module to open
+.TP
+.B  \-\-lang  <language>
+Specify a particular language
+.TP
+.B  \-\-embed  <id>
+Embeds the module with buttons in window with id <id>
+.TP
+.B  \-\-embed\-proxy  <id>
+Embeds the module without buttons in window with id <id>
+.TP
+.B  \-\-silent  
+Do not display main window
+.SS Options:
+.TP
+.B  \-\-list  
+List all possible modules
+.SS 
+.SS Generic options:
+.TP
+.B  \-\-help  
+Show help about options
+.TP
+.B  \-\-help\-qt  
+Show Qt specific options
+.TP
+.B  \-\-help\-kde  
+Show KDE specific options
+.TP
+.B  \-\-help\-all  
+Show all options
+.TP
+.B  \-\-author  
+Show author information
+.TP
+.B \-v,  \-\-version  
+Show version information
+.TP
+.B  \-\-license  
+Show license information
+.TP
+.B  \-\-  
+End of options
+.SS 
+.SS KDE options:
+.TP
+.B  \-\-caption  <caption>
+Use 'caption' as name in the titlebar
+.TP
+.B  \-\-icon  <icon>
+Use 'icon' as the application icon
+.TP
+.B  \-\-miniicon  <icon>
+Use 'icon' as the icon in the titlebar
+.TP
+.B  \-\-config  <filename>
+Use alternative configuration file
+.TP
+.B  \-\-dcopserver  <server>
+Use the DCOP Server specified by 'server'
+.TP
+.B  \-\-nocrashhandler  
+Disable crash handler, to get core dumps
+.TP
+.B  \-\-waitforwm  
+Waits for a WM_NET compatible windowmanager
+.TP
+.B  \-\-style  <style>
+sets the application GUI style
+.TP
+.B  \-\-geometry  <geometry>
+sets the client geometry of the main widget \- see man X for the argument format
+.SS 
+.SS Qt options:
+.TP
+.B  \-\-display  <displayname>
+Use the X\-server display 'displayname'
+.TP
+.B  \-\-session  <sessionId>
+Restore the application for the given 'sessionId'
+.TP
+.B  \-\-cmap  
+Causes the application to install a private color
+map on an 8\-bit display
+.TP
+.B  \-\-ncols  <count>
+Limits the number of colors allocated in the color
+cube on an 8\-bit display, if the application is
+using the QApplication::ManyColor color
+specification
+.TP
+.B  \-\-nograb  
+tells Qt to never grab the mouse or the keyboard
+.TP
+.B  \-\-dograb  
+running under a debugger can cause an implicit
+\-nograb, use \-dograb to override
+.TP
+.B  \-\-sync  
+switches to synchronous mode for debugging
+.TP
+.B \-\-fn,  \-\-font  <fontname>
+defines the application font
+.TP
+.B \-\-bg,  \-\-background  <color>
+sets the default background color and an
+application palette (light and dark shades are
+calculated)
+.TP
+.B \-\-fg,  \-\-foreground  <color>
+sets the default foreground color
+.TP
+.B \-\-btn,  \-\-button  <color>
+sets the default button color
+.TP
+.B  \-\-name  <name>
+sets the application name
+.TP
+.B  \-\-title  <title>
+sets the application title (caption)
+.TP
+.B  \-\-visual  TrueColor
+forces the application to use a TrueColor visual on
+an 8\-bit display
+.TP
+.B  \-\-inputstyle  <inputstyle>
+sets XIM (X Input Method) input style. Possible
+values are onthespot, overthespot, offthespot and
+root
+.TP
+.B  \-\-im  <XIM server>
+set XIM server
+.TP
+.B  \-\-noxim  
+disable XIM
+.TP
+.B  \-\-reverse  
+mirrors the whole layout of widgets
+.SS 
+.SH SEE ALSO
+Full user documentation is available through the KDE Help Center.  You can also enter the URL
+.BR help:/kcmshell/
+directly into konqueror or you can run 
+.BR "`khelpcenter help:/kcmshell/'"
+from the command\-line.
+.br
+.SH AUTHORS
+.nf
+Frans Englich <frans.englich@kde.org>
+.br
+Daniel Molkentin <molkentin@kde.org>
+.br
+Matthias Hoelzer\-Kluepfel <hoelzer@kde.org>
+.br
+Matthias Elter <elter@kde.org>
+.br
+Matthias Ettrich <ettrich@kde.org>
+.br
+Waldo Bastian <bastian@kde.org>
+.br
+
+.br
+.fi
+Please use http://bugs.kde.org to report bugs, do not mail the authors directly.
+.PP
+This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the \fBDebian\fP Project (but may be used by others). Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
+.PP
+On \fBDebian\fP systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
--- kdelibs-3.5.7.orig/debian/man/kinstalltheme.sgml
+++ kdelibs-3.5.7/debian/man/kinstalltheme.sgml
@@ -0,0 +1,372 @@
+<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
+
+<!-- Process this file with docbook-to-man to generate an nroff manual
+     page: `docbook-to-man manpage.sgml > manpage.1'.  You may view
+     the manual page with: `docbook-to-man manpage.sgml | nroff -man |
+     less'.  A typical entry in a Makefile or Makefile.am is:
+
+manpage.1: manpage.sgml
+	docbook-to-man $< > $@
+
+    
+	The docbook-to-man binary is found in the docbook-to-man package.
+	Please remember that if you create the nroff version in one of the
+	debian/rules file targets (such as build), you will need to include
+	docbook-to-man in your Build-Depends control field.
+
+  -->
+
+  <!-- Fill in your name for FIRSTNAME and SURNAME. -->
+  <!ENTITY dhfirstname "<firstname>Chris</firstname>">
+  <!ENTITY dhsurname   "<surname>Cheney</surname>">
+  <!-- Please adjust the date whenever revising the manpage. -->
+  <!ENTITY dhdate      "<date>November  6, 2002</date>">
+  <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
+       allowed: see man(7), man(1). -->
+  <!ENTITY dhsection   "<manvolnum>1</manvolnum>">
+  <!ENTITY dhemail     "<email>ccheney@debian.org</email>">
+  <!ENTITY dhusername  "Chris Cheney">
+  <!ENTITY dhucpackage "<refentrytitle>KINSTALLTHEME</refentrytitle>">
+  <!ENTITY dhpackage   "kinstalltheme">
+
+  <!ENTITY debian      "<productname>Debian</productname>">
+  <!ENTITY gnu         "<acronym>GNU</acronym>">
+]>
+
+<refentry>
+  <refentryinfo>
+    <address>
+      &dhemail;
+    </address>
+    <author>
+      &dhfirstname;
+      &dhsurname;
+    </author>
+    <copyright>
+      <year>2002</year>
+      <holder>&dhusername;</holder>
+    </copyright>
+    &dhdate;
+  </refentryinfo>
+  <refmeta>
+    &dhucpackage;
+
+    &dhsection;
+  </refmeta>
+  <refnamediv>
+    <refname>&dhpackage;</refname>
+
+    <refpurpose>KDE Tool to build a cache list of all pixmap themes installed</refpurpose>
+  </refnamediv>
+  <refsynopsisdiv>
+    <cmdsynopsis>
+      <command>&dhpackage;</command>
+
+      <arg><option><replaceable>Qt-options</replaceable></option></arg>
+      <arg><option><replaceable>KDE-options</replaceable></option></arg>
+
+    </cmdsynopsis>
+  </refsynopsisdiv>
+  <refsect1>
+    <title>DESCRIPTION</title>
+
+    <para>This manual page documents briefly the
+      <command>&dhpackage;</command> command.</para>
+
+    <para><command>&dhpackage;</command> is a KDE tool to build a cache list of all pixmap themes installed.</para>
+
+  </refsect1>
+  <refsect1>
+    <title>GENERIC OPTIONS</title>
+
+    <para>This program follows the usual GNU command line syntax,
+      with long options starting with two dashes (`-').  A summary of
+      options is included below.</para>
+
+    <variablelist>
+      <varlistentry>
+        <term><option>--author</option>
+        </term>
+        <listitem>
+          <para>Show author information.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--help</option>
+        </term>
+        <listitem>
+          <para>Show help about options.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--help-all</option>
+        </term>
+        <listitem>
+          <para>Show all options.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--help-kde</option>
+        </term>
+        <listitem>
+          <para>Show KDE specific options.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--help-qt</option>
+        </term>
+        <listitem>
+          <para>Show Qt specific options.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--license</option>
+        </term>
+        <listitem>
+          <para>Show license information.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>-v</option>, <option>--version</option>
+        </term>
+        <listitem>
+          <para>Show version information.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+  <refsect1>
+    <title>QT OPTIONS</title>
+
+    <variablelist>
+      <varlistentry>
+        <term><option>--bg</option>, <option>--background <replaceable>color</replaceable></option>
+        </term>
+        <listitem>
+          <para>Sets the default background color and an application palette (light and dark shades are calculated).</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--btn</option>, <option>--button <replaceable>color</replaceable></option>
+        </term>
+        <listitem>
+          <para>Sets the default button color.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--cmap</option>
+        </term>
+        <listitem>
+          <para>Causes the application to install a private color map on an 8-bit display.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--display <replaceable>displayname</replaceable></option>
+        </term>
+        <listitem>
+          <para>Use the X-server display 'displayname'.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--dograb</option>
+        </term>
+        <listitem>
+          <para>Running under a debugger can cause an implicit --nograb, use --dograb to override.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--fg</option>, <option>--foreground <replaceable>color</replaceable></option>
+        </term>
+        <listitem>
+          <para>Sets the default foreground color.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--fn</option>, <option>--font <replaceable>fontname</replaceable></option>
+        </term>
+        <listitem>
+          <para>Defines the application font.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--im <replaceable>XIMserver</replaceable></option>
+        </term>
+        <listitem>
+          <para>Set XIM server.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--inputstyle <replaceable>inputstyle</replaceable></option>
+        </term>
+        <listitem>
+          <para>Sets XIM (X Input Method) input style. Possible values are onthespot, overthespot, offthespot and root.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--name <replaceable>name</replaceable></option>
+        </term>
+        <listitem>
+          <para>Sets the application name.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--ncols <replaceable>count</replaceable></option>
+        </term>
+        <listitem>
+          <para>Limits the number of colors allocated in the color cube on an 8-bit display, if the application is using the QApplication::ManyColor color specification.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--nograb</option>
+        </term>
+        <listitem>
+          <para>Tells Qt to never grab the mouse or the keyboard.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--noxim</option>
+        </term>
+        <listitem>
+          <para>Disable XIM.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--reverse</option>
+        </term>
+        <listitem>
+          <para>Mirrors the whole layout of widgets.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--session <replaceable>sessionId</replaceable></option>
+        </term>
+        <listitem>
+          <para>Restore the application for the given 'sessionId'.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--sync</option>
+        </term>
+        <listitem>
+          <para>Switches to synchronous mode for debugging.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--title <replaceable>title</replaceable></option>
+        </term>
+        <listitem>
+          <para>Sets the application title (caption).</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--visual TrueColor</option>
+        </term>
+        <listitem>
+          <para>Forces the application to use a TrueColor visual on an 8-bit display.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+  <refsect1>
+    <title>KDE OPTIONS</title>
+
+    <variablelist>
+      <varlistentry>
+        <term><option>--caption <replaceable>caption</replaceable></option>
+        </term>
+        <listitem>
+          <para>Use 'caption' as name in the titlebar.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--config <replaceable>filename</replaceable></option>
+        </term>
+        <listitem>
+          <para>Use alternative configuration file.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--dcopserver <replaceable>server</replaceable></option>
+        </term>
+        <listitem>
+          <para>Use the DCOP Server specified by 'server'.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--geometry <replaceable>geometry</replaceable></option>
+        </term>
+        <listitem>
+          <para>Sets the client geometry of the main widget.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--icon <replaceable>icon</replaceable></option>
+        </term>
+        <listitem>
+          <para>Use 'icon' as the application icon.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--miniicon <replaceable>icon</replaceable></option>
+        </term>
+        <listitem>
+          <para>Use 'icon' as the icon in the titlebar.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--nocrashhandler</option>
+        </term>
+        <listitem>
+          <para>Disable crash handler, to get core dumps.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--style <replaceable>style</replaceable></option>
+        </term>
+        <listitem>
+          <para>Sets the application GUI style.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--waitforwm</option>
+        </term>
+        <listitem>
+          <para>Waits for a WM_NET compatible windowmanager.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+  <refsect1>
+    <title>AUTHOR</title>
+
+    <para>This manual page was written by &dhusername;
+      &lt;&dhemail;&gt; for the &debian; system (but may be used by
+      others).  Permission is granted to copy, distribute and/or
+      modify this document under the terms of the &gnu; General Public
+      License, Version 2 or any later version published by the Free
+      Software Foundation.
+    </para>
+
+    <para>On Debian systems, the complete text of the GNU General
+      Public License can be found in /usr/share/common-licenses/GPL.
+    </para>
+
+  </refsect1>
+</refentry>
+
+<!-- Keep this comment at the end of the file
+Local variables:
+mode: sgml
+sgml-omittag:t
+sgml-shorttag:t
+sgml-minimize-attributes:nil
+sgml-always-quote-attributes:t
+sgml-indent-step:2
+sgml-indent-data:t
+sgml-parent-document:nil
+sgml-default-dtd-file:nil
+sgml-exposed-tags:nil
+sgml-local-catalogs:nil
+sgml-local-ecat-files:nil
+End:
+-->
--- kdelibs-3.5.7.orig/debian/man/ksendbugmail.sgml
+++ kdelibs-3.5.7/debian/man/ksendbugmail.sgml
@@ -0,0 +1,394 @@
+<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
+
+<!-- Process this file with docbook-to-man to generate an nroff manual
+     page: `docbook-to-man manpage.sgml > manpage.1'.  You may view
+     the manual page with: `docbook-to-man manpage.sgml | nroff -man |
+     less'.  A typical entry in a Makefile or Makefile.am is:
+
+manpage.1: manpage.sgml
+	docbook-to-man $< > $@
+
+    
+	The docbook-to-man binary is found in the docbook-to-man package.
+	Please remember that if you create the nroff version in one of the
+	debian/rules file targets (such as build), you will need to include
+	docbook-to-man in your Build-Depends control field.
+
+  -->
+
+  <!-- Fill in your name for FIRSTNAME and SURNAME. -->
+  <!ENTITY dhfirstname "<firstname>Chris</firstname>">
+  <!ENTITY dhsurname   "<surname>Cheney</surname>">
+  <!-- Please adjust the date whenever revising the manpage. -->
+  <!ENTITY dhdate      "<date>November  6, 2002</date>">
+  <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
+       allowed: see man(7), man(1). -->
+  <!ENTITY dhsection   "<manvolnum>1</manvolnum>">
+  <!ENTITY dhemail     "<email>ccheney@debian.org</email>">
+  <!ENTITY dhusername  "Chris Cheney">
+  <!ENTITY dhucpackage "<refentrytitle>KSENDBUGEMAIL</refentrytitle>">
+  <!ENTITY dhpackage   "ksendbugemail">
+
+  <!ENTITY debian      "<productname>Debian</productname>">
+  <!ENTITY gnu         "<acronym>GNU</acronym>">
+]>
+
+<refentry>
+  <refentryinfo>
+    <address>
+      &dhemail;
+    </address>
+    <author>
+      &dhfirstname;
+      &dhsurname;
+    </author>
+    <copyright>
+      <year>2002</year>
+      <holder>&dhusername;</holder>
+    </copyright>
+    &dhdate;
+  </refentryinfo>
+  <refmeta>
+    &dhucpackage;
+
+    &dhsection;
+  </refmeta>
+  <refnamediv>
+    <refname>&dhpackage;</refname>
+
+    <refpurpose>Sends a short bug report to submit@bugs.kde.org</refpurpose>
+  </refnamediv>
+  <refsynopsisdiv>
+    <cmdsynopsis>
+      <command>&dhpackage;</command>
+
+      <arg><option><replaceable>Qt-options</replaceable></option></arg>
+      <arg><option><replaceable>KDE-options</replaceable></option></arg>
+      <arg><option>--recipient <replaceable>argument</replaceable></option></arg>
+      <arg><option>--subject <replaceable>argument</replaceable></option></arg>
+
+    </cmdsynopsis>
+  </refsynopsisdiv>
+  <refsect1>
+    <title>DESCRIPTION</title>
+
+    <para>This manual page documents briefly the
+      <command>&dhpackage;</command> command.</para>
+
+    <para><command>&dhpackage;</command> sends a short bug report to submit@bugs.kde.org</para>
+
+  </refsect1>
+  <refsect1>
+    <title>GENERIC OPTIONS</title>
+
+    <para>This program follows the usual GNU command line syntax,
+      with long options starting with two dashes (`-').  A summary of
+      options is included below.</para>
+
+    <variablelist>
+      <varlistentry>
+        <term><option>--author</option>
+        </term>
+        <listitem>
+          <para>Show author information.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--help</option>
+        </term>
+        <listitem>
+          <para>Show help about options.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--help-all</option>
+        </term>
+        <listitem>
+          <para>Show all options.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--help-kde</option>
+        </term>
+        <listitem>
+          <para>Show KDE specific options.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--help-qt</option>
+        </term>
+        <listitem>
+          <para>Show Qt specific options.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--license</option>
+        </term>
+        <listitem>
+          <para>Show license information.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>-v</option>, <option>--version</option>
+        </term>
+        <listitem>
+          <para>Show version information.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+  <refsect1>
+    <title>QT OPTIONS</title>
+
+    <variablelist>
+      <varlistentry>
+        <term><option>--bg</option>, <option>--background <replaceable>color</replaceable></option>
+        </term>
+        <listitem>
+          <para>Sets the default background color and an application palette (light and dark shades are calculated).</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--btn</option>, <option>--button <replaceable>color</replaceable></option>
+        </term>
+        <listitem>
+          <para>Sets the default button color.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--cmap</option>
+        </term>
+        <listitem>
+          <para>Causes the application to install a private color map on an 8-bit display.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--display <replaceable>displayname</replaceable></option>
+        </term>
+        <listitem>
+          <para>Use the X-server display 'displayname'.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--dograb</option>
+        </term>
+        <listitem>
+          <para>Running under a debugger can cause an implicit --nograb, use --dograb to override.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--fg</option>, <option>--foreground <replaceable>color</replaceable></option>
+        </term>
+        <listitem>
+          <para>Sets the default foreground color.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--fn</option>, <option>--font <replaceable>fontname</replaceable></option>
+        </term>
+        <listitem>
+          <para>Defines the application font.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--im <replaceable>XIMserver</replaceable></option>
+        </term>
+        <listitem>
+          <para>Set XIM server.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--inputstyle <replaceable>inputstyle</replaceable></option>
+        </term>
+        <listitem>
+          <para>Sets XIM (X Input Method) input style. Possible values are onthespot, overthespot, offthespot and root.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--name <replaceable>name</replaceable></option>
+        </term>
+        <listitem>
+          <para>Sets the application name.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--ncols <replaceable>count</replaceable></option>
+        </term>
+        <listitem>
+          <para>Limits the number of colors allocated in the color cube on an 8-bit display, if the application is using the QApplication::ManyColor color specification.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--nograb</option>
+        </term>
+        <listitem>
+          <para>Tells Qt to never grab the mouse or the keyboard.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--noxim</option>
+        </term>
+        <listitem>
+          <para>Disable XIM.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--reverse</option>
+        </term>
+        <listitem>
+          <para>Mirrors the whole layout of widgets.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--session <replaceable>sessionId</replaceable></option>
+        </term>
+        <listitem>
+          <para>Restore the application for the given 'sessionId'.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--sync</option>
+        </term>
+        <listitem>
+          <para>Switches to synchronous mode for debugging.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--title <replaceable>title</replaceable></option>
+        </term>
+        <listitem>
+          <para>Sets the application title (caption).</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--visual TrueColor</option>
+        </term>
+        <listitem>
+          <para>Forces the application to use a TrueColor visual on an 8-bit display.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+  <refsect1>
+    <title>KDE OPTIONS</title>
+
+    <variablelist>
+      <varlistentry>
+        <term><option>--caption <replaceable>caption</replaceable></option>
+        </term>
+        <listitem>
+          <para>Use 'caption' as name in the titlebar.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--config <replaceable>filename</replaceable></option>
+        </term>
+        <listitem>
+          <para>Use alternative configuration file.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--dcopserver <replaceable>server</replaceable></option>
+        </term>
+        <listitem>
+          <para>Use the DCOP Server specified by 'server'.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--geometry <replaceable>geometry</replaceable></option>
+        </term>
+        <listitem>
+          <para>Sets the client geometry of the main widget.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--icon <replaceable>icon</replaceable></option>
+        </term>
+        <listitem>
+          <para>Use 'icon' as the application icon.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--miniicon <replaceable>icon</replaceable></option>
+        </term>
+        <listitem>
+          <para>Use 'icon' as the icon in the titlebar.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--nocrashhandler</option>
+        </term>
+        <listitem>
+          <para>Disable crash handler, to get core dumps.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--style <replaceable>style</replaceable></option>
+        </term>
+        <listitem>
+          <para>Sets the application GUI style.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--waitforwm</option>
+        </term>
+        <listitem>
+          <para>Waits for a WM_NET compatible windowmanager.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+  <refsect1>
+    <title>APP OPTIONS</title>
+
+    <variablelist>
+      <varlistentry>
+        <term><option>--recipient <replaceable>argument</replaceable></option>
+        </term>
+        <listitem>
+          <para>Recipient [submit@bugs.kde.org]</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--subject <replaceable>argument</replaceable></option>
+        </term>
+        <listitem>
+          <para>Subject line.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+  <refsect1>
+    <title>AUTHOR</title>
+
+    <para>This manual page was written by &dhusername;
+      &lt;&dhemail;&gt; for the &debian; system (but may be used by
+      others).  Permission is granted to copy, distribute and/or
+      modify this document under the terms of the &gnu; General Public
+      License, Version 2 or any later version published by the Free
+      Software Foundation.
+    </para>
+
+    <para>On Debian systems, the complete text of the GNU General
+      Public License can be found in /usr/share/common-licenses/GPL.
+    </para>
+
+  </refsect1>
+</refentry>
+
+<!-- Keep this comment at the end of the file
+Local variables:
+mode: sgml
+sgml-omittag:t
+sgml-shorttag:t
+sgml-minimize-attributes:nil
+sgml-always-quote-attributes:t
+sgml-indent-step:2
+sgml-indent-data:t
+sgml-parent-document:nil
+sgml-default-dtd-file:nil
+sgml-exposed-tags:nil
+sgml-local-catalogs:nil
+sgml-local-ecat-files:nil
+End:
+-->
--- kdelibs-3.5.7.orig/debian/man/kdesu_stub.1
+++ kdelibs-3.5.7/debian/man/kdesu_stub.1
@@ -0,0 +1,34 @@
+.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
+.TH KDESU_STUB 1 "Jun 2006" "K Desktop Environment" "KDE internal"
+.SH NAME
+kdesu_stub
+\- used by KDE su
+.SH DESCRIPTION
+!!! \fBkdesu_stub\fP is for KDE internal use only !!!
+.sp 1
+KDE su executes \fBkdesu_stub\fP through su or ssh. The stub is running as the target user. After some information is sent via stdin and stdout the stub executes the target program.
+.br
+The information passed over are the X display, a X authentication cookie (if available), the PATH and the command to run.
+.sp 1
+KDE su uses a stub program because the X cookie is private information and therefore cannot be passed on the command line.
+.SH SEE ALSO
+.BR kdesu (1)
+.sp 1
+Full user documentation is available through the KDE Help Center. You can also enter the URL
+.BR help:/kdesu/
+directly into konqueror or you can run 
+.BR "`khelpcenter help:/kdesu/'"
+from the command\-line.
+.br
+.SH AUTHORS
+.nf
+Geert Jansen <jansen@kde.org>
+.br
+
+.br
+.fi
+Please use http://bugs.kde.org to report bugs, do not mail the author directly.
+.PP
+This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the \fBDebian\fP Project (but may be used by others). Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
+.PP
+On \fBDebian\fP systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
--- kdelibs-3.5.7.orig/debian/man/kio_uiserver.sgml
+++ kdelibs-3.5.7/debian/man/kio_uiserver.sgml
@@ -0,0 +1,372 @@
+<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
+
+<!-- Process this file with docbook-to-man to generate an nroff manual
+     page: `docbook-to-man manpage.sgml > manpage.1'.  You may view
+     the manual page with: `docbook-to-man manpage.sgml | nroff -man |
+     less'.  A typical entry in a Makefile or Makefile.am is:
+
+manpage.1: manpage.sgml
+	docbook-to-man $< > $@
+
+    
+	The docbook-to-man binary is found in the docbook-to-man package.
+	Please remember that if you create the nroff version in one of the
+	debian/rules file targets (such as build), you will need to include
+	docbook-to-man in your Build-Depends control field.
+
+  -->
+
+  <!-- Fill in your name for FIRSTNAME and SURNAME. -->
+  <!ENTITY dhfirstname "<firstname>Chris</firstname>">
+  <!ENTITY dhsurname   "<surname>Cheney</surname>">
+  <!-- Please adjust the date whenever revising the manpage. -->
+  <!ENTITY dhdate      "<date>November  6, 2002</date>">
+  <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
+       allowed: see man(7), man(1). -->
+  <!ENTITY dhsection   "<manvolnum>1</manvolnum>">
+  <!ENTITY dhemail     "<email>ccheney@debian.org</email>">
+  <!ENTITY dhusername  "Chris Cheney">
+  <!ENTITY dhucpackage "<refentrytitle>KIO_UISERVER</refentrytitle>">
+  <!ENTITY dhpackage   "kio_uiserver">
+
+  <!ENTITY debian      "<productname>Debian</productname>">
+  <!ENTITY gnu         "<acronym>GNU</acronym>">
+]>
+
+<refentry>
+  <refentryinfo>
+    <address>
+      &dhemail;
+    </address>
+    <author>
+      &dhfirstname;
+      &dhsurname;
+    </author>
+    <copyright>
+      <year>2002</year>
+      <holder>&dhusername;</holder>
+    </copyright>
+    &dhdate;
+  </refentryinfo>
+  <refmeta>
+    &dhucpackage;
+
+    &dhsection;
+  </refmeta>
+  <refnamediv>
+    <refname>&dhpackage;</refname>
+
+    <refpurpose>KDE Progress Information UI Server</refpurpose>
+  </refnamediv>
+  <refsynopsisdiv>
+    <cmdsynopsis>
+      <command>&dhpackage;</command>
+
+      <arg><option><replaceable>Qt-options</replaceable></option></arg>
+      <arg><option><replaceable>KDE-options</replaceable></option></arg>
+
+    </cmdsynopsis>
+  </refsynopsisdiv>
+  <refsect1>
+    <title>DESCRIPTION</title>
+
+    <para>This manual page documents briefly the
+      <command>&dhpackage;</command> command.</para>
+
+    <para><command>&dhpackage;</command> is a KDE Progress Information UI Server.</para>
+
+  </refsect1>
+  <refsect1>
+    <title>GENERIC OPTIONS</title>
+
+    <para>This program follows the usual GNU command line syntax,
+      with long options starting with two dashes (`-').  A summary of
+      options is included below.</para>
+
+    <variablelist>
+      <varlistentry>
+        <term><option>--author</option>
+        </term>
+        <listitem>
+          <para>Show author information.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--help</option>
+        </term>
+        <listitem>
+          <para>Show help about options.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--help-all</option>
+        </term>
+        <listitem>
+          <para>Show all options.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--help-kde</option>
+        </term>
+        <listitem>
+          <para>Show KDE specific options.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--help-qt</option>
+        </term>
+        <listitem>
+          <para>Show Qt specific options.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--license</option>
+        </term>
+        <listitem>
+          <para>Show license information.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>-v</option>, <option>--version</option>
+        </term>
+        <listitem>
+          <para>Show version information.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+  <refsect1>
+    <title>QT OPTIONS</title>
+
+    <variablelist>
+      <varlistentry>
+        <term><option>--bg</option>, <option>--background <replaceable>color</replaceable></option>
+        </term>
+        <listitem>
+          <para>Sets the default background color and an application palette (light and dark shades are calculated).</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--btn</option>, <option>--button <replaceable>color</replaceable></option>
+        </term>
+        <listitem>
+          <para>Sets the default button color.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--cmap</option>
+        </term>
+        <listitem>
+          <para>Causes the application to install a private color map on an 8-bit display.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--display <replaceable>displayname</replaceable></option>
+        </term>
+        <listitem>
+          <para>Use the X-server display 'displayname'.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--dograb</option>
+        </term>
+        <listitem>
+          <para>Running under a debugger can cause an implicit --nograb, use --dograb to override.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--fg</option>, <option>--foreground <replaceable>color</replaceable></option>
+        </term>
+        <listitem>
+          <para>Sets the default foreground color.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--fn</option>, <option>--font <replaceable>fontname</replaceable></option>
+        </term>
+        <listitem>
+          <para>Defines the application font.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--im <replaceable>XIMserver</replaceable></option>
+        </term>
+        <listitem>
+          <para>Set XIM server.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--inputstyle <replaceable>inputstyle</replaceable></option>
+        </term>
+        <listitem>
+          <para>Sets XIM (X Input Method) input style. Possible values are onthespot, overthespot, offthespot and root.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--name <replaceable>name</replaceable></option>
+        </term>
+        <listitem>
+          <para>Sets the application name.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--ncols <replaceable>count</replaceable></option>
+        </term>
+        <listitem>
+          <para>Limits the number of colors allocated in the color cube on an 8-bit display, if the application is using the QApplication::ManyColor color specification.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--nograb</option>
+        </term>
+        <listitem>
+          <para>Tells Qt to never grab the mouse or the keyboard.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--noxim</option>
+        </term>
+        <listitem>
+          <para>Disable XIM.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--reverse</option>
+        </term>
+        <listitem>
+          <para>Mirrors the whole layout of widgets.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--session <replaceable>sessionId</replaceable></option>
+        </term>
+        <listitem>
+          <para>Restore the application for the given 'sessionId'.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--sync</option>
+        </term>
+        <listitem>
+          <para>Switches to synchronous mode for debugging.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--title <replaceable>title</replaceable></option>
+        </term>
+        <listitem>
+          <para>Sets the application title (caption).</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--visual TrueColor</option>
+        </term>
+        <listitem>
+          <para>Forces the application to use a TrueColor visual on an 8-bit display.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+  <refsect1>
+    <title>KDE OPTIONS</title>
+
+    <variablelist>
+      <varlistentry>
+        <term><option>--caption <replaceable>caption</replaceable></option>
+        </term>
+        <listitem>
+          <para>Use 'caption' as name in the titlebar.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--config <replaceable>filename</replaceable></option>
+        </term>
+        <listitem>
+          <para>Use alternative configuration file.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--dcopserver <replaceable>server</replaceable></option>
+        </term>
+        <listitem>
+          <para>Use the DCOP Server specified by 'server'.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--geometry <replaceable>geometry</replaceable></option>
+        </term>
+        <listitem>
+          <para>Sets the client geometry of the main widget.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--icon <replaceable>icon</replaceable></option>
+        </term>
+        <listitem>
+          <para>Use 'icon' as the application icon.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--miniicon <replaceable>icon</replaceable></option>
+        </term>
+        <listitem>
+          <para>Use 'icon' as the icon in the titlebar.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--nocrashhandler</option>
+        </term>
+        <listitem>
+          <para>Disable crash handler, to get core dumps.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--style <replaceable>style</replaceable></option>
+        </term>
+        <listitem>
+          <para>Sets the application GUI style.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--waitforwm</option>
+        </term>
+        <listitem>
+          <para>Waits for a WM_NET compatible windowmanager.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+  <refsect1>
+    <title>AUTHOR</title>
+
+    <para>This manual page was written by &dhusername;
+      &lt;&dhemail;&gt; for the &debian; system (but may be used by
+      others).  Permission is granted to copy, distribute and/or
+      modify this document under the terms of the &gnu; General Public
+      License, Version 2 or any later version published by the Free
+      Software Foundation.
+    </para>
+
+    <para>On Debian systems, the complete text of the GNU General
+      Public License can be found in /usr/share/common-licenses/GPL.
+    </para>
+
+  </refsect1>
+</refentry>
+
+<!-- Keep this comment at the end of the file
+Local variables:
+mode: sgml
+sgml-omittag:t
+sgml-shorttag:t
+sgml-minimize-attributes:nil
+sgml-always-quote-attributes:t
+sgml-indent-step:2
+sgml-indent-data:t
+sgml-parent-document:nil
+sgml-default-dtd-file:nil
+sgml-exposed-tags:nil
+sgml-local-catalogs:nil
+sgml-local-ecat-files:nil
+End:
+-->
--- kdelibs-3.5.7.orig/debian/man/kded.sgml
+++ kdelibs-3.5.7/debian/man/kded.sgml
@@ -0,0 +1,386 @@
+<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
+
+<!-- Process this file with docbook-to-man to generate an nroff manual
+     page: `docbook-to-man manpage.sgml > manpage.1'.  You may view
+     the manual page with: `docbook-to-man manpage.sgml | nroff -man |
+     less'.  A typical entry in a Makefile or Makefile.am is:
+
+manpage.1: manpage.sgml
+	docbook-to-man $< > $@
+
+    
+	The docbook-to-man binary is found in the docbook-to-man package.
+	Please remember that if you create the nroff version in one of the
+	debian/rules file targets (such as build), you will need to include
+	docbook-to-man in your Build-Depends control field.
+
+  -->
+
+  <!-- Fill in your name for FIRSTNAME and SURNAME. -->
+  <!ENTITY dhfirstname "<firstname>Chris</firstname>">
+  <!ENTITY dhsurname   "<surname>Cheney</surname>">
+  <!-- Please adjust the date whenever revising the manpage. -->
+  <!ENTITY dhdate      "<date>November  6, 2002</date>">
+  <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
+       allowed: see man(7), man(1). -->
+  <!ENTITY dhsection   "<manvolnum>1</manvolnum>">
+  <!ENTITY dhemail     "<email>ccheney@debian.org</email>">
+  <!ENTITY dhusername  "Chris Cheney">
+  <!ENTITY dhucpackage "<refentrytitle>KDED</refentrytitle>">
+  <!ENTITY dhpackage   "kded">
+
+  <!ENTITY debian      "<productname>Debian</productname>">
+  <!ENTITY gnu         "<acronym>GNU</acronym>">
+]>
+
+<refentry>
+  <refentryinfo>
+    <address>
+      &dhemail;
+    </address>
+    <author>
+      &dhfirstname;
+      &dhsurname;
+    </author>
+    <copyright>
+      <year>2002</year>
+      <holder>&dhusername;</holder>
+    </copyright>
+    &dhdate;
+  </refentryinfo>
+  <refmeta>
+    &dhucpackage;
+
+    &dhsection;
+  </refmeta>
+  <refnamediv>
+    <refname>&dhpackage;</refname>
+
+    <refpurpose>triggers Sycoca database updates when needed</refpurpose>
+  </refnamediv>
+  <refsynopsisdiv>
+    <cmdsynopsis>
+      <command>&dhpackage;</command>
+
+      <arg><option><replaceable>Qt-options</replaceable></option></arg>
+      <arg><option><replaceable>KDE-options</replaceable></option></arg>
+      <arg><option>--check</option></arg>
+
+    </cmdsynopsis>
+  </refsynopsisdiv>
+  <refsect1>
+    <title>DESCRIPTION</title>
+
+    <para>This manual page documents briefly the
+      <command>&dhpackage;</command> command.</para>
+
+    <para><command>&dhpackage;</command> triggers Sycoca database updates when needed.</para>
+
+  </refsect1>
+  <refsect1>
+    <title>GENERIC OPTIONS</title>
+
+    <para>This program follows the usual GNU command line syntax,
+      with long options starting with two dashes (`-').  A summary of
+      options is included below.</para>
+
+    <variablelist>
+      <varlistentry>
+        <term><option>--author</option>
+        </term>
+        <listitem>
+          <para>Show author information.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--help</option>
+        </term>
+        <listitem>
+          <para>Show help about options.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--help-all</option>
+        </term>
+        <listitem>
+          <para>Show all options.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--help-kde</option>
+        </term>
+        <listitem>
+          <para>Show KDE specific options.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--help-qt</option>
+        </term>
+        <listitem>
+          <para>Show Qt specific options.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--license</option>
+        </term>
+        <listitem>
+          <para>Show license information.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>-v</option>, <option>--version</option>
+        </term>
+        <listitem>
+          <para>Show version information.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+  <refsect1>
+    <title>QT OPTIONS</title>
+
+    <variablelist>
+      <varlistentry>
+        <term><option>--bg</option>, <option>--background <replaceable>color</replaceable></option>
+        </term>
+        <listitem>
+          <para>Sets the default background color and an application palette (light and dark shades are calculated).</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--btn</option>, <option>--button <replaceable>color</replaceable></option>
+        </term>
+        <listitem>
+          <para>Sets the default button color.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--cmap</option>
+        </term>
+        <listitem>
+          <para>Causes the application to install a private color map on an 8-bit display.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--display <replaceable>displayname</replaceable></option>
+        </term>
+        <listitem>
+          <para>Use the X-server display 'displayname'.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--dograb</option>
+        </term>
+        <listitem>
+          <para>Running under a debugger can cause an implicit --nograb, use --dograb to override.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--fg</option>, <option>--foreground <replaceable>color</replaceable></option>
+        </term>
+        <listitem>
+          <para>Sets the default foreground color.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--fn</option>, <option>--font <replaceable>fontname</replaceable></option>
+        </term>
+        <listitem>
+          <para>Defines the application font.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--im <replaceable>XIMserver</replaceable></option>
+        </term>
+        <listitem>
+          <para>Set XIM server.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--inputstyle <replaceable>inputstyle</replaceable></option>
+        </term>
+        <listitem>
+          <para>Sets XIM (X Input Method) input style. Possible values are onthespot, overthespot, offthespot and root.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--name <replaceable>name</replaceable></option>
+        </term>
+        <listitem>
+          <para>Sets the application name.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--ncols <replaceable>count</replaceable></option>
+        </term>
+        <listitem>
+          <para>Limits the number of colors allocated in the color cube on an 8-bit display, if the application is using the QApplication::ManyColor color specification.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--nograb</option>
+        </term>
+        <listitem>
+          <para>Tells Qt to never grab the mouse or the keyboard.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--noxim</option>
+        </term>
+        <listitem>
+          <para>Disable XIM.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--reverse</option>
+        </term>
+        <listitem>
+          <para>Mirrors the whole layout of widgets.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--session <replaceable>sessionId</replaceable></option>
+        </term>
+        <listitem>
+          <para>Restore the application for the given 'sessionId'.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--sync</option>
+        </term>
+        <listitem>
+          <para>Switches to synchronous mode for debugging.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--title <replaceable>title</replaceable></option>
+        </term>
+        <listitem>
+          <para>Sets the application title (caption).</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--visual TrueColor</option>
+        </term>
+        <listitem>
+          <para>Forces the application to use a TrueColor visual on an 8-bit display.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+  <refsect1>
+    <title>KDE OPTIONS</title>
+
+    <variablelist>
+      <varlistentry>
+        <term><option>--caption <replaceable>caption</replaceable></option>
+        </term>
+        <listitem>
+          <para>Use 'caption' as name in the titlebar.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--config <replaceable>filename</replaceable></option>
+        </term>
+        <listitem>
+          <para>Use alternative configuration file.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--dcopserver <replaceable>server</replaceable></option>
+        </term>
+        <listitem>
+          <para>Use the DCOP Server specified by 'server'.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--geometry <replaceable>geometry</replaceable></option>
+        </term>
+        <listitem>
+          <para>Sets the client geometry of the main widget.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--icon <replaceable>icon</replaceable></option>
+        </term>
+        <listitem>
+          <para>Use 'icon' as the application icon.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--miniicon <replaceable>icon</replaceable></option>
+        </term>
+        <listitem>
+          <para>Use 'icon' as the icon in the titlebar.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--nocrashhandler</option>
+        </term>
+        <listitem>
+          <para>Disable crash handler, to get core dumps.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--style <replaceable>style</replaceable></option>
+        </term>
+        <listitem>
+          <para>Sets the application GUI style.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--waitforwm</option>
+        </term>
+        <listitem>
+          <para>Waits for a WM_NET compatible windowmanager.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+  <refsect1>
+    <title>APP OPTIONS</title>
+
+    <variablelist>
+      <varlistentry>
+        <term><option>--check</option>
+        </term>
+        <listitem>
+          <para>Check Sycoca database only once.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+  <refsect1>
+    <title>AUTHOR</title>
+
+    <para>This manual page was written by &dhusername;
+      &lt;&dhemail;&gt; for the &debian; system (but may be used by
+      others).  Permission is granted to copy, distribute and/or
+      modify this document under the terms of the &gnu; General Public
+      License, Version 2 or any later version published by the Free
+      Software Foundation.
+    </para>
+
+    <para>On Debian systems, the complete text of the GNU General
+      Public License can be found in /usr/share/common-licenses/GPL.
+    </para>
+
+  </refsect1>
+</refentry>
+
+<!-- Keep this comment at the end of the file
+Local variables:
+mode: sgml
+sgml-omittag:t
+sgml-shorttag:t
+sgml-minimize-attributes:nil
+sgml-always-quote-attributes:t
+sgml-indent-step:2
+sgml-indent-data:t
+sgml-parent-document:nil
+sgml-default-dtd-file:nil
+sgml-exposed-tags:nil
+sgml-local-catalogs:nil
+sgml-local-ecat-files:nil
+End:
+-->
--- kdelibs-3.5.7.orig/debian/man/cupsdoprint.1
+++ kdelibs-3.5.7/debian/man/cupsdoprint.1
@@ -0,0 +1,60 @@
+.TH CUPSDOPRINT 1 "Jun 2006" "K Desktop Environment" "printing tool"
+.SH NAME
+cupsdoprint
+\- KDE command line tool to print files via CUPS
+.SH SYNOPSIS
+.BR cupsdoprint \ [ \-H \ host[:port]]\ [ \-P \ dest]\ [ \-J \ name]\ [ \-o \ opt=value[,...]]
+.RS 12
+.RB [ \-U \ login[:password]]\ files...
+.RE
+.SH DESCRIPTION
+\fBcupsdoprint\fP is a command line tool to print files using the CUPS printing system.
+.sp 1
+\fBcupsdoprint\fP does not support printing from stdin.
+.sp 1
+You can use \fBlpoptions \-l \-p Printername\fP to discover the options a certain printer supports.
+.SH OPTIONS
+.TP
+.B \-?
+show help options
+.TP
+.BR \-H \ host:port
+cups host to print to
+.TP
+.BR \-J \ name
+print job name
+.br
+default: "KDE Print System"
+.TP
+.BR \-o \ opt=value
+options to use
+.TP
+.BR \-P \ dest
+printer to use
+.TP
+.BR \-U \ login:password
+login and password to use
+.SS
+.SH EXAMPLE
+cupsdoprint \-P HPLaserJet4L \-H localhost:631 \-U john
+.RS 12
+\-o Copies=10,PageSize=A4 /tmp/file.ps
+.RE
+.sp 1
+Prints 10 copies in format A4 of the file /tmp/file.ps as user john via localhost:631 on the printer HPLaserJet4L.
+.SH SEE ALSO
+.B www.linuxprinting.org
+Information about printing under UNIX
+.sp 1
+.BR lp (1),\  lpr (1),\  lpoptions (1)
+.SH AUTHORS
+.nf
+Michael Goffioul <kdeprint@swing.be>
+
+.br
+.fi
+Please use http://bugs.kde.org to report bugs, do not mail the author directly.
+.PP
+This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the \fBDebian\fP Project (but may be used by others). Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
+.PP
+On \fBDebian\fP systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
--- kdelibs-3.5.7.orig/debian/man/make_driver_db_lpr.1
+++ kdelibs-3.5.7/debian/man/make_driver_db_lpr.1
@@ -0,0 +1,39 @@
+.TH MAKE_DRIVER_DB_LPR 1 "Jun 2006" "K Desktop Environment" ""
+.SH NAME
+make_driver_db_lpr
+\- create a printer database from aps filter database and ifhp filter database.
+.SH SYNOPSIS
+.B make_driver_db_lpr
+.RI [ db_directory ]\ [ output_filename ]
+.SH DESCRIPTION
+\fBmake_driver_db_lpr\fP creates a printer database from aps filter database and ifhp filter database. These databases contain descriptions of printers.
+.sp 1
+\fBmake_driver_db_lpr\fP prints all printer descriptions found in the filter databases to stdout.
+The first line gives the number of all found printers. Every printer description block consists of the items FILE, MANUFACTURER, MODELNAME, MODEL and DESCRIPTION.
+The block is followed by the current block number.
+.sp 1
+If an output file is given \fBmake_driver_db_lpr\fP suppresses all numbers.
+.SH OPTIONS
+.SS Arguments:
+.TP
+.I db_directory
+directory with filter files
+.TP
+.I output_filename
+write printer database into this file
+.SH SEE ALSO
+.BR make_driver_db_cups (1),\  ifhp (8)
+.TP
+.B www.linuxprinting.org
+Information about printing under UNIX
+.SH AUTHORS
+.nf
+The KDE project
+
+.br
+.fi
+Please use http://bugs.kde.org to report bugs.
+.PP
+This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the \fBDebian\fP Project (but may be used by others). Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
+.PP
+On \fBDebian\fP systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
--- kdelibs-3.5.7.orig/debian/man/klauncher.1
+++ kdelibs-3.5.7/debian/man/klauncher.1
@@ -0,0 +1,27 @@
+.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
+.TH KLAUNCHER 1 "Jun 2006" "K Desktop Environment" "service activation daemon"
+.SH NAME
+klauncher
+\- daemon for service activation in KDE
+.SH DESCRIPTION
+!!! \fBklauncher\fP is started automatically by kdeinit. It is not supposed to be started manually. !!!
+.sp 1
+\fBklauncher\fP is a daemon responsible for service activation in KDE. It operates closely together with the kdeinit master process to start new processes. KDE applications communicate with \fBklauncher\fP via DCOP to start new applications or services.
+.sp 1
+The error message "KLauncher could not be reached via DCOP" either indicates a serious problem with the \fBdcopserver\fP or \fBklauncher\fP crashed.
+.sp 1
+Note: \fBklauncher\fP is not the "run command" dialog (Alt+F2)!
+.SH SEE ALSO
+.BR dcopserver (1),\  kdeinit (1)
+.SH AUTHORS
+.nf
+Waldo Bastian <bastian@kde.org>
+.br
+
+.br
+.fi
+Please use http://bugs.kde.org to report bugs, do not mail the author directly.
+.PP
+This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the \fBDebian\fP Project (but may be used by others). Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
+.PP
+On \fBDebian\fP systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
--- kdelibs-3.5.7.orig/debian/man/meinproc.sgml
+++ kdelibs-3.5.7/debian/man/meinproc.sgml
@@ -0,0 +1,427 @@
+<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
+
+<!-- Process this file with docbook-to-man to generate an nroff manual
+     page: `docbook-to-man manpage.sgml > manpage.1'.  You may view
+     the manual page with: `docbook-to-man manpage.sgml | nroff -man |
+     less'.  A typical entry in a Makefile or Makefile.am is:
+
+manpage.1: manpage.sgml
+	docbook-to-man $< > $@
+
+    
+	The docbook-to-man binary is found in the docbook-to-man package.
+	Please remember that if you create the nroff version in one of the
+	debian/rules file targets (such as build), you will need to include
+	docbook-to-man in your Build-Depends control field.
+
+  -->
+
+  <!-- Fill in your name for FIRSTNAME and SURNAME. -->
+  <!ENTITY dhfirstname "<firstname>Chris</firstname>">
+  <!ENTITY dhsurname   "<surname>Cheney</surname>">
+  <!-- Please adjust the date whenever revising the manpage. -->
+  <!ENTITY dhdate      "<date>November  6, 2002</date>">
+  <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
+       allowed: see man(7), man(1). -->
+  <!ENTITY dhsection   "<manvolnum>1</manvolnum>">
+  <!ENTITY dhemail     "<email>ccheney@debian.org</email>">
+  <!ENTITY dhusername  "Chris Cheney">
+  <!ENTITY dhucpackage "<refentrytitle>MEINPROC</refentrytitle>">
+  <!ENTITY dhpackage   "meinproc">
+
+  <!ENTITY debian      "<productname>Debian</productname>">
+  <!ENTITY gnu         "<acronym>GNU</acronym>">
+]>
+
+<refentry>
+  <refentryinfo>
+    <address>
+      &dhemail;
+    </address>
+    <author>
+      &dhfirstname;
+      &dhsurname;
+    </author>
+    <copyright>
+      <year>2002</year>
+      <holder>&dhusername;</holder>
+    </copyright>
+    &dhdate;
+  </refentryinfo>
+  <refmeta>
+    &dhucpackage;
+
+    &dhsection;
+  </refmeta>
+  <refnamediv>
+    <refname>&dhpackage;</refname>
+
+    <refpurpose>KDE Translator for XML</refpurpose>
+  </refnamediv>
+  <refsynopsisdiv>
+    <cmdsynopsis>
+      <command>&dhpackage;</command>
+
+      <arg><option><replaceable>Qt-options</replaceable></option></arg>
+      <arg><option><replaceable>KDE-options</replaceable></option></arg>
+      <arg><option>--cache <replaceable>file</replaceable></option></arg>
+      <arg><option>--check</option></arg>
+      <arg><option>--htdig</option></arg>
+      <arg><option>-o</option>, <option>--output <replaceable>file</replaceable></option></arg>
+      <arg><option>--stdout</option></arg>
+      <arg><option>--stylesheet <replaceable>xsl</replaceable></option></arg>
+      <arg><option><replaceable>xml</replaceable></option></arg>
+
+    </cmdsynopsis>
+  </refsynopsisdiv>
+  <refsect1>
+    <title>DESCRIPTION</title>
+
+    <para>This manual page documents briefly the
+      <command>&dhpackage;</command> command.</para>
+
+    <para><command>&dhpackage;</command> KDE Translator for XML</para>
+
+  </refsect1>
+  <refsect1>
+    <title>GENERIC OPTIONS</title>
+
+    <para>This program follows the usual GNU command line syntax,
+      with long options starting with two dashes (`-').  A summary of
+      options is included below.</para>
+
+    <variablelist>
+      <varlistentry>
+        <term><option>--author</option>
+        </term>
+        <listitem>
+          <para>Show author information.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--help</option>
+        </term>
+        <listitem>
+          <para>Show help about options.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--help-all</option>
+        </term>
+        <listitem>
+          <para>Show all options.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--help-kde</option>
+        </term>
+        <listitem>
+          <para>Show KDE specific options.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--help-qt</option>
+        </term>
+        <listitem>
+          <para>Show Qt specific options.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--license</option>
+        </term>
+        <listitem>
+          <para>Show license information.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>-v</option>, <option>--version</option>
+        </term>
+        <listitem>
+          <para>Show version information.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+  <refsect1>
+    <title>QT OPTIONS</title>
+
+    <variablelist>
+      <varlistentry>
+        <term><option>--bg</option>, <option>--background <replaceable>color</replaceable></option>
+        </term>
+        <listitem>
+          <para>Sets the default background color and an application palette (light and dark shades are calculated).</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--btn</option>, <option>--button <replaceable>color</replaceable></option>
+        </term>
+        <listitem>
+          <para>Sets the default button color.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--cmap</option>
+        </term>
+        <listitem>
+          <para>Causes the application to install a private color map on an 8-bit display.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--display <replaceable>displayname</replaceable></option>
+        </term>
+        <listitem>
+          <para>Use the X-server display 'displayname'.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--dograb</option>
+        </term>
+        <listitem>
+          <para>Running under a debugger can cause an implicit --nograb, use --dograb to override.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--fg</option>, <option>--foreground <replaceable>color</replaceable></option>
+        </term>
+        <listitem>
+          <para>Sets the default foreground color.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--fn</option>, <option>--font <replaceable>fontname</replaceable></option>
+        </term>
+        <listitem>
+          <para>Defines the application font.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--im <replaceable>XIMserver</replaceable></option>
+        </term>
+        <listitem>
+          <para>Set XIM server.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--inputstyle <replaceable>inputstyle</replaceable></option>
+        </term>
+        <listitem>
+          <para>Sets XIM (X Input Method) input style. Possible values are onthespot, overthespot, offthespot and root.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--name <replaceable>name</replaceable></option>
+        </term>
+        <listitem>
+          <para>Sets the application name.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--ncols <replaceable>count</replaceable></option>
+        </term>
+        <listitem>
+          <para>Limits the number of colors allocated in the color cube on an 8-bit display, if the application is using the QApplication::ManyColor color specification.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--nograb</option>
+        </term>
+        <listitem>
+          <para>Tells Qt to never grab the mouse or the keyboard.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--noxim</option>
+        </term>
+        <listitem>
+          <para>Disable XIM.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--reverse</option>
+        </term>
+        <listitem>
+          <para>Mirrors the whole layout of widgets.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--session <replaceable>sessionId</replaceable></option>
+        </term>
+        <listitem>
+          <para>Restore the application for the given 'sessionId'.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--sync</option>
+        </term>
+        <listitem>
+          <para>Switches to synchronous mode for debugging.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--title <replaceable>title</replaceable></option>
+        </term>
+        <listitem>
+          <para>Sets the application title (caption).</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--visual TrueColor</option>
+        </term>
+        <listitem>
+          <para>Forces the application to use a TrueColor visual on an 8-bit display.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+  <refsect1>
+    <title>KDE OPTIONS</title>
+
+    <variablelist>
+      <varlistentry>
+        <term><option>--caption <replaceable>caption</replaceable></option>
+        </term>
+        <listitem>
+          <para>Use 'caption' as name in the titlebar.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--config <replaceable>filename</replaceable></option>
+        </term>
+        <listitem>
+          <para>Use alternative configuration file.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--dcopserver <replaceable>server</replaceable></option>
+        </term>
+        <listitem>
+          <para>Use the DCOP Server specified by 'server'.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--geometry <replaceable>geometry</replaceable></option>
+        </term>
+        <listitem>
+          <para>Sets the client geometry of the main widget.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--icon <replaceable>icon</replaceable></option>
+        </term>
+        <listitem>
+          <para>Use 'icon' as the application icon.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--miniicon <replaceable>icon</replaceable></option>
+        </term>
+        <listitem>
+          <para>Use 'icon' as the icon in the titlebar.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--nocrashhandler</option>
+        </term>
+        <listitem>
+          <para>Disable crash handler, to get core dumps.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--style <replaceable>style</replaceable></option>
+        </term>
+        <listitem>
+          <para>Sets the application GUI style.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--waitforwm</option>
+        </term>
+        <listitem>
+          <para>Waits for a WM_NET compatible windowmanager.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+  <refsect1>
+    <title>APP OPTIONS</title>
+
+    <variablelist>
+      <varlistentry>
+        <term><option>--cache <replaceable>file</replaceable></option>
+        </term>
+        <listitem>
+          <para>Create a cache file for the document.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--check</option>
+        </term>
+        <listitem>
+          <para>Check the document for validity.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--htdig</option>
+        </term>
+        <listitem>
+          <para>Create a ht://dig compatible index.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>-o</option>, <option>--output <replaceable>file</replaceable></option>
+        </term>
+        <listitem>
+          <para>Output whole document to file.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--stdout</option>
+        </term>
+        <listitem>
+          <para>Output whole document to stdout.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--stylesheet <replaceable>xsl</replaceable></option>
+        </term>
+        <listitem>
+          <para>Stylesheet to use.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+  <refsect1>
+    <title>AUTHOR</title>
+
+    <para>This manual page was written by &dhusername;
+      &lt;&dhemail;&gt; for the &debian; system (but may be used by
+      others).  Permission is granted to copy, distribute and/or
+      modify this document under the terms of the &gnu; General Public
+      License, Version 2 or any later version published by the Free
+      Software Foundation.
+    </para>
+
+    <para>On Debian systems, the complete text of the GNU General
+      Public License can be found in /usr/share/common-licenses/GPL.
+    </para>
+
+  </refsect1>
+</refentry>
+
+<!-- Keep this comment at the end of the file
+Local variables:
+mode: sgml
+sgml-omittag:t
+sgml-shorttag:t
+sgml-minimize-attributes:nil
+sgml-always-quote-attributes:t
+sgml-indent-step:2
+sgml-indent-data:t
+sgml-parent-document:nil
+sgml-default-dtd-file:nil
+sgml-exposed-tags:nil
+sgml-local-catalogs:nil
+sgml-local-ecat-files:nil
+End:
+-->
--- kdelibs-3.5.7.orig/debian/cdbs/versions.pl
+++ kdelibs-3.5.7/debian/cdbs/versions.pl
@@ -0,0 +1,19 @@
+#!/usr/bin/env perl
+
+use strict;
+use warnings;
+
+my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
+my ($version3, $version3_next);
+my ($version2, $version2_next);
+
+($version3 = $version)  =~ s/-[^-]+$//;
+($version2 = $version3) =~ s/\.[^.]+$//;
+
+($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
+($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
+
+print "KDE-Version3=$version3\n";
+print "KDE-Version2=$version2\n";
+print "KDE-Next-Version3=$version3_next\n";
+print "KDE-Next-Version2=$version2_next\n";
--- kdelibs-3.5.7.orig/debian/cdbs/debian-qt-kde.mk
+++ kdelibs-3.5.7/debian/cdbs/debian-qt-kde.mk
@@ -0,0 +1,108 @@
+ifndef _cdbs_bootstrap
+_cdbs_scripts_path ?= /usr/lib/cdbs
+_cdbs_rules_path ?= /usr/share/cdbs/1/rules
+_cdbs_class_path ?= /usr/share/cdbs/1/class
+endif
+
+ifndef _cdbs_class_debian-qt-kde
+_cdbs_class_debian-qt-kde := 1
+
+# Note: This _must_ be included before autotools.mk, or it won't work.
+common-configure-arch common-configure-indep:: debian/stamp-cvs-make
+debian/stamp-cvs-make:
+	if test -n "$(DEB_KDE_CVS_MAKE)" -a ! -f configure; then \
+		$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist; \
+	fi
+	touch debian/stamp-cvs-make
+
+include debian/cdbs/kde.mk
+
+DEB_PATCHDIRS := debian/patches/common debian/patches
+
+DEB_KDE_ENABLE_FINAL := yes
+DEB_INSTALL_DOCS_ALL :=
+
+DEB_DH_MAKESHLIBS_ARGS_ALL := -V
+DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
+
+ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
+    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
+        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
+    else
+        cdbs_kde_enable_final =
+    endif
+endif
+
+common-build-arch:: debian/stamp-man-pages
+debian/stamp-man-pages:
+	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
+	for f in $$(find debian/man -name '*.sgml'); do \
+		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
+	done
+	for f in $$(find debian/man -name '*.man'); do \
+		soelim -I debian/man $$f \
+		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
+	done
+	touch debian/stamp-man-pages
+
+common-binary-indep::
+	( set -e; \
+	tmpf=`mktemp debian/versions.XXXXXX`; \
+	perl debian/cdbs/versions.pl >$$tmpf; \
+	for p in $(DEB_INDEP_PACKAGES); do \
+	    cat $$tmpf >>debian/$$p.substvars; \
+	done; \
+	rm -f $$tmpf )
+
+common-binary-arch::
+	( set -e; \
+	tmpf=`mktemp debian/versions.XXXXXX`; \
+	perl debian/cdbs/versions.pl >$$tmpf; \
+	for p in $(DEB_ARCH_PACKAGES); do \
+	    cat $$tmpf >>debian/$$p.substvars; \
+	done; \
+	rm -f $$tmpf )
+
+clean::
+	rm -rf debian/man/out
+	-rmdir debian/man
+	rm -f debian/stamp-man-pages
+	rm -rf debian/shlibs-check
+
+$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
+	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
+	if test -e debian/$(cdbs_curpkg).lintian; then \
+		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
+			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
+	fi
+	if test -e debian/$(cdbs_curpkg).presubj; then \
+		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
+			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
+	fi
+
+binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
+	set -e; \
+	for doc in `cd $(DEB_DESTDIR)/usr/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
+		echo Building $$pkg HTML docs...; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/usr/share/doc/kde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/usr/share/doc/kde/HTML/en/$$pkg; \
+		meinproc $(DEB_DESTDIR)/usr/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+	done
+	for pkg in $(DOC_HTML_PRUNE) ; do \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/usr/share/doc/kde/HTML/en/$$pkg; \
+	done
+
+clean::
+	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
+		cd $(DEB_SRCDIR); \
+		find . -name Makefile.in -print | \
+			xargs --no-run-if-empty rm -f; \
+		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
+			configure configure.files configure.in stamp-h.in \
+			subdirs; \
+	fi
+	rm -f debian/stamp-cvs-make
+
+endif
--- kdelibs-3.5.7.orig/debian/cdbs/kde.mk
+++ kdelibs-3.5.7/debian/cdbs/kde.mk
@@ -0,0 +1,98 @@
+# -*- mode: makefile; coding: utf-8 -*-
+# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
+# Description: A class for KDE packages; sets KDE environment variables, etc
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2, or (at
+# your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+# 02111-1307 USA.
+
+_cdbs_scripts_path ?= /usr/lib/cdbs
+_cdbs_rules_path ?= /usr/share/cdbs/1/rules
+_cdbs_class_path ?= /usr/share/cdbs/1/class
+
+ifndef _cdbs_class_kde
+_cdbs_class_kde := 1
+
+# for dh_iconcache
+CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
+
+include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
+
+ifdef _cdbs_tarball_dir
+DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
+else
+DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
+endif
+
+include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
+
+export kde_cgidir  = \$${libdir}/cgi-bin
+export kde_confdir = \$${sysconfdir}/kde3
+export kde_htmldir = \$${datadir}/doc/kde/HTML
+
+ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
+endif
+
+ifneq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+	cdbs_kde_enable_final =
+	cdbs_kde_enable_debug = --enable-debug=yes
+else
+	cdbs_kde_enable_debug = --disable-debug
+endif
+
+ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
+	cdbs_kde_enable_debug = --enable-debug=full
+endif
+
+cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
+
+DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+
+$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
+	if test -x /usr/bin/dh_iconcache; then dh_iconcache -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
+
+cleanbuilddir::
+	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
+
+common-build-arch common-build-indep:: debian/stamp-kde-apidox
+debian/stamp-kde-apidox:
+	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
+	touch $@
+
+common-install-arch common-install-indep:: common-install-kde-apidox
+common-install-kde-apidox::
+	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
+
+clean::
+	rm -f debian/stamp-kde-apidox
+	rm -rf po/*.pot
+	# clean up edited .desktop etc files
+	if [ -f /usr/lib/kubuntu-desktop-i18n/createdesktop.pl ]; then \
+	  sh /usr/lib/kubuntu-desktop-i18n/findfiles LIST; \
+	  for file in `cat LIST`; do \
+	     sed -i '/X-Ubuntu-Gettext-Domain=/d' $${file}; \
+	  done; \
+	  rm -f LIST; \
+	fi
+
+# This is a convenience target for calling manually.  It's not part of
+# the build process.
+buildprep: clean apply-patches
+	$(MAKE) -f admin/Makefile.common dist
+	debian/rules clean
+
+endif
--- kdelibs-3.5.7.orig/debian/kubuntu-desktop-i18n/findfiles
+++ kdelibs-3.5.7/debian/kubuntu-desktop-i18n/findfiles
@@ -0,0 +1,44 @@
+#! /usr/bin/env bash
+
+filelist=$1
+
+rm -f "$filelist"_* $filelist
+
+touch $filelist
+
+dir=.
+
+find $dir -name "*.directory" -print | grep -v debian >> $filelist
+find $dir -name "*.kdelnk" -print | grep -v debian >> $filelist
+find $dir -name "*.desktop" -print | grep -v debian >> $filelist
+find $dir -name "*.kimap" -print | grep -v debian >> $filelist
+find $dir -name "*.themerc" -print | grep -v debian >> $filelist
+find $dir -name "*.kcsrc" -print | grep -v debian >> $filelist
+find $dir -name "*.setdlg" -print | grep -v debian >> $filelist
+find $dir -name "index.theme" -print | grep -v debian >> $filelist
+find $dir -name "eventsrc" -print | grep -v debian >> $filelist
+find $dir -name "*.protocol" -print | grep -v debian >> $filelist
+
+### TEMPORARY START: we do not have KDE modules
+if true; then
+find ./konqueror -name .svn -prune , -name "directory.*" -type f  2>/dev/null | grep -v debian >> $filelist
+find ./kdesktop -name .svn -prune , -name "directory.*" -type f 2>/dev/null | grep -v debian >> $filelist 
+find ./drkonqi -name "*rc" -print 2>/dev/null | grep -v debian >> $filelist
+find ./kimgio -name \*.kimgio -print 2>/dev/null | grep -v debian >> $filelist
+find ./noatun -name \*.plugin -print 2>/dev/null | grep -v debian >> $filelist
+find ./noatun-plugins -name \*.plugin -print 2>/dev/null | grep -v debian >> $filelist
+for file in `cat ./kolf/courses.list 2>/dev/null`; do
+	cat ./kolf/$file 2>/dev/null | grep -v debian >> $filelist
+done
+find ./amor/data -name \*rc -print 2>/dev/null | grep -v debian >> $filelist
+find ./kdeprint -name \*.print -print 2>/dev/null | grep -v debian >> $filelist 
+find . -name \*.kksrc -print 2>/dev/null | grep -v debian >> $filelist
+find ./kopete -name \*.plugin -print 2>/dev/null | grep -v debian >> $filelist
+find . -name \*.kdevtemplate -print 2>/dev/null | grep -v debian >> $filelist
+fi
+### TEMPORARY END: we do not have KDE modules
+
+# Extract .directory files in template directories of KOffice
+find . -name .directory|fgrep templates >> $filelist
+
+sort -o $filelist -u $filelist
--- kdelibs-3.5.7.orig/debian/kubuntu-desktop-i18n/createdesktop.pl
+++ kdelibs-3.5.7/debian/kubuntu-desktop-i18n/createdesktop.pl
@@ -0,0 +1,98 @@
+#! /usr/bin/env perl
+
+use strict;
+use warnings;
+
+use Getopt::Long;
+
+sub printdate
+{
+    printf ( "%04i", ( $_[5] + 1900 ) );
+    print "-";
+    printf ( "%02i", $_[4] + 1);
+    print "-";
+    printf ( "%02i", $_[3] );
+    print " ";
+    printf ( "%02i", $_[2] );
+    print ":";
+    printf ( "%02i", $_[1] );
+    print "+0000";
+}
+
+sub prepare
+{
+    #warn "Running on Perl V5.8.x" if $^V ge v5.8.0;
+
+    binmode( STDOUT, ":utf8" ) if $^V ge v5.8.0;
+
+    my @now = gmtime();
+    print "#, fuzzy\n";
+    print "msgid \"\"\n";
+    print "msgstr \"\"\n";
+    print "\"Project-Id-Version: desktop files\\n\"\n";
+    print "\"Report-Msgid-Bugs-To: http://bugs.kde.org\\n\"\n";
+    print "\"POT-Creation-Date: "; printdate( @now ); print "\\n\"\n";
+    print "\"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\\n\"\n";
+    print "\"Last-Translator: FULL NAME <EMAIL\@ADDRESS>\\n\"\n";
+    print "\"Language-Team: LANGUAGE <kde-i18n-doc\@kde.org>\\n\"\n";
+    print "\"MIME-Version: 1.0\\n\"\n";
+    print "\"Content-Type: text/plain; charset=UTF-8\\n\"\n";
+    print "\"Content-Transfer-Encoding: 8bit\\n\"\n";
+    print "\n\n";
+}
+
+sub processfiles
+{
+    my ( $files, $basedir) = ( @_ );
+    for my $filename ( @$files )
+    {
+        chomp( $filename );
+        open( FH, "<", $filename ) or warn "Cannot open file $filename";
+        binmode( FH, ":utf8" ) if $^V ge v5.8.0;
+    
+        #warn("Using $filename");
+        
+        #my $regexp = qr{^(Name|Comment|Language|Keywords|About|Description|GenericName)=};
+        my $regexp = qr{^(Name|Comment|Language|Keywords|About|Description|GenericName|Query|ExtraNames|X-KDE-Submenu)=};
+    
+        while( <FH> )
+        {
+            if ( m/$regexp/o )
+            {
+                my $msgid = $_;
+                chomp( $msgid );
+                $msgid =~ s/\\/\\\\/g;
+                $msgid =~ s/\"/\\\"/g;
+		if ($msgid =~ m/ +$/) {
+                   $msgid =~ s/ +$//; # remove trailing spaces
+		   print STDERR "ERROR: white space at the end of $msgid in $filename\n";
+		}
+                if ($msgid =~ m/\r+$/) {
+                   $msgid =~ s/\r+$//; # remove trailing CR (Carriage Return)
+		   print STDERR "ERROR: CR at the end of $msgid in $filename\n";
+		}
+		$filename =~ s,^$basedir/,,;
+                print "#: $filename:$.\n";
+                print "msgid \"$msgid\"\n";
+                print "msgstr \"\"\n";
+                print "\n";
+            }
+        }
+    
+        close( FH );
+    }
+}
+
+my $onefilelist;
+my $basedir;
+GetOptions ( "file-list=s" => \$onefilelist,
+	     "base-dir=s" => \$basedir
+	   );
+
+prepare;
+
+open( FILELIST, $onefilelist ) or warn ( "Cannot open file list: $onefilelist" );
+my @thislist = <FILELIST>;
+processfiles( \@thislist, $basedir );
+close( FILELIST );
+
--- kdelibs-3.5.7.orig/debian/kubuntu-desktop-i18n/msgsplit
+++ kdelibs-3.5.7/debian/kubuntu-desktop-i18n/msgsplit
@@ -0,0 +1,168 @@
+#! /usr/bin/env python
+
+import sys, string, codecs, os
+
+# TODO: currently the 78 chars are *without* the quotes, while for Gettext it is *with* the quotes
+# FIXME: it seems possible to get lines bigger than 80 characters.
+max_length = 78
+
+wrap_before = ['<h1>', '<h2>', '<h3>', '<h4>', '<h5>', '<h6>', '<p>', '<br>', '<br/>', 
+	       '<ol>', '<ul>', '<li>', '<table>', '<th>', '<tr>', '<td>', '<center>', 
+	       '<blockquote>', '<pre>', '<hr>', '<hr/>']
+
+### TODO: try to support any charset, not only UTF-8 (so that it can be used outside KDE)
+
+def splitit( start, message, outfile ):
+	# print start+"\""+message+"\"" # DEBUG
+	if len(start):
+		if len(message) + len(start) < max_length and \
+			   string.find(message, '\\n') == -1:
+			outstr = '%s"%s"\n' % (start, message)
+			outfile.write(outstr.encode('utf-8'))
+			return
+		outfile.write(start)
+		outfile.write(u'""\n')
+		index = 0
+		mlen = len(message)
+		last_brace = 0
+		last_space = 0
+		last_comma = 0
+		while index < mlen:
+			if message[index] == r'n' and (index > 0 and message[index-1] == '\\') \
+			   and (index < 2 or message[index-2] != '\\'):
+				outstr = '"%s"\n' % message[:index+1]
+				outfile.write(outstr.encode('utf-8'))
+				message = message[index+1:]
+				mlen -= index + 1
+				index = 0
+				last_brace = 0
+				last_space = 0
+				last_comma = 0
+				continue
+			elif message[index] == u'>':
+				last_brace = index
+			elif message[index] == u' ':
+				last_space = index
+			elif message[index] == u',':
+				last_comma = index
+			elif message[index] == u'<':
+				for s in wrap_before:
+					if index > 0 and message[index:].startswith(s):
+						outstr = '"%s"\n' % message[:index]
+						outfile.write(outstr.encode('utf-8'))
+						message = message[index:]
+						mlen -= index
+						index = 0
+						last_brace = 0
+						last_space = 0
+						last_comma = 0
+						continue
+			if index > max_length:
+				if last_brace > 50:
+					index = last_brace
+					while index < mlen - 1 and message[index+1] == ' ':
+						index += 1
+				elif last_space != 0:
+					index = last_space
+				elif last_comma != 0:
+					index = last_comma
+				else:
+					while index > 0 and message[index] == u'\\':
+						index = index - 1
+				outstr = '"%s"\n' % message[:index+1]
+				outfile.write(outstr.encode('utf-8'))
+				message = message[index+1:]
+				mlen -= index + 1
+				index = 0
+				last_brace = 0
+				last_space = 0
+				last_comma = 0
+				continue
+			index += 1
+		if len(message):
+			outstr = '"%s"\n' % message
+			outfile.write(outstr.encode('utf-8'))
+
+if sys.hexversion >= 0x02030000:
+	# We have Python 2.3 or better
+	open_type="rU" # Open for read with "Universal Newline Support"
+else:
+	# We have a Python older than 2.3
+	open_type="r" # Normal open for read
+### TODO: even in the case of a parse error, the script could try to process the next file(s) instead of exiting.
+for file in sys.argv[1:]:
+	orig_file = open(file, open_type)
+	new_file = open(file + ".new", 'w')
+	
+	last=''
+	start=''
+	index=0
+	line=' '
+	while 1: # python 2.1 has no True ;)
+		line = orig_file.readline()
+		index += 1
+		if not line:
+			break
+		if line == '\n' or line[0] == '#':
+			splitit(start, last, new_file)
+			start = ''
+			last = ''
+			new_file.write(line)
+			continue
+		try:
+			line = string.strip(unicode(line, 'utf-8'))
+		except UnicodeError:
+			print file
+		if line[0] == '"' and line[-1:] == '"':
+			last += line[1:-1]
+			continue
+		# new message
+		splitit(start, last, new_file)
+		if line.startswith("msgid "):
+			start = "msgid "
+			last = string.lstrip(line[6:-1])[1:]
+		elif line.startswith("msgstr "):
+			start = "msgstr "
+			last = string.lstrip(line[7:-1])[1:]
+		elif line.startswith("msgctxt "):
+			start = "msgctxt "
+			last = string.lstrip(line[8:-1])[1:]
+		elif line.startswith("msgid_plural "):
+			start = "msgid_plural "
+			last = string.lstrip(line[13:-1])[1:]
+		elif line.startswith("msgstr["):
+			# For most languages, there will be only one digit
+			if line[8] == "]" and line[9] == " ":
+				if line[7].isdigit():
+					start = line[:10]
+					last = string.lstrip(line[10:-1])[1:]
+				else:
+					print file, "not-a-digit error for mgstr[] in line", index
+					orig_file.close()
+					new_file.close()
+					sys.exit(1)
+			else:
+				posdigit = 7 # The first digit is at position 7
+				while line[posdigit].isdigit():
+					posdigit += 1
+				if posdigit > 7 and line[posdigit] == "]" and line[posdigit+1] == " ":
+					posdigit += 2 # skip ] and the space
+					start = line[:posdigit]
+					last = string.lstrip(line[posdigit:-1])[1:]
+				else:
+					print file, "parse error after msgstr[ in line", index
+					orig_file.close()
+					new_file.close()
+					sys.exit(1)
+		else:
+			print file, "parsing error in line", index
+			orig_file.close()
+			new_file.close()
+			sys.exit(1)
+
+	splitit(start, last, new_file)
+	orig_file.close()
+	new_file.close()
+	os.rename(file + ".new", file)
+
+# kate:  space-indent off; indent-width 8; replace-tabs off;
--- kdelibs-3.5.7.orig/debian/system-icons/cr128-device-system.png.uu
+++ kdelibs-3.5.7/debian/system-icons/cr128-device-system.png.uu
@@ -0,0 +1,299 @@
+begin 644 cr128-device-system.png
+MB5!.1PT*&@H````-24A$4@```(````"`"`8```##/F'+````!F)+1T0`_P#_
+M`/^@O:>3````"7!(67,```L3```+$P$`FIP8````!W1)344'U0<$#`P#C\.+
+MJ0``(`!)1$%4>-KM?7F,'-=YY^_5U?<Q/=USG^1P.#PD4A)%K459BFQI)4M<
+MV8:0E1T+\=K>&(F!+(+U'QL@L`$C?P7(8F$#:\/&;E;!)K9C;V)I5[)I^8@E
+MF9%,B>*(QY`B.<.9X8RFY^Z[N\ZW?W15]>OJJNZ>&5)V['F#0O5T=5=7O>_W
+MW=_["M@=NV-W[([=L3MVQ^[8';MC=^R.W;$[=L?NV!V[8W?LCMWQ6S[([A3L
+M;'SYRU\>+!:+>S5-Z],TS?<;051"-$$0UCB.NU&I5&:^_O6OJP#H+@!NX?CJ
+M5[_JNW[]^F.Y7.[IOKZ^?=%HM(?G>9'2QGFFE+ZO\TPIU<KE\N;,S,P"QW$O
+MYW*Y[SW__//K``QSLX>P2\KMC7????>CY7+YBQ,3$W<?/WY<V+=O'_Q^/]P`
+M\#YS/Q1%P>+BXO!;;[UU=')R\FY"2&\RF?S:VMI:%H!B@H#N`F";XTM?^M*>
+MV=G9SQ\Y<N2N9YYY1NCKZP/'<;]1U]C?WX^)B0E$(I&^EUYZZ8_&QL8NKZVM
+M_3.`#(`*`!T`W07`-D:A4#B12J4.G#AQ0AP8&/B-O<YH-(H''WP0UZY=Z\SG
+M\Q\#,&.J_743!)3;)>?6AZJJAX>&AL('#ASXC;_6X>%A3$Q,D%`H=`>`$0!=
+M`((`N%T5L$TU:QA&+!J-"K%8K.[`SW_^<[SXXHM865FY;?J]V8C'X_C0ASZ$
+MIYYZ"CS/V^\GDTD(@A`QB;\.8`U``8"^"X!M#,,P.*?._^YWOXLK5Z[@3__T
+M3Y%,)F$8QJVV[)M=#RBEV-C8P*E3I_"W?_NW>/;99R%)$@"`XS@00C@`80!1
+M4P+P`,@N`+9'C`96?.&%%_"=[WSGUWI=G9V=&!D9P5_^Y5]B=G86X^/C-GC,
+M:Y8`^`&()@!V5<!V!L_S=>+XTJ5+N....^S_-4V#+,N>7.LF'5J)]U:JP>?S
+M011%B**(/7OV8'EYV0:`*0%@ZGW>(OXN`&[1*!:+Z.SLM(F[M+2$@8&!+1-Z
+M.S$$0@@T34.Q6$0X'(8@"(C'X]`TK>Z\YN\2QX9=+V`;0U&4.B.+YWF(HF@#
+M8'-S$X20+7&UI<?9S0LD[#%""'B>QXT;-S`_/V\?8W_;*;'8T50"?.4K7R'E
+M<IFCE`I>8"D4"K]3X>1*I0)9EGF.X^S[]OO]ML%%",':VAHT30,AI(%8NJZW
+M9>%32F$81MW[',>!XS@8A@'#,*#K.G1=Q_7KUW'V[%D<.W8,NJZ#X[@Z@#8;
+M@AO12Z625"Z7.Q86%B*R+`^+HKB/4AJA=#=N0"DEY7+Y\-6K5X4?_>A'$$41
+M-V[<P.KJ*J:GI]'=W8U8+(;O?>][H)1"556;F$ZN9HGK)+;U755542Z742J5
+M4"@44"@44*E4;`E#"$$D$L&CCSZ*@8$!:)IF`X4%3EL2X,___,^YA86%'EF6
+M?T\4Q<\30NZ,Q6(=75U="`0"O]8X]T[<*NOFMVM\N7&QHBAX[;778!@&>)Z'
+MJJKX\I>_C$*A@(F)"3S^^.-XZ*&';$*XB74+&,[?L<#`JA&+J&[7JVF:)9F@
+M*`H`V"JIU3T*#/'Y3"9S6-?U+Z12J6=/G#@1/'KT*%*I%/Q^/P3A7[^]R'(9
+M._%.[FM&%+?C%B%E6<;&Q@8N7KR([W__^_CE+W^)IYYZ"J.CHU!5M>EO>AF!
+M;E+##<B6H<=Q'%15A<_GJY,`30'PF<]\AFQN;H[(LOQ?CQPY\N'''W\<(R,C
+M\/O]OU7BFYT(IQ%W*X:F:8A$(NCL[,38V!A>?OEE//?<<_C,9SZ#\?%QR++L
+M"4@O2><&"C<06/9&J51"+I=#,IFL.X<7""RV#N7S^3_:OW__AY]YYAGT]O;^
+M-NCJ]_6\A!`(@@!!$,!Q'`1!P,F3)_&3G_P$SS__/!Y]]%%02CV-0+?SN@&D
+MV7<YCD,FD\'8V!CZ^OK:-P(YCKLK&HW^R5-//87N[N[?>>)OY_N6*B"$0)(D
+M$$*02J5P[-@Q?/>[W\6WOO4M'#QX$)5*I>[\6_VM9H`P#`."(."99YYI\!Z:
+M`H`0<O+@P8/1\?'QW[B\]OM%O%OU6Q8(>)Y',!C$R,@(CAT[AM7557SQBU]T
+M_5Z[O^]E"%LJ(9O-XI577L$++[R`SWWN<^CHZ&@)',X\>-_8V!B"P>#O#/%;
+M!5R\/MOJ>ZQ^]OE\\/O]B$:C4%45I5+)_@R[619^J\U2,<[-"D0EDTD\_?33
+M4!0%,S,S;:L``N#.D9&1?_6B?RN1MYW$WIM%\JR]I>LYCD,L%@,A!#=OWL3^
+M_?OK.-G+JM_.?5O2>WAX&)E,!KJN@^?YEG$`0@CIL&+9;N.;W_H;5"K%W1AP
+M&^-3?_!)**J&KE32]L<MFR"?S[N*\JV"P"N@9-D`/I^O;6DHM.,*46J`"$%0
+M+E#WONCSH7=@&)S`@9`JR@C'@>,LT49`"`?.?)_8^UITBB,<"%?=@R/F9\WO
+M$U([KQ44L9!,8)8U,F+9J+TVJ!E;-ZK73PWS/8/"0'5??8\"A@&#4E!K3PT8
+MAN7?,\=I[7/E0A'KRTL-<R7Y`A`$'89AV/=HS:U%%"]/8"L>AS.8I.LZ**4(
+M!H,-'-]6(*BEB"$\*%,^(`@B>H8&(0ABE>AUQ'?LV>,,&&P0F)^U@%`'``LX
+M!``A(""U8G;:1$<;!HHE!5__7^]@?$\$'WED+ZA!\8,?7<6A_4GL&8S4$YW=
+M&RP(JGO./,X9!@R.(A2-PJ`4&ZMKC885S]4%B*PYM#)T3@`TXU8W8K-`<MZW
+M*(KVW+:C\@36*&D60"%&/:*Z!_K`<T*-$,2Z2(`0"DI);4\I**GM85K*58L9
+MH)0`A()0@(+:A#4`D+JP:/6X=:FF`#`GA(*:KRUBBB*'V<42WENM8&0HBOG%
+M`EX]LP%9`48'(P"EYCF8/:W=!PNRNM?F/A2)0E54Y+-9!^NZAWDM3F53M4X5
+M8+UF0<'^S^[=,G^ZKC<`H&4NP`TQS@MD3Q#O3$`01'/234*C2F`0X@T"F,2O
+MNQ%KQJQYI>YK6"P068`!;*([I<#K9Q8P,AR%H1L0>`)%!;[Y]]<!4!#"860P
+M6)O`!N)3&U#NQ^KWD5@<Y5()FJJZ1N98(JFJ"D51&L+"+!'=LH"MPL:6ZVEE
+M"3F.@RB*;1N!#6G+9F)(\OD0BD3KB4^=W(WZ8\2<,(O+"0L$4YD;@,$!G/7"
+M+ENP"%^3''4(<7#Q[/PFOOW\#"@H!`'0#`[A(`])`+(%#;H!O'-Q';F<C(V,
+MC"<_-&B*[$8"4Q8$<`<!X8!X9R?6TFE&`%!7H\XP#&B:9DL`+V.PG1R!V_M6
+MJCB?SV-H:*C!]MBV!.!,PPT4"$6C)H$;N9PE*C$!4ILP4D>LF@AG+LZFO0'"
+M_E&`$@H"`DJ\$R:44@SU1_'D(_WXT3\O0M,)1OO\^,-_/XYP6,+T;`;_\[O7
+M\.YL!>_.5L!Q%(?VY;%G.%HO$6B-Z^O>\P"!*(J0?#XH3*R?Y4I""/Q^/\+A
+M,"*1"`*!@&="9[LA8NN]N;DY5"H5]/3TU+F'.Y(`-37`(>`/N!"_GKNKT@!U
+MT@"P=+P3``;J:DT,N')_37*XL4+-=J"4XL,?',*-N1PN72_@GB.="(<D4(-B
+M=#"*._9%\?;E//8-^?"1#P\@U1&H>@D,UU.'5*G^[P$"\U[\@8`-`%;T6XF8
+ME945//?<<_BG?_HG.V6[E>QE*U!P'`>?SX?^_GZ</'D2/3T]4!3%=D%W9`-4
+MCU'X_0&`(RX<4:_CJX=(W635&U;4IC57M?2JYV7*U:HVA:GS"86N4ER:SF(Y
+M8V`E2[&>,Z`;EGX%0CZ">`@X,L+A])GW,#5=`$"@J/6E5L5R5?SV=0>02@1L
+MUQ%LA*_A-;S?,PGB"P2`3*;."&2)%8O%,#X^;N<#MA,&]LH<6N^GTVF<.G4*
+M_?W]&!P<K)-$.W8#"0%X03"-L2J!/:6`263"&GDL``QJ,[W-\$:5D.P&0K&6
+MD?&+<R5<N@F4C";IZ0*`=2"_<A,7KA9@Z#H(Q^''KZ8AB4`B*N'2]0S>G2T#
+M`%Y]<Q.:;N#?/CC@B"&P!J4[]U.G@>@PE"FH78?'<567T._WX^Z[[\:A0X=N
+M:R#JB2>>P%>^\A5,3$Q@?'R\)<#:<@-M`)C^+6P=#W<=7R<)7`#`&GI<,XN?
+M("!QN+)(43(";4V`'@CC0P\$D>SPX=KU-9R[7,#_^=&2[:L28N#H@1C2JV4L
+MKU:\X_PVX=TE`G5YC^>K_%2I5+"YL0[#,"!)D@T"I_MW.T8X',;8V!B6EY<Q
+M.CIJ5P;M/`Y`S&@3P.CX>B`0AROG!(!A`#5-8_*^4<_V.@5NS.6Q;V\,E!+X
+M)!X/'R)X89*V%;^_MMF!:YM`*IU#2JA^/A'C8!@4F3S%^'`0'W]LB"&@&</W
+M`(+GQD@!RVTTC&J`Q]`-.[KJ5FET*U<-N47\DLDD2J62:YS`-1O8S$ID3Z"9
+M!8Y;VHS:)%NA5<,,P3JW<D7#]=D28O$4YA>*9E3.P/%#$0S%MI:+V-=+\5ZZ
+MB,X.'A^\OQ^//-`#GC-0*NGF]1AVB)@-(3=N#I4`ZN(A5),_%F&KP:KZ.(`E
+M!2P`;'>S*H'93=,TZ+H.U8Q%6/1T1B)W'`A2%+7.R"-P,_AJ$L"V[VUKS]O:
+M+\LZTFL423,II>D22F45`;\`2@@>N]N'O_FY`H.3V@+`F5D?#HWU(.;3<>IB
+M"$/1,AZ]/XFUG(8SE_*X9R+D&4)V`R]H<Y`X`T%N*6,K!-Q.+L"K[,OI9EK5
+MPU9\(1*)V-*'C2#N2`58QW1=LZ-+-A`(X]:Q%*]&=>I!X&+M`P2&`:17*3H[
+M$_9O1J-AI%?7,=S/`81@L-N'NP8R./M>>P#0B!_OK/AA&!HX3L!<-HB%30)-
+M"(-NZ-"U'(X=#+H3O@V54&<7@-K<Y[3NK<@<RV`6`+SFW*N"F,T%6%+'"OW6
+M:%2+_K&_W]((;)8-9%5$J5!`.!JM`<``P%$XU#U8$5#'["[6_L*2C,YD3\/O
+M^OT1K&_FD8C[0`%\^)X@+B]FP/,\NN-`V$^@ZH"L&B@KP'M9'RCO<UQ[U3"C
+M'`^-"U<GGN/QRC4_!E,5I!)B`W$-1V;16T68H5O=0*58<@U,L42V1+4%`">1
+M6>*R;I^5]'%;.^",X;CE%&YI+J!4*,`7"$"4)(;654K72WK+R&/"NIPC>@."
+MU345T5C2]7=]/@F;FQSBT>JY?#X>_^GC84@"#R?6`(K-G(*S[V9P<8%#WH@V
+MEQ!<`*?>+N,//L37YQ+JB&TT2@07,)2+!5!J>'*L-:Q%'N5RV;,NT*L,G,T5
+M>$D*:\V"KNMV34`K"<!M)QE4S.4\.<1PG43+X*IMAD&AZP9DS5>WB,$YXO$X
+M;BX6JV@V#`A<+>EAG\M,V<;"`AZ^.XP_><*/0ZE-4-I<UZ:5!%Z_4*H9@H;C
+M>FDK`['JVI5+)==L(%LHZBP!L\2T]=KZWWIM;98^=Y:'>962R;*,?#Z/>#QN
+MYP9:Y@):18R<[RNRC'*IB&`HQ,HO4[]SMKJWQ3SGT/IF*'EY744RU=6<2.DT
+M1@=]56+;ET$:<K2L`<IQP+_[0!")\UG\\D8$E'@#[/R"@.,'],:Z`L/%%G`8
+MB(:AHY#+N42FZ[G?\@`RF0Q65E;LVL#MY`&:20A-T["ZNHI0*(1D,FE+!*<-
+ML@,54/OQ?*::`Z\'@1W;K9?Y!FU0_`8%*)H7H:ZM;6"H3P0HA0$*4.*2I'</
+M-5,`'S@40-B?PP^G8B"<>]"S2#IP_GH:A_?X6[BS]4:BKAO(93/0'<:?&T-9
+MDB*3R>"]]]ZK"P6W*_K9<+";RK`^SW$<[KGG'H1"(6B:UGXDL-EP,R((`0K9
+M+$"!8#CDX=Y5Q0`EP"OG%0PF.>P;](,08&6U@F1OC^=ORK("OU@&@50MRW*F
+M@=TS0@V!J$.C?EQ:R&&^D/""-Z:61!P:-5S\?L-5!1B:CEPF`UU3FZ9I6?$;
+M"`0P.CJ*N^^^&^5RN:7'Q1:6.I-+K$'(_B^*(L+AL+T\C)5`.P)`L^.%7!:4
+M&@B$PN!XSN9[634@\!P$@</"4@7GU_J1JZQA;*"*D)5-!8(OB\YDA^MY,YEU
+M]'4)U9NP\L]P;VU*49]D<E;Y?/"`@>^\48'!N^<2EG-^R'(1HL"U#&QIFH9"
+M)@.]65B7-DH`01"02"00"`00"+07UO9*>=L!)\8M9(-%S;J3;!L`S3Y3S.<A
+M5RJ(QN,01!$&(?A_OP)DB+BK/XOY]>IRJ70^@,FK&<QO2KB1[<']\A(,2I%*
+M)1P!$P,"7P$U_-4,(Z'P$OX.1\"A#JH<G8J+V)_*X?*&1S+)%\;<<@9[^B17
+M/[\:O30@ETHH%?*@6R":Q:D6<=K]7KN;6V,)MW*QEF[@5E5`@UNEJMA86T4P
+M%$8H$D4R0G$EG\`K"QWV=Q4^@M<6JI&J,+>)H6X!@6`C-VQLYI&,BC;WD[HJ
+M,>+%_W4@<$J!X4X54^O>ANY:7L"HQV1JJH9"+ML0[?,6`(V^?+LKKK8::F_V
+MW;;3P3M1`<Y1+A:A*@KN&0UAYNPF%+$#26$-!WL59,L<WET-H4(B&.ZHP#`$
+M%`ME``3A4(T[J:[8^KA:;\@2OZD,<$D_5\^SI\^'^XM+X+GJ.0$KD44!0A$+
+M``85ZCA?US64"R73S=OZJB-GL6<KL>PD(!O,85^W`PKVMUH&@EJALYU^-W:^
+M0*.XFN:04RED$@*OYO#$L3)\D@`"BHBTB=<6PWAW(XY,I8#.X!H.#P<1#C$M
+M5ZD*PZ!5`I%&XK.74C^G'H6FYH?N&A-KN7WJJ/QA+'U555$IEB!7RCM::,H:
+M8<U<L7:,2*<_OQT@[+`@A#0]9FT;>1V7Y6K+-"(`,6,%<CX#ZO=#]/DPE`*,
+MV0J(%,!"44`FMX+#([2!EZOBTZ*I65)6*S5HT`#4PQMPEF_5$9QY;1@4JBI#
+M+I>KHI[6_/=VUQ!Z<3/+N>U\WLOR;X?P;J'EMD+!VP&`37BN!H#>A(!CQB3R
+MJA_O9GNQ3CJQ7MA$BE>AJ2K.+_C`2P$DD,;QL3(BT2@(YS#.",\$?JJBFDDZ
+M>KH!KB`P";VQ6<:_3!:8-"ZJT4BCFL8=[@;V#4KVA%F?J:)Q:^5;3B^@%?<W
+M(V@KT>_,&K+Y!FNIV(Z-P,88`/'<>)%@3Q]`B(;%"WD4Q`'\],8>]/@W4*$2
+M-O4DB)DK"/@X]`\,N_P>8P""S3HV<01IHTO(BO\KTR7,+CD-R5JP:KA'J0*9
+MDEH9F/7'M;<RV$T%L#J\5>;/370[I8?7=5B$US2M#A"M,H];]@+J",YY`^'"
+MG("\T`^H)8!P2!O5(D4?S<#0!:QSO9A>N@Y>7,3`4'_=[R42,2PO+B$6YLRE
+M8-9R,&*"HF8(V"N)C-IB#L,6[=4\`72*F9ME`#Y/(D2#I)'SG9O1/$SK]`)8
+MPK.Q?2_IZFPHY:86K,P@"S)55>MR`VP&L94AOR450.H6;G)-)8$D$@251=P_
+MFH-?I/B_5T?!&3*>OF<5L@:<F9'0&2+H3#5F`@6!!R<F`+IA*OUZQJ\/_#!`
+M<,0"B%E[.G6CA(VB""\I'!!D]'>'4%,X'G]<;>$I#+35S-'J(D8I12Z70[E<
+MMMN\M6O5LX1G@:5I&DJEDETI)(HBNKJZ((HB*I6*_9U;$PED%G.V(P$.#5$<
+M'BZ!$!$@0(@K0I)T^/T"`H3@]PYI((%1!`+N7-G=TX.%V4TDXXX%H:[2O[IH
+MA/W?(D2AH.',E&;7!;B-H6[.)E([$H`#!\K55ANWLN:KH6T9UZ]?MUNZ.8U$
+MMH3+2N(XW4#KG#S/HU*I()?+U4D'5561R^6P?_]^'#Y\V,X&-JOU:%L%U'$\
+M0WBO]ZO2VES90P@^O&^C"B!.J*Z4D41DBWD@$?/X38)PO`]E>0FA@`<(F!5#
+M=4D84VKHU,`K;Q4A:][$-W0#8T-2O?YG,X+FGP&C*D[<@.",\-'&HA!1%.V.
+M'NSZ?6N^G($C-F[@3"DK2C5.8F7\#,-`*!1"(I$`S_.8G)Q$L5BTR\-V+@$X
+MD_O="-]$"K!;3])7!PH0@!AYJ*H&470G4"(1Q]J:`5E91<!/7-?,-1#?_$PF
+MJ^#4Z0Q6LLT]W:$N`P,]X5JEK[-:PN1^CG(V(`S.J`>"R6FL#<!*`"M//S<W
+MA[6U-9N`K&BWK':+H*S(9_5YN5Q&.IU&N5RV":LH"HX?/XY''WT4G9V=2"02
+M4%6US@!L:@.T7A;&V<3S)#QC&X#`WC>``37ID(@1K*VDT=OO_=P=G\\/.4\1
+MLE#,)`7<^^M23%W/X_1D"66U.?$Y:/@W1X+NW,_H>B<@.(.K200O$#A$O-_O
+MQ[Y]^[!GSQZ[?K!951!;1<P>MVP(JQV=Y0'$XW$DDTEP'%>7<&(;5>PH$FBK
+M`:ZQNJ4="="@&LP+\O,%%`HEA,/NM0&;Z\L8Z*K9"6?.;R(1$]#7Y0?/<^`Y
+M`IXGF+Z9Q_2<@ND%V21\ZQC7P1$.79VU.@`83H!P-1?0["QB`<$-!(0CGD6=
+M/,^CL[,3?7U]J%0J=54^K*3P\A`LHTZ6Y;HY9W^O4JF@4"@@'H]#$(26U4#M
+MVP"$-!#?E?#<%H!@_FXDS&,]NP2?;[A!%:RL;J"K0P?'52MZ+E[-X=5S,@`9
+MNI8SLX3FY/&B>5YOPML5S0"Z.W0\<$^\?F$%1VJ<[W#[P%75@,WE+B#@K`(8
+M6I\-M#I\Q6(Q='=W8WU]'>5RV=6U=MI>%M?+L@R>YR$(0D.]H?6_(`A(I5*V
+M-&)7(NTX#L`U(S[GXA9RK8EO;:D.(+VT@)Z!85A=V`V#0BMO(A"3S&RC@5^>
+M*]C?%\36'$X-'7OZ.*SG#.1*/!XXZD/0[T,F6\'1`U%(DN!2[ETEK.7V.=5`
+MG:AG04"\74&KZCH4"H'C.'1V=B*;S4*690B"T#`O;.Q%492JNDPD7,O"G>%F
+M:WV`TV7<D02PRK@:B,]Y>P%MJP/32^CK!A86YM$W,`2.(UA:2F.HUV=/[+],
+MKB-?;C\K27453SX81T='$KG\!J;G"M@SE$#?X!ZD%Z81"3>)Z#'6/NORN>I[
+M\QY85>"L!6#+PNS80R!0%R1RBG5+8NFZCD`@4$=49TLZ9^^@9G4!VP.`%31U
+M<+D;\=OU#ECB6W;!<"_!TLI-B+X.A'P5<%P5`.N;,LY.E;&5!YP07D0VKV-\
+MH@O!4!#Q6!:A2,*<(`,<QZ-04L$!\/FX!M?/Z?9QX*K6OP4"4A/_=5*`$'N]
+M(%NGQ]9=6JK([_?;H'""0%$4R+)LMWII%AULE0W<L1MH20%7&Z`=PG.-GH"7
+M4=C?)2!76$<L[K<C<Z^<V8"JMT_\@10@BAR2"0GKZQOHZ4D!';5X@Q1(825;
+M1#C:@XW59?3Y=5=+OPX(%@A(3?S;C;,L*=!$#;#&'BN:+6/-XG8GUSK?W^K6
+M]MK`=E/";@1U(WXK[Z#!163<PWC4;U_3]&P.EV<K(*2]ENZ&8>">PYWH[(A"
+MU73$.^+(YTHH%5?!@0)\$*FN+@!Q9#9SB(6-NK0OJ]]MHC,@(!RI6?VD$0!V
+M8-J#^*TR@*S/WTJT;Z5J:%O/#&(-",*`P)7;6QB)GF!`HQ1@]_OVQ/'IC_*X
+M-E?$]'P9Z549G"!Z7F]`5!$-!Q!-I"":J=#,VB(&>R5S0F4L+:^@N[L+Y>(*
+M>I)"73C7:>35@8#42P$;#)8T(-Y%'>QYW8HU6*G`%GDZ*X.;Z7FOU]M2`76K
+M6BP5X,7]7L1OD3AR2H$ZNX"YKKTC,>P=B8&`H%16L;120JZ@574X!T@"!TGD
+M$`KP&!Z(@.,(-K++*&AA=,1CD$0*CE1%.N$(.*J9GD0<J^M9)#OX:HK:\`8!
+M:^A9A&?%/B%L`\OFU3CMZG"GF[==%=!6CR"O"T0M"]N2JST]!&YK'D&]2"5U
+M$<!PR(=]HSY']H]I$F7N.Z(2\ND*@!A4O1KK!P7R>16BOUJ*GNI.@M).I!>N
+MHS<EU85XG2!PT_=>`*`NXIM-U;9#=*<KMY42L*W4+C0`P+N>S(-X7/O$=WO/
+MF32JXWX7`#!7XPX`<]7.S;2!5%?UX1?=O?U86%XQK>T8.CHC6+RYB("D0C,,
+M]*2JG;184>^4!+;5WP8`W*IQV<J==KC6+:S<2O1[U0]L20*XZ9!:**`-_]Z%
+M^&XAY%:2P&NB/=/!M-I#D%`"(A$HFHJ-]340JD#P19'LJE^#*$E`3Y>OUD3:
+M#`4[W3UW0Z]^;W<$(>[M7)TZN%6YUZT0_=L*!'D1WZ[$V<K6C/B.`%*=+>"B
+M!FR.)QZ&JIG^9:7`P3'S,7=4P.Q[%0!A+-Z\"9](X0^GH!L^$**YAG0;.+L%
+M``BMW8/9T+AA:;CE"3B?'.96-+H3M\\M6-2V$>AL5&SWS'5X`2#ME8:UE3]H
+MD2QJUO;<62A!0.QP+J%F90^AJ%14;&QFL6\D`(XC6-W81$#408CD&M)EI8!E
+M\-EU!VX`<%XK<6_>T$I<6[I_JZ*_E;1H&P!N/F>M!INXIW?=.+L-`['=9%$K
+M`'BY42P0)O8$D<E5((A55S"5\#7Z_8Z0KA>1V9:UMMJQ.Y^3NK4*3@G0K%R\
+MU3*OK92&;SL0Y(8LP]"12B:0Z.115G2'#U\3>ZW"O-7_&7>2<2V=4JAI!JO)
+M(D&W_+FU'^IUM'6C]:UAP32%A&L?0*9M+`,PM@"44@K)3%(Y.WBW$ZBQC$X6
+MQ%M9"^AUK%DL0'!&^YQ2P#"`8"@,01#1`8<^9$T$U"IWB<-J;]3?!`VT90).
+MKLFHQF5`'D6BC4VHZX%1OV#$LS"#:71)Z\K.Z]W-NF.48FU]$XHB-ZP,\C("
+MK1(Q69:QNKH*5541B\40#H?M-+"E%EJ)?J]C[;2*S0"(.^O0K+1L1RS2]($%
+M]:^-ME:VM'<N>DO/]7Y_UEJS+TD25%6UDS]L3__%Q46\_?;;F)N;LR6HU4#B
+M`Q_X``X>/`@`]D.HV^5\9S%(4Q5@&,:YN;FYAX>'AQMNQ&B!L.U.SNT`Q>T@
+M\DZNC7V$2ZE40C)0IMBI```3<$E$0529M`LW>)['U-04+EVZA%*IA(Z.CCJ;
+M1U$4G#ES!K.SLWCLL<?J"D&V8C.T902JJOKF[.RL#8!;1:C?=>)32A$.A^VH
+M7C@<MNL!+U^^C*FI*12+1:33::ROKZ-0*)AUD#YT='1@8&``R\O+^.$/?XA'
+M'GFDH?&C(`@MLX6M>A((`)#)9'YVX<*%/W[@@0>BDB35U:TWBQ#N$M_['C5-
+M0V=G)Y+))'[QBU]@?7T=__`/_V`OY+`>.3\[.XM@,(A/?_K3F)B8`"$$*RLK
+M^,$/?H"IJ2F,CHYB:6D)W_C&-^RH7B@4PN#@(,;'Q]'9V0E!$.HJC=T"45XJ
+M@`>`?#Z_V=O;VY7/YX\<.'"`9]N+W<H)_FTFOK.G;T='!X:'AG'CQ@V\^<:;
+MX'BNVK]/]%7;N%(#BXN+&!@8P"<_^4D,#P_;I=RQ6`QWW747BL4BKE^_CN[N
+M;D0B$83#8?C]U2+6=#J-:]>N@>,XI%(I3Y6@JBH&!P=Q^O3ITBNOO/(V@`T`
+M:0";`!0!`,Z=.U=*)!+_0Y*DH\ED\JYCQX[Y`H%`72-B=H4**X;<_&^VPQ5[
+M44[WIL'><'S'[3Q;(93SFMES-2,^^SFW[SI7Y;*+/T111$='!U*I%);>6\+I
+MTZ<A0T:69L$7>42Y*,+!,#8SFR"$X,"!`P"`M;4UVSC,Y7*0)`F'#Q_&W-P<
+M-C<W$0@$4*E4D$JE[()23=-P\>)%1*-1#`P,U'D+SE!P*S=0/WOV[((HBO\M
+MD\E\_L:-&W<]^."#'?%XG%C6JK,,V5ESSI8_L88'&P!A)XVMEW-.N#-O[N;7
+M>^W=NFIZM5EUAF7=KL$+,,X5P#Z?SWZ&K\_GP^NOOXZ+%RY"U56LQ%9PWS/W
+M87UF'5=_=A5C^3$4BT5T=74A$`A`EN5:1W;37K#F<N_>O;APX0(XCD-75Q>^
+M\(4OX/+ER_CVM[\-O]^/Q<5%+"XN8GAX>-L-(B@`/9/)%$Z=.O7FU-1496EI
+MZ>,7+UX\/CP\'.ON[@YV=75)HBCRK7H)MB@N(1S'"3S/\\Y6ZEY+T-UB%,T"
+M1>U^A^,X2ZII`+26ZR(;JXY$=CZLMFR;FYO(Y7*V#26*(BBA2-,TOK;X-4B*
+MA+W"7A1R56,O%HO99=_L@R4((9!E&;JN(Y%(V.^+HHCEY64HBH)0*`1%4:!I
+M&A1%\?0(VC("31#(`#;GY^>O+2TM?;^OK^_2T-#06%=75T\\'H^)HBA22K?U
+M;'ES0L3>WMZ^`P<.]"42"=?@AI?=X%9FW>IABLYU=>P$29*$F9D9FLUFTXN+
+MBXL^GX\*@@!)DEHN_)=E&5U=77ONN^^^5&=G)V=9X#S/(QZ/8VAH"!T='<AD
+M,KAZ]2I$(F)4&\7JS"JBE2A&\B.051D&,:`H2D/S"'9!A\_GLU<26PL_SYX]
+MBW*Y;/<=YGD>T6BT:8BXG9(P"D`'4`*PHJHJG9N;*\_-S2T!Z`000G5QO6#6
+MR!#`.W#G-OK[^P.?_>QG[SUPX$#?Z.BHJ_O"/GF[V=+H9CZPT=#1LW%9M2`(
+MN'GS)EU;6\N__/++UW.YW(9A&+(Y!RW'G_W9GP7NO??>Q.#@(.=<>&*Y><%@
+M$/W]_9B^.HU8*8;'-A^#K,O0*AI43H6F5SN'4DKM$G&K,M@BOJ(H2*?3-E!6
+M5U>1S^>AZSJRV2PJE0KZ^_LQ-#14%RAR,D/+U<$,"%0`.5,LELP(80>`*(``
+M`X*V",]Q'.GIZ8GU]O;V!X/!H86%A=34U!3E>9[T]/1`EF57X\JM0Z;;4C4O
+MSG<:;^PQG\^'A84%%`H%3E&4@0,'#G`<QRU4*I6YU=75V<7%Q36]>@&>TJ"C
+MHR.OZSIEV[$X1:[?[\=##ST$01!P\<)%K*RLU!)F)M>OK*Q@>GH:B43"7M=O
+MV5/%8A&7+U_&XN(B<KF<;8Q;OQ&)1+!W[UX<.7($L5BLP0W<4C+(`0(-0!&`
+M`B`/8`5`T"2^:+J.Q"4]4T?X@P</]O;U]=W'\_S1D9&1D;Z^OH'!P<&P(`B8
+MFII";V\O1%%T-?BLB7`:=6[ZO=G-.?OG6''WEUYZ"8\^^B@XCHO,S\_O7UA8
+M&%U86-@W.SL[,SX^?F%C8^/,Y<N7;Y3+9<T%""02B6P(@F`TB[XIBH)H-(J'
+M'GH(@X.#R&:S=OM60@@N7;J$N;DY3$Y.0A1%C(R,H*NK"SZ?#^OKZUA=7<6K
+MK[Z*U=55\#R/^^^_OZ[`U++\+2/2K7BT[9(P%Q#HYJ::DH!G-N*1GP,`//GD
+MD_W!8/!Q3=-^[[[[[CMRYYUW]N_9L\<.BEC/MIN=G<7$Q(0M!;8ZMM*[T#+4
+M_'X_WG[[;83#83S\\,/VL8V-#6E]?7UH?GY^<')R\HYSY\X='A@8."W+\LMO
+MO/'&U6PVRP*!A$*A'"&$-BO"L.[)Y_/ACCONL-TV*P@T/#R,YY]_'C,S,SA]
+M^C0N7+B`9#()O]^/=#J-4JF$=#H-29+PY)-/XO#APW7]?ZS'Q%C$WU$HN$F"
+M36/T(H%W<A:'#Q\F)TZ<>*10*'S^P0<?O._HT:-]8V-C2"3JV\#V]/3@Z-&C
+MN'3I$A*)!/KZ^FPK]G8-GN<A21)F9V?QSCOOX!.?^$3=\40B@40B@7W[]I%C
+MQXYUSLS,/#0Y.7G'&V^\<3P:C?Y]+I<[]>,?_WC3FA>_WZ\X50R;]G4NV;*>
+M%,H^*ZB_OQ\?_>A'\?+++^/\^?-865G![.RL_3E%43`X.(A''GD$^_?O1[E<
+MKE,#[;2)9=W);:T+<(#!4Y;\Q5_\17AA8>&S?K__#Y]]]MFCQXX=X_U^[X<\
+MWGGGG5`4!1<O7H0@".CM[;5O[E8.R[#R^7RX<N4*)B<G\?CCCZ.WM]?S.V84
+MCCMTZ%#R\.'##[_TTDM[KE^_OO_W?__W__?WO__]:0"Z(`B4$$+91@Y;Z?=C
+M?:^OKP\G3Y[$/??<@\7%12PO+T/3-,1B,0P.#J*SLQ/=W=VH5"K;JA)NNRAT
+M)^.O_NJO?%>N7/DO)TZ<^,.3)T\.]/;V<NV(X^/'CR,8#&)R<A+E<AD3$Q/V
+MDN:=`L$R$B6I6@'TUEMO(9U.X['''D-/3T];YY`D"??>>Z\X,C*R]X477OCC
+M-]]\L_/C'__X?__!#WYPK5@L$F<3R:VNV=-U'95*!9%(!-%HU+;D-4VSUPU:
+MGVFGH*15X\C;!H#EY>5/'3ERY%.?^,0G!B.1R)84\\3$!*+1*"Y<N(`K5Z[@
+MKKONPMZ]>^UTZ%:!8'&\)$G0-`V7+EW"Q8L7$8E$,#P\C$JE8C]1(Q@,MG7.
+M5"I%/O6I3R441?G$Z=.GU\?&QIXKE\L\K3X1N^WR[&86NF48^GP^.^WKI=O;
+M71#:3G?2'0/@K__ZK^\V#.-SSS[[[%"[Q&<?L$@(06]O+Q*)!.;FYG#FS!F<
+M/GT:QX\?MV/D['>\7$+V,6FZKN/LV;.X<.$"@L$@QL;&$(E$P/,\BL4B"H4"
+M#,-`(!#`OGW[VKK/0""`9Y]]-I;+Y?[#]/3T?":3\3F[<]R*ZMVMJI)?NPK(
+MY7(?/';LV&@BD>"=1H[7<*YSMXRTT=%1]/?W(Y/)8&9F!A<N7$`\'L?>O7OK
+MGH'K%9V;F9G!_/P\<KF<G4V3)`D\S]=UT+3\]F*Q:/?5:66`6M&VT='1GF0R
+M^8%2J=3II@*V4JG;#K&WLRC$><ZVGA>PW5&I5(Y.3$PD6!>GU6)3ZW->(=]X
+M/(XC1X[88G!I:0F7+EU"L5BLZ[IM1;Z`Z@.3D\DD!@8&;&G`$IM-TZJJ"D51
+MX/?[$8O%ZB12,ZDE21+V[=O'#0X.'I!E601`MKJ`HYT:OENU(,0MX75+`?#$
+M$T_P/,]'L]FLX'QV;BL=;<6VG:Z3,ZO'\SP&!@8P,#!0EWEC;Y(%E'4-+,=;
+M_ZNJ"H[C;'O`*L]2VWP(A)734!0E*@@"(=5`P([$_G;*N[8+AEL.@!_^\(?&
+M\>/'+U^[=NU#!PX<B%OE2>T::U;2@[7Z+5"PEC*[4H;E#C=_F`6AKNL0!`%^
+MOQ_!8!#A<!BQ6`P<Q]5ET-J-(P#`S,P,%A86-O?OWQ^Q),#M(MJM>FS,5D/!
+M6QJA4.CMR<G)];OOOCLV,C)"G(M+VK7:K9;FP6"PCHO9W`#;4-'Y-`QK;VV2
+M),'O]]<MQS(,PT[3;C6(Q/,\+E^^C+FY.75Y>7E][]Z]?F=Q3#NZVG7AS18J
+MF;9ROMLN`0#@'__Q'W]RXL2)5__N[_ZN]W.?^UPPE4JU[7ZT"N]:H+!R`^V$
+M@-D)L$JKM_O$#U9=+2XNXM2I4_KY\^??75I:6@T$`KTLV&\7]]Z*<]_6.,`;
+M;[RA))/)KXV/CX]_^]O?OO?))Y^4!@<'[8+'VQG>O9W#JH+2-`VSL[-XY957
+M]//GSR]>N'#A\LK*2B84"NG-`D%;?;+7[0(-*R%O!P`H`/W%%U^\>?+DR:_N
+MW;OW/S_WW'-WGCAQ(GCOO??"[_?;D[@5M?#K&FR_?<,PL+Z^CJFI*?SJ5[^2
+M5U=7WSM__OP[5Z]>30,H1*-1I5PNTU@L!EF6VRJE;^?85MV^5I\W#`/A<+BI
+MZN-OQ>1=O7HUN[JZ.MW=W=V93J<[YN;F_+JN$\L/%T6Q87'DK]N`8KG=$O6*
+MHF!S<Q/7KEW#:Z^]ID].3N87%A:NO?;::^>FIJ;2E-(\@)6GGWYZ1!3%X8&!
+M`:%5.=9.N7T[G&\P#[^:F)C`QL8&KEZ]6OKI3W_J7A6\0RF@`,C,S,R\N["P
+M\(V/?.0C-SF.>V!E9:7WK;?>BA\\>)`;&!A`)!*!*(KP^_V0),G3K;N=',YR
+MN55W9VW%8A%+2TNX?OVZOK2T5%`49>WZ]>LS;[[YYOS&QD8>0,&LC9B/1"+K
+MER]?UB<F)N#W^U$L%NL:.K&12Z^&CNRC8;TR?*R+[/2$W))0;+S#ZD@Z,#"`
+M%U]\$:J'OWLK`*";!20KBJ*0%UYXX?E$(G'IOOONNW]@8.".?#[?=>[<N6A'
+M1X<OD4B@L[,3'1T=B$0B\/E\\/O]\/E\;=7VN1EU7JN+W9:9*XIB+[@L%HO(
+M9#)87U_'VMH:-C8VU$JEDE<497UN;F[^W+ES-Q<6%O(`*F:5U"J`FP`6>)Y_
+M5Y;E\EMOO16ZXXX[T-'1`555FZ[?:Y>;G=[/=MP^B]$Z.CIP_OQY9+-9NKJZ
+MNLG0C-ZR9!!3191'M;&*NK&Q4?[QCW^\D4@DWCEV[-CAGIZ>D5PNU[VVMA8/
+M!`)101"D<#B,>#R.>#R.6"R&8#!H1_&L5NANK]VZ9%OQ!`O][%H&*_1<+I>1
+MS6:1R620R62L,BM-EN5<+I?+EDJES<7%Q97+ER^G3<++)K`S)N>_!V`)P+HL
+MRZ^)HOC)Z>GISDPF0XX<.6*O]W,K7O7J%>36FL>*CUA>B!/TSI)WM_-:\W7^
+M_'G,S\^#$*)?NG1I#K46V`::/()KVU+6!)0?0!Q`$D`W@)0HBJG!P<&^B8F)
+MX50JU1<(!.+!8#`<"`3"/I\O)(JBY/?[B94-LV(#7IMU@^R3LC1-L].I5A&&
+M];ZNZQ;G*XJBE,KE<K%0*!1E6<ZGT^FU:]>NK=ZX<2-CEHDK9A54#L"Z2?P5
+M`&LF&.2/?>QCTN.//_XE0LA_U'4]KNLZX7D>@4#`4T+M1'5M=2B*PE8<Z]/3
+MT]/?_.8W_SF7RZ4!7`7P#H!Y`$5RJU6M634LFI7$4;.H-&E6%\<%08AU=74E
+MAH:&4LED,A&)1&*!0"`:"`2"/I_/+TF23Q1%GR1)DBB*/LY\V`_['!V+,]B2
+M;*:P5%-555$41;;VLBPKQ6*QI"A*(9?+%5975W/S\_/YI:6E`J54,TO?*B;A
+M\Z:!M&$"8`-`%D#9!(<.0/C"%[XP,3@X^,=^O_^)4"C4Q_.\M).XPZVV=W1=
+MUPN%0GYF9N;FSW[VLTM7KEQ9HI0N`[@"X*(IS<KD=OP^XV%(J%83AP'$'%O$
+M!$D@'H^'N[JZHO%X/!2)1`*12,0?#H=]AF'X*:6"IFF\W^_GF<&9"2A#KPY#
+MTS2=YWF=XSC=,`RE4"@HN5Q.SN?S<BZ7JZ33Z5(NEY,II;JILA1S*YNB/F\2
+M.F/N<^9[91,@.J,_>0#A\?'Q?0\__/!3DB3=20CIDF59LNH$?IU#UW5J&(:<
+MR63RK[_^^N+R\G*!4IHU;9@K`*Z;X%9OY\6R0!!0K2KVFT0/FP`(F_^'4*T\
+M#IB@$4PI(@#@!4&0?#Z?($D2+TD2+P@"1PCA5%75%44QF+U!:YVM#)-HFF.3
+M&6ZW.+[`;$7SN&P2WG`:3N:]2:94&P&P)Q:+#?,\'Z>42JA?._&^#TW3C%*I
+MI)OE[5:)_RJ`60#3IAM8`&"\'Q=I_0;'J`?1!(3/)+ISDYCC%B`$YARU1W[6
+MGBEJ.(P<S<'IBDG8"@.`LKFQ!+<*88T6M9"<>:T)`'T`>LW706QA[<1M'-9<
+MR*8T6P&P:.[SYGV^[^**75'$FY,H,)O$;-;_(B-%.&9C2]19PNL.[E>9S0*"
+MZB"VSHCX9D1WWHNEYB*,6O.;U_R;``#=O-^B"8(LH])NN1>P73"PQB-AB,NY
+M<+SS-3L,%S?'<-ETA\3`%HCN)0DLE26AMG["ZU[?+^*S(+#`KSF`_FM':3O`
+M<-M[73MML=\)H=N5;%R+>WH_`<`&?NAMNO?=L3MVQ^[8';MC=^R.W?&O;?Q_
+4W9=K2].M5;4`````245.1*Y"8((`
+`
+end
--- kdelibs-3.5.7.orig/debian/system-icons/crsc-device-system.svgz.uu
+++ kdelibs-3.5.7/debian/system-icons/crsc-device-system.svgz.uu
@@ -0,0 +1,238 @@
+begin 644 crsc-device-system.svgz
+M'XL("`$ER4(``VEN:U]E>'1?;%=O;UI-`.1=6V\;.99^3GZ%X,8"TUB9(@_O
+M[B2#7F=Z,$`:.]CNGIVW@2R5$W5DR9#DV.Y?O^>P+F25JJR293O*K-Q.ET^Q
+M>/EX[D52;_Y\=S4??,E6Z]ER\?9$,'XRR!:3Y72V^/CVY+=??SIU)X/U9KR8
+MCN?+1?;V9+$\^?.[UV_67SZ^'@P&^/!B?39^>_)IL[D^&XT6:S:>+B\R-EE>
+MC7ZDJU_^\==_S++;;/67NTVVH%;6(\GXZ"0^CO]6%=S>WK);R9:KCZ-__OQA
+M)+QWH\7X*EM?CR=9\LQT4CUR?;.:AP>FDU$VSZZRQ68]$DRD34QB\=OL@JVR
+M]?)F-<G"8Y-)6G(UO6SK#';$CSB,`$ZQQ.GZ?K$9WYTNUM\ECR(F;8\"YWR$
+M]V+)?J7.[N:SQ>?.SH2[:>LX9]?X6SV`M]>3\77&\K%>XI,96V2;T?M?WX_*
+MTJ><33?3I)KRJ5J[5574>C4=ZZJ)\'SYQUEV=[U<;4[OI]?8&6^8X]A?UUKF
+MKD>9R]D\HS;?GHP^+:^RT7@UF:W_&+W/UI\WR^O1WU?+W[//F_O1U3TRW?7-
+M)ENQZT6.8SG*L^ER<C%>4Q73\68\^GTU6J\FH_7]>I-=;97,&YNLUI/3:?9E
+M-LE.\X(,I^>/>A<KP>%,B7I%R2T)^5/3MR=8A2C1/@LHOCVY1G;,5E]R%'&H
+M%_/L]&(\^?QQM;Q9X#.+[';`&0<YP-F2"@9"^($`&<HOL9W+^?+V[<F7V7J&
+MCP;J%Q2Y_UK>4>,=SWW*9A\_;5#BB[]O9]/-)_Q3^)-W;Z;9Y;KL,5T+XT[>
+M(>$-\EPV7OUU-9[.4,S*(G4J<.5#:2R_QAFJAH[7P#7/8=K<S[.<=CI9SI>K
+ML^\XO[SD_(=`6B(RL\W]&>JC_/-#/MC+RW6V":.2TH8;)X/1N]>=C8GNQKSM
+MV5A%+IMZ,ZH/."?V@P9X-S0`7;WU&?WTA8;O!@8Z@3&"?EX>&&&[@4&>?"E@
+MA#LV8+CH!H;+KMY>AL^3"A/O9$]GZ>>EH1'>=?(,WNODF2>'!AOKY)H+H)^7
+MAT9VJF#A5:?P[P?-3G'"ICJU_>22?EX>&-#=P(!],6#`[-,4?P%@1*=EPGN=
+MHO\,PB0ZV?-K"1-JODYHN'HAVX1-=6K[KV.;A//=PN1\IS!-PN?I@'&^4YB>
+M')C^_[5`^+&X_FTQVV`0>(->_R\4`OSWXK=U[K??P]L3R[3BWA6S?8<482RZ
+M\<;EB-X++`/,H0[Q11G1+%.V].MJO%ACY'>%L$S&\^Q/G!FMI'5#P30X8?SW
+M)YV3FW-VB#///JTRC(N_:Y&,UVD\A+#/LPFB.9[?CN_7%92/Q<(P$."U3["0
+M.%'HI_$*"^,9*"-`12QJ95JPN!IO5K.["$;)9O&BA`<OE#?H%@XETP:L<IV`
+M>2Z.`#`,1(U2A?>3`Z:8LUJH"C`I&<)5.BT!,.Z8TL;Z7<QCI9>&T)$:-$`W
+M%M"#>=`4/Q*+,%+-M-4.DI%:Q;AVTE4C!<^L5V`@CE0+!MBRVLT:CALAVUG#
+M692]X:G"'EBAS1"8L0"J$*;=,]6*F-N-6,'1CT1,,\!N4RQ?(:8LDU*Z1)A0
+MXK@PAD?$:F4>1,PHS3L0,P#"#BD/82Q7!J7)*R.5.`@Q_YR(]9,WX1DZV[)H
+MAC#5GBEIG)`5IHJCLE;61B[$,M*@SC([,,U9#=H4%"<%A1(;%13*`[?>FVZA
+ME$>@T;5$36-E(?L!,,.$0(.GH]AR)JRT5E>`(0\:5%(.=@)FA1.JC0D1,`<<
+MU#X:7?:02>D/DLGC@4,HYH75YA"15/*Y`3LB@1.&.8->PD&`/:M('AF'`1H7
+MJ84\"##S_XC#P#&!@8`["#![!$K?H(.$\4J$5%J&S($>5H14,Z&]]='S*,KH
+MSI"F@!30&T6N,JV02B51QP\-4Q;9%%#I"Z6E5MU*O^SEUP3,6F8-!QF=6P4,
+M#'I8T8U'5Y];78IQ$%K`<5MI=O$@%A,@M&T%3($W"H;T2@[C4/39'+(E>F_\
+M`<1ZL-AASOX1X8$,Y#%LY(?(I.T1*?[;`(9^A5*FE+A'`M;#KS@,L*]H)D%*
+MKWC4^A39"@D':7W;0R2_63,)`F-MEP"&?H77XB#/U?9P];]91PP4!YT"AJ&/
+MY_H@1\SU,)/?,(<YD"E@BDDO#P3L"-*#`I`)N8((*:I\Z9RS,04DT.]"<V]\
+MRH-*\Y+2F1X4#%G9"TV.+$<7ZX%,A.OAQ1>I[&?#`KRC@-?%=!@0%A[]PPH+
+M*03REROM-4DHVG]4SG)7`E&1M172=VA\A;,0*:<6$:-/-V+'D(T7`KT*:<MT
+M*G$/.H?2.K`)]VAF4<U%Q.IE'N*>D!LD[A$Q-=BZ)&*GZ@G+)IY9DAR35@M;
+M86&!(3.)0N<%++AG8+F.;R;J91[``ET"[2BBL<HHW_F6AG*UN[&`YTZ"HE"0
+M;UG'0CL)JH:%5-K$-U:H4Q5H'-R380%'@(75*-02BE>2A(4/KK@044:<9IY6
+MPD4-6R_3-C;9@^=%3XU)#XSG^XUMA=T.,X'S&@B7]V$@5@E53.KE75C*:;FS
+M*B\SV2HSV2I#@ZUW"`?;0]D]MWG`?BMZ:Q$C*$]NII"%*Q9>PTK2V^#CF[1Z
+MF=:)[.%H'A;*/$7/'^/B`%=/&-=N,^FSL6"_P3:95,%S,NE3Z9)'3N3.>+N_
+MMCDZ)NWA>_[[,.G./$!8KOUM,NE.37H(D_:S$I2K<=Q!'#VMM[`T;S&(8%(+
+M,#)YI\XI'^U<?6;;5R$H[U1+$(%N$=[#&!68T\99.92TYL5T9[9Q`I[*]+Q^
+M]:KXQ7]?M8#7QP5;7Z^R\?3G;/-IB7V]'D\K4+W"<3M9KJ<I`G^-`6CB6X.A
+M1"R/H-;+]&.I?_[\X6_O_R7^=?*.!O*J^J=E[1>17W<,MW2"*2]<SU9@(,.C
+M0A,<9\N)1J=CF7TZ#66G6Y9JY_AN+8=;?;SX$V@]+'YS1JF6VE53VU9EUP+0
+M4"6WP^*W7J5(JQR?7<VF?U_.%IM?DLI3&G0NI?PI?+J[VZ/NSB6";74SO6?M
+MG>N_SW^BGRY4]F2S/@%OMU0)H/5;D#`HVE?4()S'*,UAP.H`>(Q8E6+.>/X(
+MJ9*'2E6?7$?W<*U%4;/*QZ!4.Z:-<KX1H(-/Y;%69I_AJF<=;I$QZ!XNSIQT
+M2GM7'ZZ1M>$JQBTTAUN5V6>X^DET)N(OG$E94C,#KMP*6#B!TAC@,7&@T-(Y
+M[QZA,TVGSC0/*KA.G1F6M#^D.$V73J-ZA=3#XK=3<3Z$*OWS@.?2YD]8Z8T7
+MK4G)YBT`9@1Z-M^?-*:K/EF^.5/->7JTAR=,6W*KFLF=;LI+0I.+GVD(GVJ*
+M7D/PU"'8]%C]V.?]RTNBE.MD74=);>GCAC;>1SDU48(>07J?M/F+BEENJ!MF
+MNFFC&Q9:'`*2WAU(]<FGORQ(P=UN.MM-5[OI:!^"4DOT5+GB1X5-$3\UHJ?D
+M'4T>.S4BI\>'XL+(G8F_GIGW5X_P?(L8_P'/%PV1%KH1FBF?QI/>,X<1M?<U
+M5&*9?=P,6[H9KY)_.PSYJ\>,N4HL=H_Y5#KD%),.V@"S8$M)+K;.:&==DF`C
+MC2NXY7SO0;OG'[38E3@07.,LVF3,0N"\JA*%8D^("IO_4S]%":L?,6;__&,N
+M='/WF+6AE]9ILD0P(TWUEI3&?`J:<;`N&72]T%[9$OXDH[[/Q1#`-033VBHB
+MH[[3"19.!E67BF92:J_.5[F>;5]=\*X]XP\'`?^1!``MM;;L9ZWV]?[0MQ'!
+M:\WL0/LQ+_BZK9'`*,>YNA&JLI#%A>4,T-F*M_+N4_+;:Z8\+^T-);]/42%;
+M9<H\V`H5$;(C=Z)@XLG64Y/MIY(YA0?FM/M`ATQ?JL?MZ>YJJS/Q]IV[]&[L
+M'[,/M6AK=PY*=!\?XO3YCP^DS_K5WIF<:ZN]ED#K5W]G@HYS^?Y'WQ4?HRC4
+MN?T@=4L[FG?857!D+5P].2T=R-2N(L.HN$Y%-,OLI;%DF[KMA:GLW()]'CZ'
+M<83LTI:MM>_/$=W'5.2[NA_@B(>4XW.I2(PN6E4D9Q[(]QQ:Q3RJ-#X\U>B'
+MD4*-.E)H)DWU-B/7D0;]-UXNCR$=:=%D@RX(DZVG)MM/)5RD'M"1W6<R9?P2
+MGE9'ZFXM=>'-<^M(O9<6V[OV3AWV-#I2=]JR0W1D^TOLG-M,DT.;_*F;S-AD
+M1;U#<C">I4WE[>LDC:/DQ%"C+R#1^Q\*AUJ46]AG&6Y]=,*T;26(,G)4<7QI
+M:YJ6IF%GFD;F@#B^Q[:!TD0^C%([3^5>7L,SA"V_L.$$PI8+N)NGC),/PZX%
+M\Q8D-&!_'$^UK86/ONE1\501<C4#KD:XU8RT#F`IURUOXMBPR4/I1B"]%44W
+M8NA#L'FBI4@O^Q(HY%B:&99F?J6973D$I2<ZY^%%57>1?FLDWQJ9M_J;#G%0
+M"M8_T7+$%^6E/#&;*B-5OK&/2=EF2O8@E'J\ZNBS9NS-B,Y%13_JS56V&=.A
+MLI7'5OR-QC0_,W4UO3S[G_<_E??Q$KM1GILUF9S][W+UN;Q)UZ+8BT//C2^6
+M-]AP41K+3R=G-`'CZDBN_"]AQ<F[V=7X8T9G"/_GW=4<.U@6+0[.RI_>W%]G
+M9>WE,<BM1RE/)U<S*CSZ93.;S_]&=5>H$EV@(Q4/Y1H5`RE.SBK&3/B,2D#H
+MC^IT7#IC=TJGU-:0_G@SFV:G%Q=T<NUF=9,WN/ZTO`TWU@DQ3L[-:H6S=CH?
+MWV>KY'S=JL#M;#%=WIZB-P&N]<X=;?QIO5.>D5O*5O-^<69NF8>,?<+&-+(]
+M.J^%-8FWL#7KF-!QC7AYZX_E$@4+F`.GP#9&<8WPKS^-IW30+VS?*N*E8+[#
+MW8OE:IJM*K*HD4/0@(QOPB?<H$I*<GZF7S79='!R&4N\6:$@!/;!<2@FA;.<
+MY["N[IL4:I?3ZL1J@4U8,@#>E*\OJT.(N6#.F>+]>0&K(BBL*`ZN"FX7-B[`
+MU/(.E\B<9\BV?]KV4]7W/]#=-)C$Z'*U_)RU/N"Y^+ZXG\\L/J`XX$3YDDQ/
+M(.9GX6#FE/@[QFAU*@I/MIK/\']GJ@IBBWO3,?)T"-.2DQV+>RV1;\!^;^0%
+MDQA^E=Y*0-XY+@O&*I&G/7!6N4('E\BC8V,X!UM'WA?!W"[D/;AMY&NC['C,
+M-_`G/UX)+9WZFA-0X'\]WGP*HZ]4V'*:D2)$M32I/A5B5%SXPN_!OW\>.&0G
+MXZSF0XR#0-#5X'S@:,>OXEPE5.N9`-H0.#2T:1]-8(T6SBW"2WPZH2J2-"-M
+M5:.@C>14'X>T[8+&!Q\&'B/LXNF*>C[P@FGEN$(JAMN$OAYXB<R#_9"4Z*?=
+MU]X-O&&A2I[3RJ?11#M:4I90@WAK!Z*J40WH_;QU6*#6(X%LZ[FI4<^1*NE4
+MLEH_42^P^LAU2DLP2J@%FC*ML4(]:;NB?6B=M3\&_>3`F;TT$"6,MR0@GZ#(
+MGE]%!24/C5>K\3WR_B+;4DS!SDB@22T\F+LT+5@H)IP$)Q24&Q/>GCA@&F1Y
+MEG5E$HH)Y*EBHGR(K-[41L7D>;\):3,)=<44!M:8@ISCONX4-)10.70Z'B=J
+M&-HP$KI*7!NF(4@DV@80&D1"]4`;4]%`#)QD0GKK)<D]EW1[X'1YA?SO&/>$
+M>4(]IVO+,?)+J5A3$&B\(LV`3I-.::[LVWE"10WD!%HI6=;H'/4M2!PD;9>T
+MH+6J?D;J>3(B&J^AK1#)R+TN=%6"4:0%K84QJG8IE;06':0A0CT:+9$+6DMM
+M]8A"8E(<]1YA.,>4UM2/BAIVP>;]*$:>TE*,$FJ!IDUJC*C'MM-9B_U,9RV.
+MB&9=2>UD,O*2.Z"5C_KI/-J/O*?.PWCP&`7N89V7RB%=`R_>:^26GC/ET59H
+M.ON&2VF$)%OM"&EK4ZHUZ+<9KV`H-)WHJ]#6)C2'1LJA<<,9C53D1I_/.,TH
+M#ZZ:&R*/:2X5<1O.GO)*BR'E@P&=.X^V#9E(66F&VC!/3^36MJ3&ELY3:M4G
+MLJ$6[\ND[T(@CUD0D-`^M(Z]+^_H;K\QD%<W\^PL^Y*AYS5]2&$7)I-?;YH<
+M='&SV6PQ4."979HWM7*R9M/(RLFFE4/HO/'61/<;Y4SJ\AB'RLJAP136%<Q3
+M6#FI&2K";2LG>UHY^3CW6ZJC%,3'X0^66-^4&UF>!'\%_?!7\E'XJZ/&OZGQ
+MT([P1..A/3%T-`\=6:B]P*B-[#S&D10UIE34#\&L\2%0<D\KLOT538KP@L\5
+MFJ2DZK`I1U*=M`-8<8SN`Q5HC7NPE0IK-T,IZ6T[=B5X^*A^4`]AG58[+7*-
+MEU"+ELX3:NP310.T,I(G?1>"CE)2*AW/A]:Q]XT0K/C&'=(]Q5(Z-"T@BJ33
+M$XEESZR$:O%,^HBE/6:QK`=?3?S%EEER&"LK'=4B!E_":U_DC4K\)7T%@2R_
+MI"0&7W3*N99-_-T6_H%I'X&UV8Y_K3/HS<ACP'I;!19OHALJD,X%MF!,705&
+M:E1L.!VHK"RD*E!X%K:[U54@2.;0G+FZ"B0J>O<N58&`@1`'O$[5&FU40V^D
+MK@)C2ZD*C'V**C#V/:K`2/O0.O:^*M#8;UP%MEA&:&,+2>])MRQCI,;)5MB$
+M:UA&!<S(+<NH#"53FI81J1CDU2TC':]K&Y:1-NCQ+<L86TK9(O8ILD7L>V2+
+M2/O0.O;>EG&G$_6-L,6FY:4IZC.M=?MBP?R68=J"=6HH:)N3*0\9#RQ%P3U@
+MW,^)$:P#[^W@QX%FLDBWQBL^$/@3,KI.TW<S]'R@K87\FR^K[#<9G.JYQJV[
+MSEOAH).RRL:M_,038BP>34P>7->_9"DR37T=#IT;M6?R06X;',<UNK9&'F/R
+MH088O7MX>S)>33KTT+9;1)5$-B+C8:TW>N@M>@56<8\2#X:.:I%"#;UCX*RP
+M?"!1WWB.`<K0:V:E!FD&$ACR![>",@^<#D0D?8%>M:.7GGSH**_$E77T-#B'
+M9GSHL&X/#MP`PS-:]B<<T6C_N2<-!@J#9JOI:=)EZ&SP`5`&RBNNAP[[@SX)
+MMP-:<8*U>.P/.HJH5ZP@7>71:Z'OG:(,"3DJWM/3R,M&A3$JK-M#Z[A1*X6W
+M^ENZW/325D:F\AF^AH;\TB$EW"1*+P&;4BFO:4`,#)V1KX440U*TVB#N`U3*
+MJ/R<YPGMG`"3!A6Q3ZAX@:.5(JTQI<6V(Y6V!M*7/,BD1IHJ+17:[-AVI)TG
+MO8S4.)I88]NXNX"5HA^PY2G(.;!HC)0W1H4&.#I$CH!-J*0_!!CJ,I?6TE<5
+MH;727OE\<#C=H!-:`-9+2>M4(I6^"8-T@TUJ3&FQ[4A%R0!+YQ0F-7I.7U$D
+M-"1M1]IYTLM(C:.)-;:-NPO8^C<NQB\05#Y\[`\/8*T3K+%O'GF&\HTH;>01
+MRKS'!95ZXND]WT#3-G\.8)`FF17:&AJO!'),$AIJA_!6+CBY%14TVC<449W4
+M&&EIVPG5XI4$K9,:$2W/#;U9C&U'VGG2RTA-QEC5V#;NPF<9GX7O-C^]F&<+
+M^G[TTZOE%#&^NIEO9M?S^X[YZ+=:P91?IM4`'Y4>JCI4E37PO0Z'%WM7`Y^^
+M](R&D()?TNK@E]0$TJK&2$O;3J@8,9+V]$F-EE+.6BB?M!UI*?B1FHRQJK%M
+MW%V,KK?#SE9@A4^`#<M9N<U5&8!5P7..5%IP;##X^;_VSF6WEN(*PZ]B*=,=
+MIRZK;E)FGOHE@"!F((&4P7GZ_-_?;7<;]P:'`PH$0,!A[>ZNJE7K?JD28@L'
+M)4MOW8BQMX)P/2/V!2;$AF\UR>L$+;A!6F7;OMC6G"?8>>P3M/C\Y%+V+TYY
+M!T.RI+2^SAQUP)Y.LSR@IS7ZBWF6RW7?0VP?OUB"O!S!OA&QJ`R7PQ9"[HM\
+MX#.$-#5C9-XE=`X9040?!#V^<`T]OO`Y'#H^2$CK+![G8Q2YWJN^5C62CG%>
+MLU+,<4!?K3U??R,I'V=8]5$/?>""'5"YA]HKDCE/9RAWL[74QFF<N;4WCW&:
+MT0%[ID"D<5)>/D'E?@;&F9CN_/Z@/:GT\S@GV.N,GD_08_9/)ZC7*>9=^SB8
+M>0<^CAD=L.=+?,I$Y6C!6<IZ,_X!/8]_0!W[SPM)^$A.JTD5R[1LXI,6YY%>
+M86<\'5`GJI/$'D'@XWVIC^#:R-,X!^R\GP?TO)\G:"/UOBC/>1T'+&;YT?6\
+M<Z^P,YX.Z)/7&4NFUPEZPMWK.%?XO"<&YO@@6YP5%Q9^C(%=?U[R`6U<!)2I
+M4I)?6PBU6]2/->:9-`[8FR6_0EER%875DDY0_*=2Q!FG<4ZP$PD=T#,)'5"1
+ML)QOZ;9MG+Q*)=@FJI[YS&H'[`T)O4*?3NL\O?^*CV.<`_:&A"[P>6_#U@=]
+ME;G>;EANJ:(8LA0#E5W;AKU`75V@!3R@3#)U5B`\C\BYD=)>V@6IGP/V_+"P
+M+H;(^025JB*0)-?Z_+[6M&3RS7(:YP1[G='S"2H7LT1*R^;W*U2\&"G+U_,X
+M@?T-S\J!E:X[S>B`/9]F?T"?3NL\H`<^CG$.V#&CYTM\WG4N/UA/V>=9K5(2
+MEJNT?G#O2?C&,*N)`TQ.1:;<$G#),VLE9#60!9-W5A_<M<(=1G2DHI`V3X:R
+M%YE>RU#N"0K0&STT3</DF.-@OJ(<V-3/_<WV!%G_66K9^*E.#")')+/\]/9F
+MGI63_N7U7*_IIW7Z#U]]__77W]Y!;+X3+WK?FW3V+N<C,?)J8;]:CU)=2:-%
+MI)+/4)GBCUD+6SV?H)+A6N,:"2)9K6IE)YB(A,N&;>T<4'EVM!`5=D!<42:7
+M]X+95H2Y@74HI'*ZJ^P[T22UF*$9M3)$MC*7:^X]@^LFM2+C;`YBK9(XVE9+
+MI)52+L1T4_0UK;XJ)X_5F[[3D_[NFZK:H<<\GT[08T5B#Q&[?C^M_`ISG[%[
+MY8[+]+[K[KQ[Q)N8+8Q'/&IC1R%@KC36':A6&T'`=9/?^Q>NH<<7[C)T?)#N
+MQG@[<XD)V84>-\_:X]T<WT-G0M&G&!:X(\LW*/,.M!8QFO3_;N@4#M:(>]#3
+M:%<SN[_V]^KGW$GPPF(E9'ZT[8,RA=LFAW>H!EQYR#??EQJBV7$'RG8@&N/-
+M%^Y#`RV^+0IUO-(=Z/7,#NC]4.&=D-;[!N0WL7S9E<$((1FJWZ9#F:]0VE3;
+MHE"O^%8PS0:VE_<N=MOB=6NF>8)).,DI#+YU@DI\!.7HRU_L$/()=A[[@%:Q
+M=2^,/3B;7)+"I1AYM"([F"OH2VO5Y"6%N[;L(K:F.&><H%J/A`:'RK?]_;7B
+MM,9CG"ML[/C^F8R*1-/=6T@CS99NCE:LM,AZ2>W'^E-G5.J'3`]NJ_A%:;@M
+MAY+_IVFX#R5+KFA).E76S/5MHMM/@RL-<[BC0/+X3>#T3TA+']+77)CQ"PIP
+M$!OOVK+:P"B:?]@4W17596+?U[?1Y5[M4709?G31<.5"H9GASTQU\:%J6.ZD
+M^4N"O9=@E('_)<%>:>F#]05Q4:OTT[)K_BYEUV\II;I,]+^DU"ME?=#.^OGB
+MU#^FE/KF+B'U4OJUP;[_]'<9ZK.FN?0G/(163E?_?4/^<CM?X85<[[7F?OJD
+M?XX.W4];C^[)<1M[]?%.I$$K6JOTS[0E;W(Y#M3<>R4?Z"9W[%$,7)Q_NX`&
+M[6(BA27W2QI[U%KTS2GZ<'RK<'GV"F(V,;F-E;!_KT->6:-28)+\XWICN32/
+M':82C/M!B:Z)^43>Q-STMEO(?+D]1\O50IY/Y%_EYFCLN;A0,U?/,=,V?^N+
+M:QEK'YZY6(LDT&TDFGOI+PLLC!RKW$99CZ.D=0W3V/;)W?M+MD>;)&?4#;^9
+MR&`>C[5&RP_1\38;$41P03*&MQL%QD5.8A>N]%X5UK3'92S<VTGQ"+&JX.+9
+M%:P&K[3.[G6'YK%Z$8;P2PO]O-'((2.9P$75&C6V=%Q;J71A36_/Y2B]9D71
+M8]8W?>RU\&)HD:"AIK&WH#'/`>+H]F'!L&8L;]?)L^A<Z#269J_YS4P]$[`\
+MW3L<\M.C$Z?3VXE[P+2[W`,J#]=O$U75`X)R_VS5-SU[;4C>Z"#D=5W"F&?B
+M%LVJL6EU2,L9$E8:HX6>]6X4=Q!Z32(!C<^UTH(NX<ZWLS:ZS;4?J5,7<P%[
+MNO,DH<4VA"7HK/?&W`=",<9-^'LD+IF]RN;4F_B"C/^H`7W4QTY[A(P/\;.,
+MCW'):WOD\$>AI"_S5_'U%_]U>]C?4LI?CB]_+#CO=57_?'_83\G-(U>^<AHY
+MRG8UR*\CH]I91B$;A$\'T0/*#*BCI_DH9@K1-G$60NHN&WD/13(%'*K=Y5<Q
+M\`,2K$H0$#9JA'%=.M8DC\BGA"0<LD>VRT,;A4N0V]2>#]%XEHQJ/<&AN=UX
+M(XO#H';-ZY$,`D]FFGFI3Z#)9I"L;).83!:O-8[6$J-7P43!8A@HN-&62!N]
+MJ(A#I]9`PE47#.J+HL88/=8E#`FW.()IZIO!>K0G&J?0%X8!'%PX+"'T(&'Q
+MF(5,S3RX>UCBT_'T1!Q,7-[$O=Q=E[7&X$20WORV6*+HBZ+E/">4'I:]U=(5
+M*X@C2#QVD1(0UB2%UA##W\#*K*V$,"D9OY!&33PL:>%H?'/;+='8UM`E,KH,
+M#5\:I_6T*=++^[/2`ER_=^/[D=J&]TG+U!"G,D+)DE\/[!7WW`M+@X9D[YKV
+M-(^:]4W)S=[+<JW4HNA8(M90K3]1JD@B),.IW=D/:;4K&%3(Q;Z2:X;V"+<R
+M],3J);6\E\+'<AXE@YU4MQV.*J9Y0$-*QXFVC9U8DIM7L*?K)RE,'51.&XN5
+M6CGDK_16'];2E:I6W@ZT,U=TFT,J=:#=]#.$XY[1=E*+E[QV+:,BCR_^=;?Q
+MY?<EH]Z6J_\Z(JJ?111,*:NCC-L0^K.H(D.N1<)AP>B#<C]<4)<QO8?"=C3=
+M=\$FS@4B2DS"&0$\QVFZ5)T^61QU\6_RVZ.8V2;W[4R9D9@8FIO,ED8?_N2*
+M\0Y[B)>&Q2-%9S7)3)"JTO;.L,C$>0L;";7H^0W6!^:$C`%]T!4BJ%;-#].,
+M(C=IPB2"@273V)YLE#Y?PIYVJ"P3F2AL./5N7<(A0<J:#V92ZR)!1`L'*6GF
+M$H^UN@2B2W`U#OG1&C5+63UBTX))(M4O(TP"3$NH@F'2)-*-M'/,F<;./'FP
+MQL'!)Y+`>ANB%S*ZWY;J+AH[PUJ];S`Q>5L[.XM1*%'3.ZF.N4&U$WVE:NB:
+MXG?VW,Z1S))]I+[5`RP2Y)0VB.EEZBR*[J8O"6^\+W$@?5(WL==8)=]L>X6"
+MU5*122,#%->!Q&BC0GQTC,TRJ2>#BBY@SQ:/?0XG8,%L<0T0(F@%Y;@:C1R!
+M*Z]-74F4)RAFK<P:P_2@D^`2*(E^IRO8T_63$M\RIAE=>SVDKC1/.3L2GV!9
+ML"P7U(+8!YZ(!@3%%$X2L#+:19O>CP@GA]8EKUV+J/I5^^K+\G\JHC[RUWNI
+M-=X85G9=%GFR1"1`_&6Z%E_0_'1K**PAI6/)(;<LBX<$#1GU(U"3,E30_(;5
+M74U*G6:</V#:Z33,%;X"%P.#N\%6-0?)87E<2X\(BB'4\L9!=%N,I&<S:C0Y
+MJ\:S(=-;RC-SC)=L:].[G`O1>RN8H?(/-\4O.M$W,7_2<'K8)E7)_J:H4%R[
+M\8"SPGX652D>-K_0)HHKU>1VB.TV#J:+K5+Q)PM>ID<G(`.L(ZDPJX:LI6F8
+M)(5<GH;+4_?U#ZJ0.]\,C(SA@J?&)7):E$P/U&[:2L#@5PXS`YI8BXT'&Y]3
+MQ"YH(3WK]0_O&@X%YBH91*2*W!E_,T@EC[Q_$QXO-E/DFM:^8]K%<C(I.,%/
+M^VOH<@^YL(J96S;CMJ?L^WF'H9I_339^4N"<-NI4RW2EL\U/<-+=HC9L)M'D
+M+$1OQDM=6\89<URV$>-WGZ35MI)7ZE\K3I;<K9HP/)_\[(P4=3<>::)!'P7'
+M?WBMDOX=^2^I6^29&R=R!,,C:2<K;8)^FQHT2_#*.2.!0293:"&F@-(5Q)E@
+MFY&;LWM&T37BE;$9SA(%HQG67)#,7G=]H&_/Z0_#--&YT-@CD5R7$A94DD0V
+M:-K'YY!\/5M(;M/:^&P-IE%+WJA2IJO[4O0$0F][=G!6N-<J'2FK`5JG#S89
+M)X7R!?,$;77=WZQH&.F:EG#$BRGMBO\_/2`7$N44/,WE6:UDFY`9SO)NRZEI
+M(LYF'=I=1*AW!5M%%"`7NDC!+M.Z=C)Y_ID4NG2@J3IDJ1;3SRSF%='T7%2<
+MML6QYS%W]V9A$6SZ4Y92%OUBR(J4=TJ76=.,_9PM$98O0NO@6;B1MVT'@6[1
+M&9CXPFBI-(8R=J$*S+@3$8G*K];]>9KEV^^^_?3U]]_]FIKE-^SC_,VTSGRC
+M=2K])QD]3S\`7=D[UTE"DF_6SHF]MM(S>$'&3'-`3E(;FBN<XM70_[(8!EW`
+MY@39$5@S=-MIB\W?@E)GWVUAB1BJH>BEWARZDRU6QR8+:!Z6FI*%5L*!MO6B
+M]9:M2:!CN=V*.PAEUPDFKEES+FN]5#BP"-BB(MR2E!`$#5,$"9-$F+7.A`/%
+MZ[;F%BU5?E:KDAANMM*H?JT[W<-I^FY%*LA-M2:D;P3[1YIH9EQ]E[8OV=;8
+M;1Q)[?$'6M?C(XO6ZILN@C\+;12!).EYTSJ$#1NS$M^EN8]OJ-CQ-J2AX(UN
+M6)&!IR<)NF69"IOE6:3%!&LXFLMK&MQ#*)_D-C@(+XKE&_I5QC3?1.HG_`W6
+M3R@8?AQ=6$M8=4_&H/:N\"SGE4?)MB6T+_XJ]C^.,#JKRO3EN>WD!J])LJ39
+M9AB<U*1U;"Z[_*%&J9@<&*1B<C@I(Y=I_AX$$59J^45J21B'H5EN=3/]^!XY
+MP9++B^JFL[)M5RZ'RFF7NBX0PIJG_#;:1G_8VQP3*R@==2U>Z'_2CJ@58!U/
+MRSW)5DFIE8'Z#/^&AEGN%Z43*6&).1`@2\$M)?H_\4G:M([T5^M43`U[=ILM
+MT"650XM:WK]AN;EKR-((?<OZIB+6XV,!563L<(@TT4@&?<Y%!1O'G=>B)X&5
+M;)H,9_TVG!(XJH/BV[I?8^R1WO._M8ZX5214EK]1:][\/H)E,LW"\Y(/+!L/
+M"4#=[32UB:YI9>,P!M%2\EKEK95M_]QK6*NQ2C1CV6\+N50;3HN<PFQ*`5%E
+MH]^\A86;3Q^CD]2^B]33VOV[A"='3>DD5-WMD4BKF,]D.N[M@Y39R;GQZDFS
+M3=-)X`29=S-FSN6Z/R\L_)?6L=99;Q)=>*0R(,<6[-+^.T%2\5,G\1#I#<GG
+MC-0/>(%==(HAR3FA'8XP92;I8ANB2\*%.%%Z8))T"+ZY)2BP'VLGX>,(Q'!(
+M,.CC%J^$H45>C5,<>?BTI^T+(B8?=!=H*\YW]%@B?G%(\):D4GA.HG:]'UNT
+MPL]93Q6G=Y(]D,SLP;1T&F78/BFOC^'WJS49SU;2:B2BT!!]BY:$(QLU)Z=M
+M1,?Z+K!:**\FP"CVSV,;:57)5R2-1O?Z*\DX;DZY(6EDZ[?A\9&+@X`[J3[[
+M2L_^:A"-<:0(5;B-7['G)O&C3D=A]!TF"U.PP;':E?&Y^U4:UI&KYBX`1B*"
+M-BGWD'XI^_%_80T].)9WA.,0Q?A'DN2QI<V&O2KPSP&`T8"B08+N*LD7+/3B
+MK\HNE:\2/F%(4L2P.84R[[\T!7%>)_=DR5@62]^0Z)/6Z_8DI[6>E`^RR",1
+M`6QIHS_D-AX`XR]*-@1#:F/_`\M2\[1)=D[_E,[L';FS[#_+MGZDCK<ZIJ9=
+MC/F2"I19F[U2^FP,U0X5SF<W5H745?9T6"92;_RGY>K;:):OX:1A[TYH::0B
+MIYL#C(M#TEO242NMQ@I>E8SLO$-E:<-_G,0B95Q>YAI.`$N:"JG]97S]+E\/
+M6I.F2,4SE4Z<RRE"="TP#@IRG!$^UA+RGC;$``SS%/K5F+[@?[0.O)ZU\=/?
+MG80&O0.39#4[(,I>,A&78:TXC=0XB6'`%16_:HZ-4J5I[*M[K^7"@^M,'*X+
+M?T3N,M==`ENVI#8Z0^?S-C?R^NUD[ZJ$QQ$>99\!"VQ"8R_H:_+;HJX\S*59
+M"//,B1M.B8P;.AE/7'BBHR'0H<"PF/+ENC\OT/_'TCK__,<W_.N'?^L__P%\
+'<K;E&+P`````
+`
+end
--- kdelibs-3.5.7.orig/debian/system-icons/cr22-device-system.png.uu
+++ kdelibs-3.5.7/debian/system-icons/cr22-device-system.png.uu
@@ -0,0 +1,32 @@
+begin 644 cr22-device-system.png
+MB5!.1PT*&@H````-24A$4@```!8````6"`8```#$M&P[````!F)+1T0`_P#_
+M`/^@O:>3````"7!(67,```L3```+$P$`FIP8````!W1)344'U0<$#`T:\K,2
+M*```!)E)1$%4.,NUE<]K7444QS\S<W^^O+P?K7E)7N)+FT:,5:@5Z1]0NG41
+MJ!LA[JH[%VX*;OP/"MVY;L%%%43!15.HN-*FB%I:,%9C:]K7ILW[<=_+S;WO
+MWCLS+M($#8@B>&!F<89SYLSG?)D#_Y.)_Q(4AF%0K5:?$T(<C!=)DFSW^_VN
+M\U\2+R\OO[>\O/RNUMK^V:^4DFMK:^OGSY]_WY%24BJ57"FE8ZW]YR<*H187
+M%T^U6JWY(`@`L-9BK:4H"I12D[5:[92SM+2T].;9LV]7JI6*-<8"'-CV;==E
+M1:/1>#F*(J(H(@Q#K+7D>8XQ!F,,0@C'.7?NW(<G7GWMQ$;[,=:"D!(AQ%^6
+MM19C--98M#%8+*VYH]R_M\[X^#A[J(NB((HBA!`X]7JUNG[O`6OW.S2:4X2A
+M3Q"&!&%`$/A(I;CXT3?H0O/6T@*YSNEWNTQ/Y2@I2=,4*27&&+36>[API!`(
+M!&$I1!>:HM`4><Z]S9C/OMGAR4#@]@8<KGH8:]!%@>MY;&_'&&OP/`^EU#Z.
+MO3XY4BJDE20[.[B^CU22QT\SC!WC]07%TPB^7S_"$V/9ZL0$KB5-4G9V=G"E
+M^1,J`X"4<B^Q0%I)U.O1&>3<N.LR-UGBI:.2Q9;#2PA>;&H^_MKPP]HVK\P)
+MMC8W.3I9)W`5I5)IGZ_6FC`,=Q,C!%+LWO+;QH"M[A@4AH5FB:@W0@C!*$ZH
+MC'ID`T-G$XS6SWB*?;D514&69>1YOLM8()!2HAS%B842QYX7N&Z9<*S"[QN_
+M,$P,M^\F;`T$IXX'!"%D688QANWMF+6U-:RU)$FR)[7=BH4`)25!$.#[/I6:
+MAQ#0Z3_FJ^\2!CN28TV/(S,^C0D?08&4DD)K#M4KS,S.HK4FCF.R+*/=;C]#
+MP:YV/=_##WQ\W\?S/0X==GFG66:K-^)!.R;-!-)U\90"P!@-8K=969:AM=[G
+M+(3`R0M=S#[?I-8/04JD`B,@$Z!<R\28IC:ER;*"/,OIISF.#'%ECM:&1^U'
+M=+H=RN7R?A,!5+5:FYV?:RY.5S15-4P/>XF9K0KGL#<2=3>EYB0<<A.J:MMX
+MV=.XZ@RSZ9J0CB/EK?5;]+?Z**FX??OV7K7YU:M75]3JZNKJYY]_\>V53S[]
+MZL<?;ST<&RLW)Z>F#DFEQ*[6!0A!OQ_I&S=6?[IT^?*E8\<6PI,G3\YN=;?(
+MD@PI)$F2,#X^CK4V7UE965'&F-%P.%R?GY_W+UZ\^,'ITZ=?D%(*QW$HE\L$
+M04">YS0:#7GFS)G)5JLU[ON^TVJUIAOU!F.E,0":S2:.XQ#'<7[]^O45N?=S
+M>9Y7=1QG(LLR?-]'*<5H-")-4X(@(`@"1J.1<%UWP1@SD^<Y69[A>1Z52F5?
+MQ\88`0BUE[C=;C^\>?/FDUZOUTB2I)2FJ4K3E#B.;:?3*>[<N3.X<N7*3Q<N
+M7+A4J52&T]/3QZ,HLL/AT,1Q;),DL5F6L;FYN7WMVK4O#XX6J92:J=5JQ^OU
+M^M$@".K66IDDR;#;[3X8#`8_&V-^G9B8F)F:FGH#*!T8`D11U-_8V+@J_L5,
+@%,_^>/LW9P?-`O8/[J),6R)#IM@`````245.1*Y"8((`
+`
+end
--- kdelibs-3.5.7.orig/debian/system-icons/cr64-device-system.png.uu
+++ kdelibs-3.5.7/debian/system-icons/cr64-device-system.png.uu
@@ -0,0 +1,118 @@
+begin 644 cr64-device-system.png
+MB5!.1PT*&@H````-24A$4@```$````!`"`8```"J:7'>````!F)+1T0`_P#_
+M`/^@O:>3````"7!(67,```L3```+$P$`FIP8````!W1)344'U0<$#`8."YT?
+MG@``$Z))1$%4>-KM6UML&U=Z_LXY,\,AQ:M(2:0NMG6S75M:KQU[9<>)LKM(
+ML4DV%V"#[39Y*@H4[4/[V)>VCWWJ6U_Z4&S1U[QT-\:FB\TBZ\;%IK9C.TY\
+MBW67+2FB1(J4>.?,G'/Z0,YH.*1D.<8"`38##(8:#<^<__N__WH.@6^/;X]O
+MCV^//^*#?&,G1@BBT:@R.CIZF#&6E%*R9QQ2`,BNKZ\OK:RLU.V;RC<5@&@T
+MJK[QQAOO/O?<<W]S].C1`<88!0`IY==2G)12+"TM;5V^?/F]?#[_[Z52*0]`
+M?F,!&!D9.7[V[-F_?^>==T[&XW$0\NQD+10*@U+*@5NW;J5+I=)_`2A]8P%0
+M577L].G3@XE$`E]]]17FY^=AFN;7`H(QAI&1$0P-#6%J:JH[&HW^`,"G`&:5
+M;[!_TOQ^/RL4"KASYPZ.'S\.15%L$WBJP[(LS,S,P._W0]=UJBA*-X!>`,O?
+M9``D(03;V]M()!(8&!B`E-)A`"'DB6"XGRF52B@4"@`@F[[/!X`H]H.!0`#)
+M9!*]O;T^(80&@$@IP3G_6J@_D^12\D0B$:C7ZS`,`YJF(9_/0U$4,,;VG(^4
+M$D((YY12HE@LHE:K@5(*0HASVA@I`#`^/DZGIJ8F(Y'(:_%X_+BNZV$G=@CQ
+M=85XHE;V^9[DG`\^>/!`]_E\L"P+75U=B,?C2*52D%(Z8[@_"R%@618,PT"M
+M5H,0`H00'#IT"+5:#8PQ+P!0CAPY@HL7+[YV[MRY?YZ>GIY(I5),5=5G\KH'
+M98S[.;=`]M5FGV$86%]?Q^SL+%15Q<F3)QT->T&P07:/)83`SLX.=%U'M5IM
+MF8/2V]M[=')R\I]^]K.?G>KN[OY#TOJIV>`^4JD4>GM[\=%''V%M;0WA<+B%
+MG?N-8S-H<G(2^7R^E0&ZKG__PH4+W_E#"N_62OM]6X)&>N.5PZW=5"J%L;$Q
+M5*M5G#]_ODWSG0`GA,`P#-R]>Q=;6UMM\U!T71_K[^_WVS?F%I9P[_Z7?V@G
+M]]3?.7'\*,9&AQ&+Q5"M5A$(!,`8VW<\.VI02M'7UX=2J=3N`QACJJ9ISHU'
+MCU;Q>&T+DJCPZ7ZDAH;`%`6,43#&&J?"0!D#HZY[C((R!DH9**6@E#0U*B&$
+MA!0"AF'B]]=7\/S9?CR8V<38<`Q"<'#.P:WFE7-P(2`X1SZ;Q4XN!P#XWKDP
+MI)1@C,&R+)BF"<NR.@+@]2/[A4[%BP@A!"`45%'1T]\/IKB$<YT=!6>T*;P=
+M<AJ4)D1@(U\!A,`O?K.,NU_F8''@V'@"X`WV2]FXNJ1`I+L;]7H=M4H5`'%L
+MGG..>KW>T52\40$`**400CC7%@9X;<*>?"P>!V.T;6`I&]J4A$`XX(G=ZJ3Y
+MC#-N\^^KUU?QFRMK&#T<02+AP^U[>?SKS^_@S]\81C2B=7P/`,3B<:Q7UEH$
+M,DT3.SL[^VK?ZP>JU2KZ^OI0+I?;`6AC``@TG\^9B)`21$I(*2`E@1`$A`B@
+MJ667[!"20!@6'BP5D=FVH*L$J@(<.12!KJ?QPXLIC`_',+OP.2:.AA&+^L`%
+M;X[=>)=P@4`(A>936P3*9K/X_///.U*Z$P!V,C4Y.=D.@-=#$T*@^C000B"$
+M!"$2A+@U+@`T!7?B[2X%+U_-X<J7$@8)`%"=<0?$`GJ[?;CTVQ5$@NLH5RQ<
+MOYW!Q7-)2"X@1".+DT)`"MMO-,94-!^D%"B7R[`L"\/#PWCAA1<.7!M(*7'C
+MQ@VDT^FV_RDVY5L8($E3ZP)2N`1W-.[2?$-Z/)S?QF"R"Z?&_?C?V7JC_>`Z
+MUN@(AK5E6%8=I;*)[T_%,76FK^$$[=35G<8*`2&%PS[.!4JE*BS+`J7428L/
+M&H*[F_[$Y_,]V00X-R":WI/`)3@A+9V(INQ8?%1"HKL/Z<T<1H\$\/PXQ__,
+MM#>?TE8"2D#"3ZMXL`'\2<E`E[_AF`3G[<([T<-H"6MV<L,YWS-GL#-%^QG.
+MN<.8%@!LK]WB!$%0*9?1%0HU!'9IWLY9;-JOINN(1'M`*$$X',5:.H^+)W44
+M*P404/@4`5-0W'\L49(A0`)%'@8X\*OKV_BS%S5'<,Y%:S'3%-YT`>"-`AV=
+MM"=%9HPY4:#-!#HQ@!""<J$(S:>#:"I:/!VDH_I2Q8"JQ:`H#2I21E$L&4C$
+M5+QRKJN%*3\X)?#?5W/X8B,"2AO//RI&<.MA%M\9]4&()@.X:.8!`D)PE)O>
+M'I!.%*C7Z]C:VMJSAFAK!@J!4JF$>#R.6JW6(B_M'`4`*06V<UF8IMFD9R-)
+ML2R.F>42..?8R@N$@@'GNYN;60ST:>#<@F5QY^3<@I0"KTX%,!'?:C&+^0W:
+M3(`:#."..7#LY+9AFB8Z5:9VTN0N?7>9Q)UDR3`,F*:)5"J%4"CTY#Q@%Q`)
+M836RL7`T!I]?QR?W#`0UCAMK490K1>3*#-%(#8$N'5)(Z%H=4JBPI,=7N/*!
+MZ4D5BQ\74:,A`,!JP8=ZO0)&X0A@FB:*V]L.];V1)A:+861DI"T*V"!X^P)N
+MH-I,P!L&=Z-"TYEPCNVM+/1``)E"%/>-.!+^*JXL]^!$]R:J-0.!+AWY0A&Q
+M+L#BO"F\N\JQ,ST)32.8Z"]C?=N`1"/]6]NL8:!'A<4M5$L55$H%=(IN[L3&
+MK2RO_7<2WBZMVYS@W@QHO7=K7B)3Z\+1[@U,C0.7OS3Q,!.",![CE1].P#)-
+M<"Y`A'"$)RW5G3U!X'O'%$C)(84$%Q)&3:"0SZ-6K4$(OE<T=S3HGE\GH;U=
+M(?=G[_<[`N!-C2FC&.LU45K-8*T8P\W9+6P68QCR;^"[)X<:WY,4W+)V0Z77
+M;S9I((3`^Q^ED=\1D``X%[AP$NCOT<`4"B(`P45'9]9)@P>I.FVSLMEP(`;8
+M9:1=X$3#%#6+(MI5QA>909Q(9%"J:-!]C4HZD8CBT=(ZXN'F!-U:$J(AO!18
+M7*E@=9/9W3@P6<=0R@]`@HC==PLN/`T/.).W+`OE<MDI;O:BOATN3=.$IFD=
+M,\>.89`R"L;0`@"E%*^?,<&8`+F[AHO'%&R7-42C#6=&*$%W[R'4BLL(^EFK
+M]AD%)$`DP9TYRQ$>`)()!E55'.&<$Z29E/$VC68R&7SVV6<M@KL_VXE2J52"
+M81B(1"((!`(X=.A0NPEX:4,I`24,E`',4^+:YY^>H2"4(!+DR.>V$>N.`@#"
+MH2#6=H)@S&SKRVWE:_C=]0(V=URO%!S?&==:FI5N`&PSLD&PQ[*%:]0KH@4`
+M._LK%HNH5JL@A&!H:`BA4`B<<WA3_XXFP!0*)AH,8(RU`4!I`P!5I<CM;,(*
+M!:&H"BK5&KHT"X62A=]=VT:HBX$08"LOD,Y)2,)<*2UP8IAB>"C8T#[W"-_!
+M"=H")I-)C(V-.<T.]RF$<&CO=9*JJK;D%1T!8(PU-$_A".^`X&$#(01]"8J-
+MC17T)`^AF,\@F=#PB]_F\7B3H*4B(@2Q+HZAI`:+"PRF0A@;8F#4Y7?XKM;;
+M$XG=AD@@$$`\'D>]7@?GW)F?$,)I?[O]@#L<=HP"G3R_[0,8:YA!)W,@E(`2
+MBH$^@O7,8\2C#$NK%<RM6FU:5)E`),1PYM08"`,@)+9V\M!5$Y$0VWV>8/>S
+M='3?5@P10N#S^5I:7K8?\88^;UC<EP&0`*%TEP$NX;WF0&@S4A"*0ZG&6L).
+MH8BA/H:-K`G38@!IA+71PQK.G3X,"0EIY,`10"`819>2!V/MPCM"-ZD/TA#0
+M]A?NHL?6M%TA[I43=&1`I[A)*7&TW2:\#8@'!)M)%\\E<?%[@!3`TFH1G`O$
+MPCYT1S7,+%3@T_T82@:QNF&B*]B%?+:`9*+-VILE)_9<!=HOZ]M+^^Y(T\8`
+MQXM"-AD@&R"XA+<9X0;&-@,W"#:#CX[$FDF0!+<$#*X@Y/-A)<,1#,6POOH8
+MO3T*&&5M+'0+[TYHW`SH%/>?E!%Z2V+%;3^`W4>W3Y?-,]KF"VQ@;!`(;0]A
+MLMGN953BN4F&Q4=E4#!4*QF$0QJZ(]INK)>[SWOS>X+6_E^G"O!)VG='C18`
+MW"]2&$5/=PQ<-A,AVP0H;3*#@C$*0AJ]?T(I*&E<&PD@;5^?:S)+"(G3)_RH
+M&A9\*H'@NWU`[DR4M_4$!!<M=N^._][[3ZH-.OD`TUU*QN,QA*,1$-`#;:4B
+MA#@.RU[><C0("4BR&\(D@9!`Q*^Z0*?-_S5Z$$+:S5#AI+]22F2SFPZ%W>"F
+MTVFLK:W!-$V$PV$DD\E]BZ0V`&JUVD(NEZOV]_?[A1#H"OB;M?MNFUJZ*.4=
+M>/<9V4&`AM:%%+MC>/_O6FL0GG?8]]QU@*(HX)RC6JUB>7D9-V_>1*E4<@0:
+M'1W%Z.AH@\V*XIC+GF%P;F[N]S=NW+C_^NNOGZ64PK*L-D%W/[N1M2<F/?=V
+MRUZGU6W_+>&TNEN?E9YGVY\!@&@DBHV-#2PM+^'^O?O(;^<1"H7PTDLO0555
+MW+QY$P\?/L3BXB*$$(C%8CA^_#B"P>">#&#9;'8[E\M5(Y'(1"*1B+!&4":=
+M&XVM3JC3\K2W!O!6E_9G=V3Q?O;F&ZJJ(A`(()?-X>;"36S%ME#>*(.8!*?/
+MG$8\'H>B*(A$(EA=706E%./CXUA86$"Q6$1_?[_C!#5-PY4K5Q9F9F:N`5A1
+M3-,T+U^^_,'R\K*<FIIZZ]BQ8\/!8#!`""%N(5Q)AXQ$(J'Q\?&DIFG4!F&_
+MKNQ>_]_8V"BGT^EU0@AG3C;4>#88#(8F)B;Z=%VG-O6WMK:0J6:PHJQ@L#2(
+MH:XA4$91K]<=8`.!`,KE,G1=!P!4*I6VWF%;2\RRK/SL[.ROY^?G%U55':64
+M=C>7=8AK\D+3-"T6B_4^__SSSQT^?+AW8&"`VB;SI$Z,MT]?*I5P^_9M\^./
+M/WZ<S69G\_G\5X9AU`$0(81\^>673[W\\LMO]_3T^!SG!X*U]3706Q2R)I&M
+M9U$NE3$X,`A%45`H%+"YN8GM[6UL;FY"TS2,C8VU1(V],D$!8$L(<:M>K\\"
+M:%G7TG5=&1X>/GGJU*D?7[APX>+)DR<'""',,`R$P^&V!0IWWK[7TM7L["S>
+M>>>=R&NOO?;\_?OW1ZY?OW[U]NW;OUY>7OZ\5JM5?#Z?X??[WZ*4^CCG,`P#
+M?<D^O/+**\AMY6"8!K[XX@M<N7+%$?;++QO[&J:GIP$`P6`0P6#0Z0?NV11U
+MY5_5YNET-$=&1D(7+EQX]ZVWWOK;\^?/'TLFDZJJJLAFLUA86'!>THE>G8HL
+M*2565E8P,#"`X\>/$TJI/CT]?>0G/_G)X*>??GKFTJ5+__GAAQ_^AZ9I:4*(
+MM/-[F\;A<-AI;R<2"5R[=@T/'SX$YQP]/3TX<^8,PN&PLW_`6Q\\L2'B+D!C
+ML9CZTY_^]*_>???=?SAQXD3<#BL`$(_'&VWMU574ZW4D$@EHFM9QVXI=JN[L
+M[&!]?1V*HF!P<'!W$HJ"@8$!Y<TWWSPV/C[^C[JN1TW37.6<RT[9G'WJNHX7
+M7WP1Y7(9G'.HJ@K17$UR@^8UQY8N^'Y-Q8F)B>^^^>:;?STY.1FWA;`G89HF
+M0J$0CAPY`LNR\.C1(Z33:=3K];8)YW(Y+"XN8GEYV8GER\O+2*?3;87*Q,1$
+MZ.VWW_Z+:#3Z?<NRR'ZIK:U=556A:9I3$>Y7#;:UQ?<#(!Z/CZ52J<%."Y'V
+MRZ24Z.GI<?;FV2"X6UEV`1,*A2"EA&59T#0-FJ;!-,T6QC#&T-_?WQT,!B<X
+MYVP_83I5@GO5`/M&@7UV5Z?GY^>W>WM[`YV^[.TDZ;KN-"F\O3J;ZHJB0-=U
+MV'L1W5M=;&^]N+AH9C(90TI)]LOK]XL\3UH;.!``]^[=^^S]]]__E=_O_\MC
+MQXZI=JO)VYUQU@\H/=`V.7OSHWL,V\1F9V?Y>^^]MU"KU=*,L:,'%>R@YT&=
+M8'.Q<[/PRU_^\M]RN5STU5=?_?&I4Z>"\7B\97O:U]U'["Y+FWY"WKESI_K!
+M!Q_,??CAA_\W/3W=99JFU'5]7]J[V>9VD-Y^H+VQPEY7..@O1N3Z^OK,I4N7
+M_F5N;N[1V;-G?W3Z].F1P<'!KD0B04.A$'1=/_!.#;?_J-5J*)5*,IO-RM75
+MU>K=NW?3UZY=FWGPX,'#2J5RGU(:6UQ<?./$B1-^]P9I=UK-&&MK>GH!<0,6
+M"`20R^7$]O:V\30_F:E7J]4'MV[=^OGL[.QGGWSRR?G1T=')PX</#Z=2J6@R
+MF>R*1"**S^>CFJ9!556BJJI3B=D1PS`,:1@&ZO6Z*!0*?&-CH[*VME9X].A1
+M>GY^?G5U=75E9V=G!<`\@`>93$:=FYM[HU0J34>C4>+-*3IMAGK2KK'-S4W<
+MO7LWM[2TM`[``B">9D>T`B`,(*4HRG`P&!Q.)!*'8[%8?V]O;T\L%@MW=74%
+M&6.ZHBA,TS36W-+&FX=1+!8K^7R^G,EDMO/Y?#Z3R6R52J4MR[(V`7P%X''S
+MNJ/K.EYXX84?34Q,_)VNZ^//^J.IYM;Y\M6K5Q_>N7/GAA#BMP#N?9TMX0H`
+M/X`(@&X`W8RQ.&,L0BD-$D("JJKJJJHJ`*AIFL*R+$L(80DA#,YYA7->`E`$
+MD`>P!2`'8`=`I:D9F^XAO]]_6M.TTP!B`-@S`"#K];I9K]>WI90S`#X#L/4L
+MOT0BS0FI`#0`>O/4FO>8:\*B*9@%H-X\:\VK"8##LU'4]8X`@`2`X+,`X)I'
+MM0EZX6E-X*"@V%>"CKU>]Y+'4XU+GMR@>S(1///X]OBC/_X?WW+/$'5M"S0`
++````245.1*Y"8((`
+`
+end
--- kdelibs-3.5.7.orig/debian/system-icons/cr32-device-system.png.uu
+++ kdelibs-3.5.7/debian/system-icons/cr32-device-system.png.uu
@@ -0,0 +1,50 @@
+begin 644 cr32-device-system.png
+MB5!.1PT*&@H````-24A$4@```"`````@"`8```!S>GKT````!F)+1T0`_P#_
+M`/^@O:>3````"7!(67,```L3```+$P$`FIP8````!W1)344'U0<$#`HGY9K(
+M_@``![])1$%46,/EETMH'=<=QG_G,7,?FGME27[(DBS)LJ+$<NW:*<;IHF`7
+M8NC"34M"8KHJW26TBT)6A4*AD'UH(3OOXM+B0"FMTX()AA)(#'9:*W8:6W6Q
+M'<?66U?W-7?.JXNK.Y:)TX02Z*('#G/NS-SY?^<[W_?_GP/_[TU\E1\K%HMZ
+MUZY=XUKKTG]ZSSG765A8N--NMS/]50(X>?+D2Z^^^NHODB3I"R&$Q\Y8"-%J
+MM3JOO?;:K\Z?/__KKQ*`.'+DR/'IZ>GI>KV.$(\G-X3`\/`P1X\>??'\^?-O
+M:R$$U6I55:O51`BAO/?_5?00@E!*E5=65MBY<R?%8C$/"."]QUI+EF6T6BV4
+M4F6@H@\?/CQU^O3IGQX\>/"H4DI]#G,\[G[W5LB?E\OER31-^>BCCQ@<'*1<
+M+N.])X2`M19C#%)*DB1!2AD`]'///?>S5UYYY4=)DGR!(,.788$08&UMC0\^
+M^("1D1&DE(00$$)0*!0PQF"M14H)@)Z:FCJ<)(GXTY_?86VC0:%<12GU2)=*
+MYN,`6&-96FFB%)2+$N<\WCF,Z6!:35YZ_CL,#0VQ9\\>BL7B)K"0,[&XN$AO
+MJ;766@$TVQU"5*%8&2"*8^(X)B[$Q'%$%,7H2*.4`N!WO_^0#V]L4.V+^,'W
+M]B%PF"PCRS+N;W0@>+(L8V%A@2B*'@'@G$-*F7]+YVH5@D*AA/=^LSN<M5@I
+M`,&%]Y>9?^`@>-;N+'/@R5U<_MM=M`)C'&[S?Z5R'VF:XIPC3=-<`[UFC$$I
+ME;M$]]9"2D'F'-HZI.P&%D*PMI;RR4('XS0WE_H`**CM7+NQPK%OC&"MP=HN
+M6&<=QAG6U]>)XYC)R4D*A<(6?02,,3QX\.#A$O2H4%+1K&^@U0!""A""S'AJ
+MC2)CHX,T&TM\]U`#*>'2C1+WFCOXZZTV$\,-!JH*:RW6&=J-!LXYC#$L+R^C
+MM<Y9Z"U!3Y2/+(&4DN9&'8F@'?JX>==0+6N.')JA5JNQ8T"R8[`+]LD]@3??
+M6>>3Y@!SMQH\,^O).AW6EI>QQN*<1TK9U5$<YX&]]SCG*!:+GP70N]8W-KA\
+M%SKT\?%]J%06V-XOL#;@K`6Z5OO64XY;]Q^01(;:6H?&Q@;>N6ZN]XXHBA@:
+M&J)0*.1)J&?!'@N?8:!W+=!F8:.`Z#08&AC&9`T:&PV4E`0"WGO>>W^9&W<]
+MXSL-@X?+;,V\?G.VK5:++,ORH,88TC3MVOEQ`+36Z$AS;+]BJI8R6"U2Z2LA
+MJWVL/MB@OP+XP-__4>>?]R5(S;X]!>*"1EJ)%=U9>A]H-!I<N7(%(43.0+U>
+M)XHB]N[=FX/-`6BMB>*(*(K06C,YHE%:L;9RC[@T0*WA.?>7580(M*T@*3GV
+MCI38_T2"-=W,)H0``<Y9DB1A>'@X9[;3Z9"F*2$$HBCZ+(!(:Z(HRKN.-%IK
+M1LJ*>G.=N?D&;2/P2&;&-3-3.PG!D1E#,8Z[SGE8[]%:LVW;-H006&L10B"E
+MW&3(Y[K+R[&0$AUM@HB[`"(=H;1B9UGQP^>KU.H9G<RRM)(1T'0R@2<0Q=V9
+M$\@5K^5#^W4ZG5R`UEJV5MPN`\$3QQ']E20/'NL(%6DBK9%*(:6DOYH00F#?
+M1."C^5644(P-]V',IL(S0V9BG/,H'7+;95F6CWL`<A&F:5JSSC/[Y#[2S&T^
+M]'@?\&'SMP]YBG;>X9WC\'1?-_TZAU,"%RE\`?#@O(4`2XM+W+AY@W:[S<C(
+M"*52*1=ESL"Y<^?.SLS,'!@;&]L>B8`7#N=]P-N`#P+GA/,>O`?OP'7'PCND
+M\R%X%Y0/0@0O'(X@NJ]>OG69;"UC=GJ62J7"E2M7B..8\?%QMF_?_A#`6V^]
+M]>;<W%QC9F;FA-:Z[+WW2JEX>GKZB5.G3AU,DD0[Y_),MK7?N7.G\^Z[[WZX
+ML+#P+V-,]L(++WSSQ(D34TM+2WRZ^BEB75`JEXCC&&,,69:1IBG6VH<`K+7-
+MZ]>O__;Z]>MO`]',S,SLZ=.G?W+RY,GQ_OY^E21)7E*WMF:SR;9MVPH3$Q/[
+M+ERX</_LV;-G&HV&&AP<G"H4"KP8O\B]^_>X=OT:P0?&Q\?I[^^G6"SF`+:Z
+MP`%KHZ.CPZ^__OK/GWWVV6\KI6@VFRPM+1%"R/.W<X[U]75:K1;#P\-B=G9V
+MX-BQ8Z>>?OKIX7:[G78Z':RU)-6$O<6]#`T-D6492BF,,70ZG4<F\\BN>&!@
+M8-?DY.0!:VU>RRN5"FF:4JO5'E%PDB0`M%HMM-9,3$Q\;7Y^?J-G-6,,QIB\
+M&F99EENQ5QD!U%8`]7J]WFZW1T='1[]>*!1TKVA(*8FBB#B.*1:+E$JEG)%V
+MN\W\_+QYXXTWKO;U]74.'#BP:ZOGM_:M`.[=N[=X\>+%/SS"0+O=;ITY<^:7
+MERY=NG/\^/'O'SIT:'IL;*R:)(F.XU@JI7J^]LUFT]Z]>[<U-S=W_^+%BU>N
+M7;OVQY=??OF9V[=O'Y!2RJW"W3KNV?#6K5LU[[W]O)UP02FUM[^__]".'3N>
+M&AH:&BL6B]OB.(ZS+'-IFK965U=7%A<7[]1JM9O.N8^!V[MW[]Z]?__^'T=1
+M-/68$U$^3M/47KUZ];W5U=7?B"]Q=BP`):"X13,6Z`#MS>O6TTP%J`+R"_;X
+<#:#V/S\=_QN]U+"7_WN7V0````!)14Y$KD)@@@``
+`
+end
--- kdelibs-3.5.7.orig/debian/system-icons/cr48-device-system.png.uu
+++ kdelibs-3.5.7/debian/system-icons/cr48-device-system.png.uu
@@ -0,0 +1,84 @@
+begin 644 cr48-device-system.png
+MB5!.1PT*&@H````-24A$4@```#`````P"`8```!7`OF'````!F)+1T0`_P#_
+M`/^@O:>3````"7!(67,```L3```+$P$`FIP8````!W1)344'U0<$#`42-+$0
+M$@``#:9)1$%4:-[M6DMO'%=V_NZM6]W5#S:[V>QNOFF+%&7)D2E+\3@T(\S(
+M,63`@1S(\'@P03(K&<C"?R&++++SRD!@P$"\2[S,(%*`&+8<*);\DJQ8]-@:
+M/4F)(L5^L+O5KWK=1Q;55:PBJ8F$#.R-KW!0K.JJ6^<[YSN/>TO`3^.G\?\:
+MY,=ZL:[K4$K1QU:8$"6$4%+*'P<`(00'#QZ<65A8^&4NEYOP+RNE'NG95JM5
+M.7_^_&^7EI:N``#[H0%D,IGDB1,G_O[4J5-_6RP6J6_)1QF44C0:#;SSSCN_
+MN''CQM^9IGG]!P?`&!N:GY\_4BJ5Z+5KUV":YB,]IY2"81C8OW\_%A86GGWO
+MO?>.FJ:Y]H,#4$K1>#RNK:VM(95*8>_>O?#ILQN-"-EB>:52P;U[]Q"/QQDA
+MI`@@P0`@%HMA:&B(Y'*Y!`!=*87'<>UC*"^3R63&<1S--$UD,AE8EN4'=`2$
+M4@I**0@A(*5$M]N%E#(,B`*@+)/)X.C1HT_/S\__9FIJZF`\'C?\AQ_5M8_Z
+MFU)*22D32JGQ.W?N0`@!7=<Q,S.#>#P>&,U_/^<<CN/`=5TPQI!.IT$(`:5;
+MR8L=.G3HP&NOO?;>B1,G7A@:&HJX[(]@\5W/I9102L&V;5R]>A77KU_'Q,1$
+MY+[MSW+.42Z7,3,S`T)(H">;F)CX]<LOO_Q\H5#X8ZC\!\J,`A3QKC$-4BKH
+MNH[Y^7F</7L6G',4"H4=U/6!$$)0K59AFF;$R*Q0*!S(Y_,:`'SVQ26LK6]X
+M!&,QH(_4$VPACUPG('W5I5)`WWJ>]*TI)104E%0`%*3@@)08'2GBSWYV&(5"
+M`=EL%M/3T[O&GE(*A!`,#`R@5JMMSVI,\SE5KE2Q5NUA,)?%<'X$3&=@S!<-
+M3&?0V-8U3=.@:1H((5!0D$+"LAS\T_N7D,O&\1>+XQA(Z>!<@'/NB<MAFCVL
+MW[F+L8D$E/("T[9MF*8)(42$1F&Q+`N4TBB%PB>44NBQ&`:'AK8LISR1BD)*
+M!2(EI)`0$$`_6_G/WUUMXI__90FVJU#9M-'M<IQX:1()@WKS]+G/F([L\#``
+M0`@)*25:K1:JU6H$0!@((02F:6)@8"!*H?`)I12&84!)%5+:>P$1$I(($`((
+M``H*FTT'-U8=K&UR0$FD-!M"4AS_>0G+=QZ@9PLD$PQ"<&\>I0*#&/$X_'2M
+ME`JH\;`8`(!6JX5GGGDFFH7")Y12:+H&J?I*2PDI"`21($2@;QQ8%H?+@;.7
+M6KBT-@!`!P`8RL;0H([3'Z^":12'#PQ"".%9V9>^010A<+A`H]&`4@H'#AS`
+MS,S,0],R(0252@75:C7P2``@3"'7L2%%8DMI$(#X;@5L6V*C*@&B</QG:5P_
+M8Z'E&AXPDD%7N4CG$TCI-F9GAOH`^B#D%AC!!9A&X3A.X`G7=7?4`E^DE."<
+M[_#*#@!FKX/40`J$$`A"`(BM;*@4[MP7&"F5P%V.6KV!$T<(UNL=&(S@UGV.
+M:YN#(#K#`P#_<;F#OSEJ@S$2`)%"0$B)7K<#6AP(E+%M&YU.!T*(70,8`$S3
+MC-!G1Q`30B"%Q(-Z$X-#68#X"=*;I/:`8WAHW`L^I4"4Q/1('$^,,B@%/#L7
+MP^]7NOCP"D-7I5!WTOCF5@W/SK*0)P2L7@^]=AO`**3T%&XVF]!U/8B)[5[P
+MBUFI5,+]^_>C%`K'``#8EHEZE2.;'\+R?8+-CH+M`H9.L'!$@D%#JU'%V`@#
+M=UWXA4`!V#.F8[[:P6=K*0#`<H7BX!.\3QV!3JN%3JL5>%1*!4HI"H4"IJ:F
+M(LK[\>+W0UX&8U$*;<]"0>EV7=0K%=Q:SV'3S8)I`),]E,MU3$^6H.#"U]U'
+MH/I*S>]EJ+?O@V@4$!R<,]BFB6Z[#=NR(A3PTW`L%H-A&('ROM)""%!*(Q[<
+M0:'=``!`O4U0-0T,&U6DXL"];@'ES2ZF)P$E);CC]FFVU2XHI2"Y0%*U(&P.
+M[KIH5#1PSG>\/)PV?3W"J=7W@"_^')$LM!L`2BFH1E$:TE"H/T"=YU'G.@Q>
+MQ_Z9N7Y`.3"9`*$$A-"M;*$$+G_7PJ7?>W,-)04.SNI@8"#4B[$P$!^`;=OH
+M=KN!@F$/<,YAVS8XYXCWZ\=#/4`IA<:TH$TX^C3%@VX3/9<A;5"D4IZ;ATM3
+M:-=O(IO6@R9.$:#9Y/A^6?;;=6"LI($Q!DDEB"`0Q,MJ@HL(7:Y>O8J5E95`
+M\3#_6ZT6E%(8&QO#Z.AHQ&.1%1FA9*O'Z8.@&D5QR#M22E&^7\;H^"A2"0,-
+M'D.YYJ+=Y6!,X>9=!]?O"$CB39M.<#QW(`.F>WW25O/G_0O'0":3P<#`0"3K
+M2"EAFB82B0088\CG\V",/3P&=(UM63_D!4W3/,]H&I*RC68]B6ZOB^*0CO?_
+M;1,=:RMVXC&%D1R0R\0P/1%'*AWSK$KDCK4&T2BDY-`T#7OV[$$NEP/GWKE7
+M\:V`]SZ5PKW1#@`@)%">A<'T/:%1#=D8A6DWH"4IOEAJ192'%!C-*SQ_9`\R
+M`TFTFIMH]TQD4BR@3F27@=`@!OP^S'7=(.>':T'0@FQK-=AVJVA:5'F?4E2C
+M@2<&XQZ=#LP-(I.*X?ZF#<XETHDX9O<4$-==**<,H9(P#`[&0HMS%21<KW"&
+M6@=?0<XY7-<%YSR(@W!L[`K`[\O#RFZ/!Q\`U2@HH9B9SF)V.K=5R)3"E:M-
+MN#0-Q6(P#`ZI*#1&HBTR?!H@THZ'E=U->?\8"6)"B#=Q?W)?^4!VHU,_6WDI
+ME$1<??A/\KAQNPW'L6$D=!3SAI=Q^@"A`$45%/4J,)<RJ*[;\W[8ZF$0.]*H
+M_W`N.X@_'<R"$$\YVM\!\'8"_.4DW5I>AD@M5;]GD@I3I0R4`H3T%C$R=)12
+M>>VZD$@E#)1[]4C6Z?5Z:#:;T#0MV*G8#B+B@4ZGL^HX#C1-P]C(<)^'$DKV
+M+:)\!12$%,'O4DH(Z:W:_'M\!=6VYZ*_>_<(*=%N;-'6=5VLKJ[BXL6+:+?;
+M((1@W[Y]&!X>#M)O&$#@@0L7+IQ>6EIZ]?#APU-;`>VM<56PT4`@E0QEA*T%
+MN^R?[W:MSQCO&/R.@+*$$"02"2S?7<:5[Z[`[M@8GQC'PL(";MVZA:^__AJ&
+M84#7=>S;MP^#@X,[VA%M?7U]_>;-FQVEU+3C.'J]7G>KU:I=J]4\V=RT:[6:
+M95F6YKJN9ED6?+%M&[9MPW&<0%S7#3)(K]?CC4:CW>OU;-,T'<NR;-NVW7@\
+MKL5B,6H8!LH;97Q6^PSK6$>JG<+!@P>12J603":QMK:&D9$1-)M-=#H=E$HE
+M""'@.(Y[^O3I\^UV^S)S',?\Y)-/_O7BQ8NW<[G<(<98UM^W5TI)7=?U0J$P
+M_L8;;_S\Q1=?'`UGB^U!MUV^^NHK\^S9L_]3J51N=#J=NI12#0\/9]]^^^U?
+MSLW-Y0&`:0S96UG4ZC6T91N69<$P#+1:+;1:+30:#1!",#4U%;PW0J'^\4&[
+MW?ZO=KM]"4`"`&6,D=G9V6>.'3OVU\>.'?OSZ>GI@A`"Q6(QPL.';<B6RV4<
+M/WX\O;BX^-RE2Y>R'WWTT;]_\<47OQ5"&`,#`R^E4JF\;=L8&1W!R9=.HM5J
+MX?;R;5RX<`$W;]Y$M5I%H5#`Y.0D=%U'.IT.4FLD"X7>ZP#8]#=[3YX\^5>G
+M3IWZQX6%A?VI5(H*(;"ZNHINMXM<+A?9D`UG!2$$:K4:TNDT9F9F"&,LM;BX
+M>.CUUU^?^^"##V;.G#GS/@#7IYH0`IG!#%+I%/+#>0P/#V-C8P-//?44QL;&
+M@JKLW^M[8-=FSA^SL[-[WWKKK7]87%Q\.MSRCHR,8'-S$]5J%>ET&NET.FC!
+MI91HM]NHU6J04B*93*)6JZ%8+`(`)B<GDV^^^>:O+,L:Y)PGPA3T-[VDE)B8
+MF,#HZ&BD&OO]T!^B4&04B\4GQL?']_BH?:IPSI%,)L$8@VF:J%:KP4Z"GZ'"
+M.W:44MBV'<R;2"38^/CX8<YY(IS;PQ+LX(6:N.V5.-+,[0;@WKU[M\Z?/W_C
+ME5=>.<P8V\%YQAA2J102B02V?TL(5W%"""S+"K;$[]Z]*[[\\LO:W-S<^&Z)
+M8'O/L_WOW9:4VFX`FLWF@Y65E0=*J4/9;#87B\5(>'44MH3/1U_">SC^_9U.
+M!]]\\XW][KOO_N[SSS^_^.JKK\[D\_F!AUEY-X]L4]X]<^;,A5:K]?6N'I!2
+MRLN7+Y]>6UNSSIT[]YL77GCA^;U[]PZ72B5]<'"0Z+H>:C%H1'%?>KT>ZO6Z
+M7%U=[2TM+6V<.W?NNV^__?;BR,C(M=75U2.CHZ.COG=]2OA5.=@E[#>486\P
+MQO#]]]\[IFDZ_]=7RFZY7/[/TZ=/7__TTT^?GYJ:>N[))Y^<FYR<'"\6BYE,
+M)I.,Q^-Z+!:C_59`.8XCN]VNW6@T>NOKZ\V5E97*\O+RG8V-C=N695T'\-WF
+MYN;JQQ]_/-YH-$:3R>3@HWX)\D>OUW,__/##WS6;S2H`]U$^QQ``20##A)#Q
+M6"PVGDJE1N+Q^)"F:0/Q>-R@E&J.XPC.N<LY-WN]7JO7Z]6%$%4`&WVI`>@"
+MD(E$(E<L%O\R%HL=4DH9CP/`LBRG4JFL.H[SWP"6'O=[DM;?R37Z$N^?^[$D
+M`+C]FF+UQ>E?WS[2`/(`8H_YP5T"Z/5KEOW3?[;XL<?_`H39%K)Q`,X5````
+)`$E%3D2N0F""
+`
+end
--- kdelibs-3.5.7.orig/debian/system-icons/cr16-device-system.png.uu
+++ kdelibs-3.5.7/debian/system-icons/cr16-device-system.png.uu
@@ -0,0 +1,22 @@
+begin 644 cr16-device-system.png
+MB5!.1PT*&@H````-24A$4@```!`````0"`8````?\_]A````!F)+1T0`_P#_
+M`/^@O:>3````"7!(67,```L3```+$P$`FIP8````!W1)344'U0<$#`PNRAS7
+MW````M-)1$%4.,NEDTU/7&48AJ_WXWR\,\P9J#BM`IE&0UG4SWXD0&H7MG'E
+MPL#*3;=N^`]N^`']#?X"@RR,"S5!HQF"8ERHL304&.2C4^`,IV?.S/N>UP6$
+MQ+HQ\=D\F^=Z<N>^<\/_'/%?CL;'QYMS<W,/PC`T`$((BJ+H+2TM?:XKE4J4
+M)$DBA)#_1CW6.CL]/?W!PL+"I[5:30&494F>YWY[>WM(+RXN/KQSY[V[_ER-
+MN$`![_'>$T51(J641T='&&.PUM+O]Y%2&GWOWOV/?OUCZTI<'Z5B8DS%8"J&
+MK?8IWW[_A`_?'Z/HYKP6-Z@&)<88RK+$>X\0`BVDE)8`'80$L>'@F>/+KP[9
+MWS_!9QEQM4HI!`>=4YJ-,_!,W-F62DF\&]!YVF6EU>;X5'+WS8#[,Z.4HU,\
+MVCRB>W)"ECU'"HG6&BDE01`@I41**5%2L/K+7WSQS1[MG4-J8<[$\'->%8]Y
+M_.<6>^U=K'4HK0B"X!\*M!`"*25O3<9<NQJ@*S5:/V^S=VC9V2]X=[).J`>4
+MOB0]2<GS@BS+\.<&:X$@CF)*$?!RQ>#IL[43$L:>JV-5:D,&K4-*7S)R:80D
+M&29-4](T/7O@G.N/-J^S^;2@T`(I/3=F7V$PL!1%GVX^8-`K>&-X0)IVZ72.
+M\-[CG,-[C\JR+#2DH3K=[$PV=/7:Y2AJ1#E73(]A<>R.G_RT69?/#B<F+E]:
+M_WU=^(%G8V.#(`A86UM;5>OKZS^NK'SW]<SL[*T;-V]>#\-(&U-!*4T0AB**
+MXW2GW?[M]JW;KP^9(=GK]4B2!*44K59K50,N#,.\V6PVDR2)RK+$6HM2BEJM
+M)I128^UVVSOG1#VIHY4FR[(+(R_*U&@TWIZ9F?EX:FKJG7J]/F*M=;N[NP>M
+M5NL':^VC^?GY3Z24P\XYG'/D>6Z7EY<_>[&-$J@)(:KG.6=`%_!"B)>`6`AQ
+<7A/OO?<G?P/W!TYCC"=.*`````!)14Y$KD)@@@``
+`
+end
--- kdelibs-3.5.7.orig/debian/kdelibs-data.install
+++ kdelibs-3.5.7/debian/kdelibs-data.install
@@ -0,0 +1,4100 @@
+debian/tmp/etc/kde3/colors/40.colors
+debian/tmp/etc/kde3/colors/Rainbow.colors
+debian/tmp/etc/kde3/colors/Royal.colors
+debian/tmp/etc/kde3/colors/Web.colors
+debian/tmp/etc/kde3/ipv6blacklist
+debian/tmp/etc/kde3/katefiletyperc
+debian/tmp/etc/kde3/katesyntaxhighlightingrc
+debian/tmp/etc/kde3/kdebug.areas
+debian/tmp/etc/kde3/kdebugrc
+debian/tmp/etc/kde3/kdeprintrc
+debian/tmp/etc/kde3/ksslcalist
+debian/tmp/etc/kde3/kthemestylerc
+debian/tmp/etc/kde3/language.codes
+debian/tmp/etc/kde3/ui/kprintpreviewui.rc
+debian/tmp/etc/kde3/ui/ui_standards.rc
+debian/tmp/usr/share/applications/kde/kresources.desktop
+debian/tmp/usr/share/apps/dcopidlng/Ast.pm
+debian/tmp/usr/share/apps/dcopidlng/Iter.pm
+debian/tmp/usr/share/apps/dcopidlng/kalyptus
+debian/tmp/usr/share/apps/dcopidlng/kalyptusCxxToDcopIDL.pm
+debian/tmp/usr/share/apps/dcopidlng/kdocAstUtil.pm
+debian/tmp/usr/share/apps/dcopidlng/kdocParseDoc.pm
+debian/tmp/usr/share/apps/dcopidlng/kdocUtil.pm
+debian/tmp/usr/share/apps/kabc/countrytransl.map
+debian/tmp/usr/share/apps/kabc/formats/binary.desktop
+debian/tmp/usr/share/apps/katepart/katepartreadonlyui.rc
+debian/tmp/usr/share/apps/katepart/katepartui.rc
+debian/tmp/usr/share/apps/katepart/scripts/indent/script-indent-c1-test.lua
+debian/tmp/usr/share/apps/katepart/scripts/indent/script-indent-c-test.js
+debian/tmp/usr/share/apps/katepart/scripts/jstest.desktop
+debian/tmp/usr/share/apps/katepart/scripts/jstest.js
+debian/tmp/usr/share/apps/katepart/scripts/script-indent-c-char.js
+debian/tmp/usr/share/apps/katepart/scripts/script-indent-c-newline.js
+debian/tmp/usr/share/apps/katepart/scripts/sort.js
+debian/tmp/usr/share/apps/katepart/syntax/abc.xml
+debian/tmp/usr/share/apps/katepart/syntax/actionscript.xml
+debian/tmp/usr/share/apps/katepart/syntax/ada.xml
+debian/tmp/usr/share/apps/katepart/syntax/ahdl.xml
+debian/tmp/usr/share/apps/katepart/syntax/alert.xml
+debian/tmp/usr/share/apps/katepart/syntax/ansic89.xml
+debian/tmp/usr/share/apps/katepart/syntax/apache.xml
+debian/tmp/usr/share/apps/katepart/syntax/asm6502.xml
+debian/tmp/usr/share/apps/katepart/syntax/asm-avr.xml
+debian/tmp/usr/share/apps/katepart/syntax/asp.xml
+debian/tmp/usr/share/apps/katepart/syntax/awk.xml
+debian/tmp/usr/share/apps/katepart/syntax/bash.xml
+debian/tmp/usr/share/apps/katepart/syntax/bibtex.xml
+debian/tmp/usr/share/apps/katepart/syntax/cgis.xml
+debian/tmp/usr/share/apps/katepart/syntax/cg.xml
+debian/tmp/usr/share/apps/katepart/syntax/changelog.xml
+debian/tmp/usr/share/apps/katepart/syntax/cisco.xml
+debian/tmp/usr/share/apps/katepart/syntax/clipper.xml
+debian/tmp/usr/share/apps/katepart/syntax/cmake.xml
+debian/tmp/usr/share/apps/katepart/syntax/coldfusion.xml
+debian/tmp/usr/share/apps/katepart/syntax/commonlisp.xml
+debian/tmp/usr/share/apps/katepart/syntax/component-pascal.xml
+debian/tmp/usr/share/apps/katepart/syntax/cpp.xml
+debian/tmp/usr/share/apps/katepart/syntax/css-php.xml
+debian/tmp/usr/share/apps/katepart/syntax/css.xml
+debian/tmp/usr/share/apps/katepart/syntax/cs.xml
+debian/tmp/usr/share/apps/katepart/syntax/cue.xml
+debian/tmp/usr/share/apps/katepart/syntax/c.xml
+debian/tmp/usr/share/apps/katepart/syntax/debianchangelog.xml
+debian/tmp/usr/share/apps/katepart/syntax/debiancontrol.xml
+debian/tmp/usr/share/apps/katepart/syntax/desktop.xml
+debian/tmp/usr/share/apps/katepart/syntax/diff.xml
+debian/tmp/usr/share/apps/katepart/syntax/doxygen.xml
+debian/tmp/usr/share/apps/katepart/syntax/d.xml
+debian/tmp/usr/share/apps/katepart/syntax/eiffel.xml
+debian/tmp/usr/share/apps/katepart/syntax/euphoria.xml
+debian/tmp/usr/share/apps/katepart/syntax/e.xml
+debian/tmp/usr/share/apps/katepart/syntax/ferite.xml
+debian/tmp/usr/share/apps/katepart/syntax/fgl-4gl.xml
+debian/tmp/usr/share/apps/katepart/syntax/fgl-per.xml
+debian/tmp/usr/share/apps/katepart/syntax/fortran.xml
+debian/tmp/usr/share/apps/katepart/syntax/fstab.xml
+debian/tmp/usr/share/apps/katepart/syntax/gdl.xml
+debian/tmp/usr/share/apps/katepart/syntax/gettext.xml
+debian/tmp/usr/share/apps/katepart/syntax/glsl.xml
+debian/tmp/usr/share/apps/katepart/syntax/gnuassembler.xml
+debian/tmp/usr/share/apps/katepart/syntax/haskell.xml
+debian/tmp/usr/share/apps/katepart/syntax/html-php.xml
+debian/tmp/usr/share/apps/katepart/syntax/html.xml
+debian/tmp/usr/share/apps/katepart/syntax/idconsole.xml
+debian/tmp/usr/share/apps/katepart/syntax/idl.xml
+debian/tmp/usr/share/apps/katepart/syntax/ilerpg.xml
+debian/tmp/usr/share/apps/katepart/syntax/inform.xml
+debian/tmp/usr/share/apps/katepart/syntax/ini.xml
+debian/tmp/usr/share/apps/katepart/syntax/javadoc.xml
+debian/tmp/usr/share/apps/katepart/syntax/javascript-php.xml
+debian/tmp/usr/share/apps/katepart/syntax/javascript.xml
+debian/tmp/usr/share/apps/katepart/syntax/java.xml
+debian/tmp/usr/share/apps/katepart/syntax/jsp.xml
+debian/tmp/usr/share/apps/katepart/syntax/kbasic.xml
+debian/tmp/usr/share/apps/katepart/syntax/language.dtd
+debian/tmp/usr/share/apps/katepart/syntax/latex.xml
+debian/tmp/usr/share/apps/katepart/syntax/ldif.xml
+debian/tmp/usr/share/apps/katepart/syntax/lex.xml
+debian/tmp/usr/share/apps/katepart/syntax/lilypond.xml
+debian/tmp/usr/share/apps/katepart/syntax/literate-haskell.xml
+debian/tmp/usr/share/apps/katepart/syntax/logtalk.xml
+debian/tmp/usr/share/apps/katepart/syntax/lpc.xml
+debian/tmp/usr/share/apps/katepart/syntax/lua.xml
+debian/tmp/usr/share/apps/katepart/syntax/m3u.xml
+debian/tmp/usr/share/apps/katepart/syntax/mab.xml
+debian/tmp/usr/share/apps/katepart/syntax/makefile.xml
+debian/tmp/usr/share/apps/katepart/syntax/mason.xml
+debian/tmp/usr/share/apps/katepart/syntax/matlab.xml
+debian/tmp/usr/share/apps/katepart/syntax/mediawiki.xml
+debian/tmp/usr/share/apps/katepart/syntax/mips.xml
+debian/tmp/usr/share/apps/katepart/syntax/modula-2.xml
+debian/tmp/usr/share/apps/katepart/syntax/mup.xml
+debian/tmp/usr/share/apps/katepart/syntax/nasm.xml
+debian/tmp/usr/share/apps/katepart/syntax/objectivec.xml
+debian/tmp/usr/share/apps/katepart/syntax/ocaml.xml
+debian/tmp/usr/share/apps/katepart/syntax/octave.xml
+debian/tmp/usr/share/apps/katepart/syntax/pascal.xml
+debian/tmp/usr/share/apps/katepart/syntax/perl.xml
+debian/tmp/usr/share/apps/katepart/syntax/php.xml
+debian/tmp/usr/share/apps/katepart/syntax/picsrc.xml
+debian/tmp/usr/share/apps/katepart/syntax/pike.xml
+debian/tmp/usr/share/apps/katepart/syntax/postscript.xml
+debian/tmp/usr/share/apps/katepart/syntax/povray.xml
+debian/tmp/usr/share/apps/katepart/syntax/progress.xml
+debian/tmp/usr/share/apps/katepart/syntax/prolog.xml
+debian/tmp/usr/share/apps/katepart/syntax/purebasic.xml
+debian/tmp/usr/share/apps/katepart/syntax/python.xml
+debian/tmp/usr/share/apps/katepart/syntax/rexx.xml
+debian/tmp/usr/share/apps/katepart/syntax/rhtml.xml
+debian/tmp/usr/share/apps/katepart/syntax/rib.xml
+debian/tmp/usr/share/apps/katepart/syntax/rpmspec.xml
+debian/tmp/usr/share/apps/katepart/syntax/rsiidl.xml
+debian/tmp/usr/share/apps/katepart/syntax/ruby.xml
+debian/tmp/usr/share/apps/katepart/syntax/r.xml
+debian/tmp/usr/share/apps/katepart/syntax/sather.xml
+debian/tmp/usr/share/apps/katepart/syntax/scheme.xml
+debian/tmp/usr/share/apps/katepart/syntax/sci.xml
+debian/tmp/usr/share/apps/katepart/syntax/sgml.xml
+debian/tmp/usr/share/apps/katepart/syntax/sieve.xml
+debian/tmp/usr/share/apps/katepart/syntax/sml.xml
+debian/tmp/usr/share/apps/katepart/syntax/spice.xml
+debian/tmp/usr/share/apps/katepart/syntax/sql-mysql.xml
+debian/tmp/usr/share/apps/katepart/syntax/sql-postgresql.xml
+debian/tmp/usr/share/apps/katepart/syntax/sql.xml
+debian/tmp/usr/share/apps/katepart/syntax/stata.xml
+debian/tmp/usr/share/apps/katepart/syntax/syntax.template
+debian/tmp/usr/share/apps/katepart/syntax/tcl.xml
+debian/tmp/usr/share/apps/katepart/syntax/tibasic.xml
+debian/tmp/usr/share/apps/katepart/syntax/txt2tags.xml
+debian/tmp/usr/share/apps/katepart/syntax/uscript.xml
+debian/tmp/usr/share/apps/katepart/syntax/velocity.xml
+debian/tmp/usr/share/apps/katepart/syntax/verilog.xml
+debian/tmp/usr/share/apps/katepart/syntax/vhdl.xml
+debian/tmp/usr/share/apps/katepart/syntax/vrml.xml
+debian/tmp/usr/share/apps/katepart/syntax/winehq.xml
+debian/tmp/usr/share/apps/katepart/syntax/xharbour.xml
+debian/tmp/usr/share/apps/katepart/syntax/xmldebug.xml
+debian/tmp/usr/share/apps/katepart/syntax/xml.xml
+debian/tmp/usr/share/apps/katepart/syntax/xslt.xml
+debian/tmp/usr/share/apps/katepart/syntax/yacas.xml
+debian/tmp/usr/share/apps/katepart/syntax/yacc.xml
+debian/tmp/usr/share/apps/kcertpart/kcertpart.rc
+debian/tmp/usr/share/apps/kcm_componentchooser/kcm_instantmessenger.desktop
+debian/tmp/usr/share/apps/kcm_componentchooser/kcm_ktexteditor.desktop
+debian/tmp/usr/share/apps/kconf_update/kcookiescfg.upd
+debian/tmp/usr/share/apps/kconf_update/kded.upd
+debian/tmp/usr/share/apps/kconf_update/kdeprintrc.upd
+debian/tmp/usr/share/apps/kconf_update/kio_help.upd
+debian/tmp/usr/share/apps/kconf_update/kioslave.upd
+debian/tmp/usr/share/apps/kconf_update/move_kio_help_cache.sh
+debian/tmp/usr/share/apps/kconf_update/proxytype.pl
+debian/tmp/usr/share/apps/kconf_update/useragent.pl
+debian/tmp/usr/share/apps/kdeprint/apsdriver1
+debian/tmp/usr/share/apps/kdeprint/apsdriver2
+debian/tmp/usr/share/apps/kdeprint/cupsd.conf.template
+debian/tmp/usr/share/apps/kdeprint/cups_logo.png
+debian/tmp/usr/share/apps/kdeprint/filters/enscript.desktop
+debian/tmp/usr/share/apps/kdeprint/filters/enscript.xml
+debian/tmp/usr/share/apps/kdeprint/filters/imagetops.desktop
+debian/tmp/usr/share/apps/kdeprint/filters/imagetops.xml
+debian/tmp/usr/share/apps/kdeprint/filters/pdfwrite.desktop
+debian/tmp/usr/share/apps/kdeprint/filters/pdfwrite.xml
+debian/tmp/usr/share/apps/kdeprint/filters/poster.desktop
+debian/tmp/usr/share/apps/kdeprint/filters/poster.xml
+debian/tmp/usr/share/apps/kdeprint/filters/ps2pdf.desktop
+debian/tmp/usr/share/apps/kdeprint/filters/ps2pdf.xml
+debian/tmp/usr/share/apps/kdeprint/filters/psbook1.desktop
+debian/tmp/usr/share/apps/kdeprint/filters/psbook1.xml
+debian/tmp/usr/share/apps/kdeprint/filters/psbook2.desktop
+debian/tmp/usr/share/apps/kdeprint/filters/psbook2.xml
+debian/tmp/usr/share/apps/kdeprint/filters/psbook.desktop
+debian/tmp/usr/share/apps/kdeprint/filters/psbook.xml
+debian/tmp/usr/share/apps/kdeprint/filters/psnup.desktop
+debian/tmp/usr/share/apps/kdeprint/filters/psnup.xml
+debian/tmp/usr/share/apps/kdeprint/filters/psselect.desktop
+debian/tmp/usr/share/apps/kdeprint/filters/psselect.xml
+debian/tmp/usr/share/apps/kdeprint/icons/crystalsvg/16x16/actions/filterstop.png
+debian/tmp/usr/share/apps/kdeprint/icons/crystalsvg/16x16/actions/kdeprint_restartsrv.png
+debian/tmp/usr/share/apps/kdeprint/icons/crystalsvg/16x16/actions/kdeprint_uploadsmb.png
+debian/tmp/usr/share/apps/kdeprint/icons/crystalsvg/16x16/apps/kdeprint_computer.png
+debian/tmp/usr/share/apps/kdeprint/icons/crystalsvg/16x16/apps/kdeprint_job_cancelled.png
+debian/tmp/usr/share/apps/kdeprint/icons/crystalsvg/16x16/apps/kdeprint_job_completed.png
+debian/tmp/usr/share/apps/kdeprint/icons/crystalsvg/16x16/apps/kdeprint_job_error.png
+debian/tmp/usr/share/apps/kdeprint/icons/crystalsvg/16x16/apps/kdeprint_job.png
+debian/tmp/usr/share/apps/kdeprint/icons/crystalsvg/16x16/apps/kdeprint_job_process.png
+debian/tmp/usr/share/apps/kdeprint/icons/crystalsvg/16x16/apps/kdeprint_job_stopped.png
+debian/tmp/usr/share/apps/kdeprint/icons/crystalsvg/16x16/apps/kdeprint_printer_class.png
+debian/tmp/usr/share/apps/kdeprint/icons/crystalsvg/16x16/apps/kdeprint_printer_class_process.png
+debian/tmp/usr/share/apps/kdeprint/icons/crystalsvg/16x16/apps/kdeprint_printer_class_stopped.png
+debian/tmp/usr/share/apps/kdeprint/icons/crystalsvg/16x16/apps/kdeprint_printer_defect.png
+debian/tmp/usr/share/apps/kdeprint/icons/crystalsvg/16x16/apps/kdeprint_printer.png
+debian/tmp/usr/share/apps/kdeprint/icons/crystalsvg/16x16/apps/kdeprint_printer_process.png
+debian/tmp/usr/share/apps/kdeprint/icons/crystalsvg/16x16/apps/kdeprint_printer_remote.png
+debian/tmp/usr/share/apps/kdeprint/icons/crystalsvg/16x16/apps/kdeprint_printer_remote_process.png
+debian/tmp/usr/share/apps/kdeprint/icons/crystalsvg/16x16/apps/kdeprint_printer_remote_stopped.png
+debian/tmp/usr/share/apps/kdeprint/icons/crystalsvg/16x16/apps/kdeprint_printer_stopped.png
+debian/tmp/usr/share/apps/kdeprint/icons/crystalsvg/22x22/actions/history.png
+debian/tmp/usr/share/apps/kdeprint/icons/crystalsvg/22x22/actions/kdeprint_addprinter.png
+debian/tmp/usr/share/apps/kdeprint/icons/crystalsvg/22x22/actions/kdeprint_addpseudo.png
+debian/tmp/usr/share/apps/kdeprint/icons/crystalsvg/22x22/actions/kdeprint_configmgr.png
+debian/tmp/usr/share/apps/kdeprint/icons/crystalsvg/22x22/actions/kdeprint_configsrv.png
+debian/tmp/usr/share/apps/kdeprint/icons/crystalsvg/22x22/actions/kdeprint_defaulthard.png
+debian/tmp/usr/share/apps/kdeprint/icons/crystalsvg/22x22/actions/kdeprint_defaultsoft.png
+debian/tmp/usr/share/apps/kdeprint/icons/crystalsvg/22x22/actions/kdeprint_enableprinter.png
+debian/tmp/usr/share/apps/kdeprint/icons/crystalsvg/22x22/actions/kdeprint_printer_infos.png
+debian/tmp/usr/share/apps/kdeprint/icons/crystalsvg/22x22/actions/kdeprint_printer.png
+debian/tmp/usr/share/apps/kdeprint/icons/crystalsvg/22x22/actions/kdeprint_printstate.png
+debian/tmp/usr/share/apps/kdeprint/icons/crystalsvg/22x22/actions/kdeprint_queuestate.png
+debian/tmp/usr/share/apps/kdeprint/icons/crystalsvg/22x22/actions/kdeprint_report.png
+debian/tmp/usr/share/apps/kdeprint/icons/crystalsvg/22x22/actions/kdeprint_restartsrv.png
+debian/tmp/usr/share/apps/kdeprint/icons/crystalsvg/22x22/actions/kdeprint_stopprinter.png
+debian/tmp/usr/share/apps/kdeprint/icons/crystalsvg/22x22/actions/kdeprint_testprinter.png
+debian/tmp/usr/share/apps/kdeprint/icons/crystalsvg/22x22/actions/kdeprint_uploadsmb.png
+debian/tmp/usr/share/apps/kdeprint/icons/crystalsvg/22x22/actions/package_utilities.png
+debian/tmp/usr/share/apps/kdeprint/icons/crystalsvg/22x22/apps/kdeprint_printer.png
+debian/tmp/usr/share/apps/kdeprint/icons/crystalsvg/32x32/actions/kdeprint_inklevel.png
+debian/tmp/usr/share/apps/kdeprint/icons/crystalsvg/32x32/apps/kdeprint_printer_class.png
+debian/tmp/usr/share/apps/kdeprint/icons/crystalsvg/32x32/apps/kdeprint_printer_class_process.png
+debian/tmp/usr/share/apps/kdeprint/icons/crystalsvg/32x32/apps/kdeprint_printer_class_stopped.png
+debian/tmp/usr/share/apps/kdeprint/icons/crystalsvg/32x32/apps/kdeprint_printer_defect.png
+debian/tmp/usr/share/apps/kdeprint/icons/crystalsvg/32x32/apps/kdeprint_printer.png
+debian/tmp/usr/share/apps/kdeprint/icons/crystalsvg/32x32/apps/kdeprint_printer_process.png
+debian/tmp/usr/share/apps/kdeprint/icons/crystalsvg/32x32/apps/kdeprint_printer_remote.png
+debian/tmp/usr/share/apps/kdeprint/icons/crystalsvg/32x32/apps/kdeprint_printer_remote_process.png
+debian/tmp/usr/share/apps/kdeprint/icons/crystalsvg/32x32/apps/kdeprint_printer_remote_stopped.png
+debian/tmp/usr/share/apps/kdeprint/icons/crystalsvg/32x32/apps/kdeprint_printer_stopped.png
+debian/tmp/usr/share/apps/kdeprint/icons/crystalsvg/32x32/apps/kdeprint_printer_users.png
+debian/tmp/usr/share/apps/kdeprint/icons/crystalsvg/48x48/apps/kdeprint_printer_class.png
+debian/tmp/usr/share/apps/kdeprint/icons/crystalsvg/48x48/apps/kdeprint_printer.png
+debian/tmp/usr/share/apps/kdeprint/icons/crystalsvg/64x64/apps/kdeprint_printer_class.png
+debian/tmp/usr/share/apps/kdeprint/icons/crystalsvg/64x64/apps/kdeprint_printer.png
+debian/tmp/usr/share/apps/kdeprint/kde_logo.png
+debian/tmp/usr/share/apps/kdeprint/lprngtooldriver1
+debian/tmp/usr/share/apps/kdeprint/pics/kdeprint_collate.png
+debian/tmp/usr/share/apps/kdeprint/pics/kdeprint_collate_reverse.png
+debian/tmp/usr/share/apps/kdeprint/pics/kdeprint_color.png
+debian/tmp/usr/share/apps/kdeprint/pics/kdeprint_duplex_long.png
+debian/tmp/usr/share/apps/kdeprint/pics/kdeprint_duplex_none.png
+debian/tmp/usr/share/apps/kdeprint/pics/kdeprint_duplex_short.png
+debian/tmp/usr/share/apps/kdeprint/pics/kdeprint_grayscale.png
+debian/tmp/usr/share/apps/kdeprint/pics/kdeprint_landscape.png
+debian/tmp/usr/share/apps/kdeprint/pics/kdeprint_nup1.png
+debian/tmp/usr/share/apps/kdeprint/pics/kdeprint_nup2.png
+debian/tmp/usr/share/apps/kdeprint/pics/kdeprint_nup4.png
+debian/tmp/usr/share/apps/kdeprint/pics/kdeprint_nupother.png
+debian/tmp/usr/share/apps/kdeprint/pics/kdeprint_portrait.png
+debian/tmp/usr/share/apps/kdeprint/pics/kdeprint_prettyprint.png
+debian/tmp/usr/share/apps/kdeprint/pics/kdeprint_revlandscape.png
+debian/tmp/usr/share/apps/kdeprint/pics/kdeprint_revportrait.png
+debian/tmp/usr/share/apps/kdeprint/pics/kdeprint_uncollate.png
+debian/tmp/usr/share/apps/kdeprint/pics/kdeprint_uncollate_reverse.png
+debian/tmp/usr/share/apps/kdeprint/plugins/cups.print
+debian/tmp/usr/share/apps/kdeprint/plugins/ext.print
+debian/tmp/usr/share/apps/kdeprint/plugins/lpdunix.print
+debian/tmp/usr/share/apps/kdeprint/plugins/lpr.print
+debian/tmp/usr/share/apps/kdeprint/plugins/rlpr.print
+debian/tmp/usr/share/apps/kdeprint/preview-mini.png
+debian/tmp/usr/share/apps/kdeprint/preview.png
+debian/tmp/usr/share/apps/kdeprint/side.png
+debian/tmp/usr/share/apps/kdeprint/specials.desktop
+debian/tmp/usr/share/apps/kdeprint/testprint.ps
+debian/tmp/usr/share/apps/kdeprint/tiledown.png
+debian/tmp/usr/share/apps/kdeprint/tileup.png
+debian/tmp/usr/share/apps/kdeprint/tools/escputil.desktop
+debian/tmp/usr/share/apps/kdeui/about/bar-bottom-left.png
+debian/tmp/usr/share/apps/kdeui/about/bar-bottom-middle.png
+debian/tmp/usr/share/apps/kdeui/about/bar-bottom-right.png
+debian/tmp/usr/share/apps/kdeui/about/bar-middle-left.png
+debian/tmp/usr/share/apps/kdeui/about/bar-middle-right.png
+debian/tmp/usr/share/apps/kdeui/about/bar-top-left.png
+debian/tmp/usr/share/apps/kdeui/about/bar-top-middle.png
+debian/tmp/usr/share/apps/kdeui/about/bar-top-right.png
+debian/tmp/usr/share/apps/kdeui/about/bottom-left.png
+debian/tmp/usr/share/apps/kdeui/about/bottom-middle.png
+debian/tmp/usr/share/apps/kdeui/about/bottom-right.png
+debian/tmp/usr/share/apps/kdeui/about/box-bottom-left.png
+debian/tmp/usr/share/apps/kdeui/about/box-bottom-middle.png
+debian/tmp/usr/share/apps/kdeui/about/box-bottom-right.png
+debian/tmp/usr/share/apps/kdeui/about/box-middle-left.png
+debian/tmp/usr/share/apps/kdeui/about/box-middle-right.png
+debian/tmp/usr/share/apps/kdeui/about/box-top-left.png
+debian/tmp/usr/share/apps/kdeui/about/box-top-middle.png
+debian/tmp/usr/share/apps/kdeui/about/box-top-right.png
+debian/tmp/usr/share/apps/kdeui/about/kde_infopage.css
+debian/tmp/usr/share/apps/kdeui/about/kde_infopage_rtl.css
+debian/tmp/usr/share/apps/kdeui/about/top-left.png
+debian/tmp/usr/share/apps/kdeui/about/top-middle.png
+debian/tmp/usr/share/apps/kdeui/pics/aboutkde.png
+debian/tmp/usr/share/apps/kdeui/pics/ktip-background.png
+debian/tmp/usr/share/apps/kdeui/pics/ktip-bulb.png
+debian/tmp/usr/share/apps/kdewidgets/pics/kactionselector.png
+debian/tmp/usr/share/apps/kdewidgets/pics/kactivelabel.png
+debian/tmp/usr/share/apps/kdewidgets/pics/kcharselect.png
+debian/tmp/usr/share/apps/kdewidgets/pics/kcmodule.png
+debian/tmp/usr/share/apps/kdewidgets/pics/kcolorbutton.png
+debian/tmp/usr/share/apps/kdewidgets/pics/kcolorcombo.png
+debian/tmp/usr/share/apps/kdewidgets/pics/kcombobox.png
+debian/tmp/usr/share/apps/kdewidgets/pics/kdatepicker.png
+debian/tmp/usr/share/apps/kdewidgets/pics/kdatetable.png
+debian/tmp/usr/share/apps/kdewidgets/pics/kdatetimewidget.png
+debian/tmp/usr/share/apps/kdewidgets/pics/kdatewidget.png
+debian/tmp/usr/share/apps/kdewidgets/pics/kdialog.png
+debian/tmp/usr/share/apps/kdewidgets/pics/kdoublenuminput.png
+debian/tmp/usr/share/apps/kdewidgets/pics/kdoublespinbox.png
+debian/tmp/usr/share/apps/kdewidgets/pics/kdualcolorbutton.png
+debian/tmp/usr/share/apps/kdewidgets/pics/keditlistbox.png
+debian/tmp/usr/share/apps/kdewidgets/pics/kfontcombo.png
+debian/tmp/usr/share/apps/kdewidgets/pics/kfontrequester.png
+debian/tmp/usr/share/apps/kdewidgets/pics/kgradientselector.png
+debian/tmp/usr/share/apps/kdewidgets/pics/khistorycombo.png
+debian/tmp/usr/share/apps/kdewidgets/pics/khsselector.png
+debian/tmp/usr/share/apps/kdewidgets/pics/kiconbutton.png
+debian/tmp/usr/share/apps/kdewidgets/pics/kiconview.png
+debian/tmp/usr/share/apps/kdewidgets/pics/kintnuminput.png
+debian/tmp/usr/share/apps/kdewidgets/pics/kintspinbox.png
+debian/tmp/usr/share/apps/kdewidgets/pics/kkeybutton.png
+debian/tmp/usr/share/apps/kdewidgets/pics/kled.png
+debian/tmp/usr/share/apps/kdewidgets/pics/klineedit.png
+debian/tmp/usr/share/apps/kdewidgets/pics/klistbox.png
+debian/tmp/usr/share/apps/kdewidgets/pics/klistview.png
+debian/tmp/usr/share/apps/kdewidgets/pics/kpalettetable.png
+debian/tmp/usr/share/apps/kdewidgets/pics/kpasswordedit.png
+debian/tmp/usr/share/apps/kdewidgets/pics/kprogress.png
+debian/tmp/usr/share/apps/kdewidgets/pics/kpushbutton.png
+debian/tmp/usr/share/apps/kdewidgets/pics/krestrictedline.png
+debian/tmp/usr/share/apps/kdewidgets/pics/kruler.png
+debian/tmp/usr/share/apps/kdewidgets/pics/ksqueezedtextlabel.png
+debian/tmp/usr/share/apps/kdewidgets/pics/ktextbrowser.png
+debian/tmp/usr/share/apps/kdewidgets/pics/ktextedit.png
+debian/tmp/usr/share/apps/kdewidgets/pics/ktimewidget.png
+debian/tmp/usr/share/apps/kdewidgets/pics/kurlcomborequester.png
+debian/tmp/usr/share/apps/kdewidgets/pics/kurllabel.png
+debian/tmp/usr/share/apps/kdewidgets/pics/kurlrequester.png
+debian/tmp/usr/share/apps/khtml/css/html4.css
+debian/tmp/usr/share/apps/khtml/css/quirks.css
+debian/tmp/usr/share/apps/khtml/domain_info
+debian/tmp/usr/share/apps/khtml/icons/crystalsvg/128x128/actions/bug.png
+debian/tmp/usr/share/apps/khtml/icons/crystalsvg/16x16/actions/bug.png
+debian/tmp/usr/share/apps/khtml/icons/crystalsvg/16x16/actions/images_display.png
+debian/tmp/usr/share/apps/khtml/icons/crystalsvg/16x16/actions/wallet_open.png
+debian/tmp/usr/share/apps/khtml/icons/crystalsvg/22x22/actions/bug.png
+debian/tmp/usr/share/apps/khtml/icons/crystalsvg/22x22/actions/images_display.png
+debian/tmp/usr/share/apps/khtml/icons/crystalsvg/32x32/actions/bug.png
+debian/tmp/usr/share/apps/khtml/icons/crystalsvg/32x32/actions/images_display.png
+debian/tmp/usr/share/apps/khtml/icons/crystalsvg/48x48/actions/bug.png
+debian/tmp/usr/share/apps/khtml/icons/crystalsvg/64x64/actions/bug.png
+debian/tmp/usr/share/apps/khtml/khtml_browser.rc
+debian/tmp/usr/share/apps/khtml/khtml_popupmenu.rc
+debian/tmp/usr/share/apps/khtml/khtml.rc
+debian/tmp/usr/share/apps/kio_uiserver/icons/crystalsvg/16x16/apps/kio_uiserver.png
+debian/tmp/usr/share/apps/kjava/icons/crystalsvg/16x16/actions/java.png
+debian/tmp/usr/share/apps/kjava/kjava.jar
+debian/tmp/usr/share/apps/kjava/kjava.policy
+debian/tmp/usr/share/apps/kjava/pluginsinfo
+debian/tmp/usr/share/apps/knewstuff/types
+debian/tmp/usr/share/apps/knotify/eventsrc
+debian/tmp/usr/share/apps/ksgmltools2/customization/af/catalog
+debian/tmp/usr/share/apps/ksgmltools2/customization/af/entities/fdl-notice.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/af/entities/gpl-notice.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/af/entities/help-menu.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/af/entities/install-compile.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/af/entities/install-intro.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/af/entities/lgpl-notice.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/af/entities/report-bugs.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/af/entities/underArtisticLicense.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/af/entities/underBSDLicense.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/af/entities/underFDL.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/af/entities/underGPL.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/af/entities/underX11License.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/af/entities/update-doc.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/af/lang.entities
+debian/tmp/usr/share/apps/ksgmltools2/customization/af/strings.entities
+debian/tmp/usr/share/apps/ksgmltools2/customization/af/user.entities
+debian/tmp/usr/share/apps/ksgmltools2/customization/bg/catalog
+debian/tmp/usr/share/apps/ksgmltools2/customization/bg/contributor.entities
+debian/tmp/usr/share/apps/ksgmltools2/customization/bg/entities/fdl-notice.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/bg/entities/gpl-notice.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/bg/entities/help-menu.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/bg/entities/install-compile.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/bg/entities/install-intro.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/bg/entities/lgpl-notice.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/bg/entities/report-bugs.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/bg/entities/underArtisticLicense.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/bg/entities/underBSDLicense.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/bg/entities/underFDL.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/bg/entities/underGPL.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/bg/entities/underX11License.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/bg/entities/update-doc.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/bg/lang.entities
+debian/tmp/usr/share/apps/ksgmltools2/customization/bg/strings.entities
+debian/tmp/usr/share/apps/ksgmltools2/customization/bg/user.entities
+debian/tmp/usr/share/apps/ksgmltools2/customization/ca/catalog
+debian/tmp/usr/share/apps/ksgmltools2/customization/ca/entities/fdl-notice.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/ca/entities/gpl-notice.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/ca/entities/help-menu.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/ca/entities/install-compile.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/ca/entities/install-intro.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/ca/entities/lgpl-notice.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/ca/entities/report-bugs.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/ca/entities/underArtisticLicense.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/ca/entities/underBSDLicense.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/ca/entities/underFDL.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/ca/entities/underGPL.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/ca/entities/underLGPL.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/ca/entities/underX11License.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/ca/entities/update-doc.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/ca/lang.entities
+debian/tmp/usr/share/apps/ksgmltools2/customization/ca/strings.entities
+debian/tmp/usr/share/apps/ksgmltools2/customization/catalog
+debian/tmp/usr/share/apps/ksgmltools2/customization/ca/user.entities
+debian/tmp/usr/share/apps/ksgmltools2/customization/cs/catalog
+debian/tmp/usr/share/apps/ksgmltools2/customization/cs/entities/fdl-notice.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/cs/entities/gpl-notice.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/cs/entities/help-menu.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/cs/entities/install-compile.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/cs/entities/install-intro.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/cs/entities/lgpl-notice.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/cs/entities/report-bugs.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/cs/entities/underArtisticLicense.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/cs/entities/underBSDLicense.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/cs/entities/underFDL.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/cs/entities/underGPL.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/cs/entities/underX11License.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/cs/entities/update-doc.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/cs/lang.entities
+debian/tmp/usr/share/apps/ksgmltools2/customization/cs/strings.entities
+debian/tmp/usr/share/apps/ksgmltools2/customization/cs/user.entities
+debian/tmp/usr/share/apps/ksgmltools2/customization/da/catalog
+debian/tmp/usr/share/apps/ksgmltools2/customization/da/entities/fdl-notice.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/da/entities/gpl-notice.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/da/entities/help-menu.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/da/entities/install-compile.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/da/entities/install-intro.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/da/entities/lgpl-notice.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/da/entities/report-bugs.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/da/entities/underArtisticLicense.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/da/entities/underBSDLicense.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/da/entities/underFDL.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/da/entities/underGPL.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/da/entities/underLGPL.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/da/entities/underX11License.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/da/entities/update-doc.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/da/lang.entities
+debian/tmp/usr/share/apps/ksgmltools2/customization/da/strings.entities
+debian/tmp/usr/share/apps/ksgmltools2/customization/da/user.entities
+debian/tmp/usr/share/apps/ksgmltools2/customization/de/catalog
+debian/tmp/usr/share/apps/ksgmltools2/customization/de/entities/underLGPL.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/de/entities/fdl-notice.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/de/entities/gpl-notice.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/de/entities/help-menu.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/de/entities/install-compile.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/de/entities/install-intro.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/de/entities/lgpl-notice.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/de/entities/report-bugs.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/de/entities/underArtisticLicense.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/de/entities/underBSDLicense.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/de/entities/underFDL.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/de/entities/underGPL.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/de/entities/underX11License.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/de/entities/update-doc.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/de/lang.entities
+debian/tmp/usr/share/apps/ksgmltools2/customization/de/strings.entities
+debian/tmp/usr/share/apps/ksgmltools2/customization/de/user.entities
+debian/tmp/usr/share/apps/ksgmltools2/customization/dtd/kdex.dtd
+debian/tmp/usr/share/apps/ksgmltools2/customization/dtd/modifications.elements
+debian/tmp/usr/share/apps/ksgmltools2/customization/dtd/rdbhier2.elements
+debian/tmp/usr/share/apps/ksgmltools2/customization/dtd/rdbpool.elements
+debian/tmp/usr/share/apps/ksgmltools2/customization/el/catalog
+debian/tmp/usr/share/apps/ksgmltools2/customization/el/entities/fdl-notice.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/el/entities/gpl-notice.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/el/entities/help-menu.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/el/entities/install-compile.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/el/entities/install-intro.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/el/entities/lgpl-notice.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/el/entities/report-bugs.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/el/entities/underArtisticLicense.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/el/entities/underBSDLicense.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/el/entities/underFDL.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/el/entities/underGPL.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/el/entities/underX11License.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/el/entities/update-doc.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/el/lang.entities
+debian/tmp/usr/share/apps/ksgmltools2/customization/el/strings.entities
+debian/tmp/usr/share/apps/ksgmltools2/customization/el/user.entities
+debian/tmp/usr/share/apps/ksgmltools2/customization/en/catalog
+debian/tmp/usr/share/apps/ksgmltools2/customization/en/entities/fdl-notice.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/en/entities/gpl-notice.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/en/entities/help-menu.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/en/entities/install-compile.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/en/entities/install-intro.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/en/entities/lgpl-notice.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/en/entities/report-bugs.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/en/entities/underArtisticLicense.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/en/entities/underBSDLicense.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/en/entities/underFDL.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/en/entities/underGPL.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/en/entities/underLGPL.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/en/entities/underX11License.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/en/entities/update-doc.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/en-GB/catalog
+debian/tmp/usr/share/apps/ksgmltools2/customization/en-GB/entities/fdl-notice.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/en-GB/entities/gpl-notice.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/en-GB/entities/help-menu.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/en-GB/entities/install-compile.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/en-GB/entities/install-intro.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/en-GB/entities/lgpl-notice.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/en-GB/entities/report-bugs.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/en-GB/entities/underArtisticLicense.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/en-GB/entities/underBSDLicense.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/en-GB/entities/underFDL.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/en-GB/entities/underGPL.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/en-GB/entities/underX11License.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/en-GB/entities/update-doc.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/en-GB/lang.entities
+debian/tmp/usr/share/apps/ksgmltools2/customization/en-GB/strings.entities
+debian/tmp/usr/share/apps/ksgmltools2/customization/en-GB/user.entities
+debian/tmp/usr/share/apps/ksgmltools2/customization/en/lang.entities
+debian/tmp/usr/share/apps/ksgmltools2/customization/en/strings.entities
+debian/tmp/usr/share/apps/ksgmltools2/customization/entities/contributor.entities
+debian/tmp/usr/share/apps/ksgmltools2/customization/entities/general.entities
+debian/tmp/usr/share/apps/ksgmltools2/customization/entities/l10n.entities
+debian/tmp/usr/share/apps/ksgmltools2/customization/en/user.entities
+debian/tmp/usr/share/apps/ksgmltools2/customization/es/catalog
+debian/tmp/usr/share/apps/ksgmltools2/customization/es/entities/fdl-notice.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/es/entities/gpl-notice.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/es/entities/help-menu.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/es/entities/install-compile.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/es/entities/install-intro.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/es/entities/lgpl-notice.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/es/entities/report-bugs.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/es/entities/underArtisticLicense.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/es/entities/underBSDLicense.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/es/entities/underFDL.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/es/entities/underGPL.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/es/entities/underX11License.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/es/entities/update-doc.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/es/lang.entities
+debian/tmp/usr/share/apps/ksgmltools2/customization/es/strings.entities
+debian/tmp/usr/share/apps/ksgmltools2/customization/es/user.entities
+debian/tmp/usr/share/apps/ksgmltools2/customization/et/catalog
+debian/tmp/usr/share/apps/ksgmltools2/customization/et/entities/fdl-notice.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/et/entities/gpl-notice.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/et/entities/help-menu.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/et/entities/install-compile.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/et/entities/install-intro.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/et/entities/lgpl-notice.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/et/entities/report-bugs.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/et/entities/underArtisticLicense.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/et/entities/underBSDLicense.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/et/entities/underFDL.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/et/entities/underGPL.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/et/entities/underLGPL.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/et/entities/underX11License.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/et/entities/update-doc.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/et/lang.entities
+debian/tmp/usr/share/apps/ksgmltools2/customization/et/strings.entities
+debian/tmp/usr/share/apps/ksgmltools2/customization/et/user.entities
+debian/tmp/usr/share/apps/ksgmltools2/customization/fi/catalog
+debian/tmp/usr/share/apps/ksgmltools2/customization/fi/entities/fdl-notice.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/fi/entities/gpl-notice.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/fi/entities/help-menu.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/fi/entities/install-compile.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/fi/entities/install-intro.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/fi/entities/lgpl-notice.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/fi/entities/report-bugs.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/fi/entities/underArtisticLicense.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/fi/entities/underBSDLicense.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/fi/entities/underFDL.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/fi/entities/underGPL.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/fi/entities/underX11License.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/fi/entities/update-doc.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/fi/lang.entities
+debian/tmp/usr/share/apps/ksgmltools2/customization/fi/strings.entities
+debian/tmp/usr/share/apps/ksgmltools2/customization/fi/user.entities
+debian/tmp/usr/share/apps/ksgmltools2/customization/fo/catalog
+debian/tmp/usr/share/apps/ksgmltools2/customization/fo/contributor.entities
+debian/tmp/usr/share/apps/ksgmltools2/customization/fo/entities/fdl-notice.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/fo/entities/gpl-notice.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/fo/entities/help-menu.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/fo/entities/install-compile.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/fo/entities/install-intro.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/fo/entities/lgpl-notice.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/fo/entities/report-bugs.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/fo/entities/underArtisticLicense.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/fo/entities/underBSDLicense.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/fo/entities/underFDL.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/fo/entities/underGPL.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/fo/entities/underX11License.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/fo/entities/update-doc.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/fo/lang.entities
+debian/tmp/usr/share/apps/ksgmltools2/customization/fo/strings.entities
+debian/tmp/usr/share/apps/ksgmltools2/customization/fo/user.entities
+debian/tmp/usr/share/apps/ksgmltools2/customization/fr/catalog
+debian/tmp/usr/share/apps/ksgmltools2/customization/fr/entities/underLGPL.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/fr/entities/fdl-notice.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/fr/entities/gpl-notice.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/fr/entities/help-menu.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/fr/entities/install-compile.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/fr/entities/install-intro.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/fr/entities/lgpl-notice.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/fr/entities/report-bugs.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/fr/entities/underArtisticLicense.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/fr/entities/underBSDLicense.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/fr/entities/underFDL.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/fr/entities/underGPL.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/fr/entities/underX11License.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/fr/entities/update-doc.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/fr/lang.entities
+debian/tmp/usr/share/apps/ksgmltools2/customization/fr/strings.entities
+debian/tmp/usr/share/apps/ksgmltools2/customization/fr/user.entities
+debian/tmp/usr/share/apps/ksgmltools2/customization/he/catalog
+debian/tmp/usr/share/apps/ksgmltools2/customization/he/entities/fdl-notice.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/he/entities/gpl-notice.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/he/entities/help-menu.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/he/entities/install-compile.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/he/entities/install-intro.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/he/entities/lgpl-notice.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/he/entities/report-bugs.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/he/entities/underArtisticLicense.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/he/entities/underBSDLicense.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/he/entities/underFDL.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/he/entities/underGPL.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/he/entities/underX11License.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/he/entities/update-doc.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/he/lang.entities
+debian/tmp/usr/share/apps/ksgmltools2/customization/he/strings.entities
+debian/tmp/usr/share/apps/ksgmltools2/customization/he/user.entities
+debian/tmp/usr/share/apps/ksgmltools2/customization/htdig_index.xsl
+debian/tmp/usr/share/apps/ksgmltools2/customization/hu/catalog
+debian/tmp/usr/share/apps/ksgmltools2/customization/hu/entities/fdl-notice.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/hu/entities/gpl-notice.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/hu/entities/help-menu.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/hu/entities/install-compile.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/hu/entities/install-intro.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/hu/entities/lgpl-notice.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/hu/entities/report-bugs.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/hu/entities/underArtisticLicense.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/hu/entities/underBSDLicense.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/hu/entities/underFDL.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/hu/entities/underGPL.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/hu/entities/underX11License.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/hu/entities/update-doc.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/hu/lang.entities
+debian/tmp/usr/share/apps/ksgmltools2/customization/hu/strings.entities
+debian/tmp/usr/share/apps/ksgmltools2/customization/hu/user.entities
+debian/tmp/usr/share/apps/ksgmltools2/customization/id/catalog
+debian/tmp/usr/share/apps/ksgmltools2/customization/id/entities/fdl-notice.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/id/entities/gpl-notice.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/id/entities/help-menu.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/id/entities/install-compile.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/id/entities/install-intro.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/id/entities/lgpl-notice.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/id/entities/report-bugs.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/id/entities/underArtisticLicense.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/id/entities/underBSDLicense.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/id/entities/underFDL.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/id/entities/underGPL.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/id/entities/underX11License.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/id/entities/update-doc.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/id/lang.entities
+debian/tmp/usr/share/apps/ksgmltools2/customization/id/strings.entities
+debian/tmp/usr/share/apps/ksgmltools2/customization/id/user.entities
+debian/tmp/usr/share/apps/ksgmltools2/customization/it/catalog
+debian/tmp/usr/share/apps/ksgmltools2/customization/it/entities/fdl-notice.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/it/entities/gpl-notice.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/it/entities/help-menu.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/it/entities/install-compile.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/it/entities/install-intro.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/it/entities/lgpl-notice.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/it/entities/report-bugs.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/it/entities/underArtisticLicense.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/it/entities/underBSDLicense.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/it/entities/underFDL.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/it/entities/underGPL.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/it/entities/underLGPL.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/it/entities/underX11License.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/it/entities/update-doc.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/it/lang.entities
+debian/tmp/usr/share/apps/ksgmltools2/customization/it/strings.entities
+debian/tmp/usr/share/apps/ksgmltools2/customization/it/user.entities
+debian/tmp/usr/share/apps/ksgmltools2/customization/ja/catalog
+debian/tmp/usr/share/apps/ksgmltools2/customization/ja/entities/fdl-notice.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/ja/entities/gpl-notice.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/ja/entities/help-menu.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/ja/entities/install-compile.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/ja/entities/install-intro.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/ja/entities/lgpl-notice.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/ja/entities/report-bugs.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/ja/entities/underArtisticLicense.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/ja/entities/underBSDLicense.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/ja/entities/underFDL.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/ja/entities/underGPL.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/ja/entities/underX11License.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/ja/entities/update-doc.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/ja/lang.entities
+debian/tmp/usr/share/apps/ksgmltools2/customization/ja/strings.entities
+debian/tmp/usr/share/apps/ksgmltools2/customization/ja/user.entities
+debian/tmp/usr/share/apps/ksgmltools2/customization/kde-chunk-online.xsl
+debian/tmp/usr/share/apps/ksgmltools2/customization/kde-chunk.xsl
+debian/tmp/usr/share/apps/ksgmltools2/customization/kde-man.xsl
+debian/tmp/usr/share/apps/ksgmltools2/customization/kde-navig-online.xsl
+debian/tmp/usr/share/apps/ksgmltools2/customization/kde-navig.xsl
+debian/tmp/usr/share/apps/ksgmltools2/customization/kde-nochunk.xsl
+debian/tmp/usr/share/apps/ksgmltools2/customization/kde-style.xsl
+debian/tmp/usr/share/apps/ksgmltools2/customization/kde-ttlpg-online.xsl
+debian/tmp/usr/share/apps/ksgmltools2/customization/kde-ttlpg.xsl
+debian/tmp/usr/share/apps/ksgmltools2/customization/kde-web-navig.xsl
+debian/tmp/usr/share/apps/ksgmltools2/customization/kde-web.xsl
+debian/tmp/usr/share/apps/ksgmltools2/customization/ko/catalog
+debian/tmp/usr/share/apps/ksgmltools2/customization/ko/entities/fdl-notice.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/ko/entities/gpl-notice.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/ko/entities/help-menu.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/ko/entities/install-compile.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/ko/entities/install-intro.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/ko/entities/lgpl-notice.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/ko/entities/underArtisticLicense.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/ko/entities/underBSDLicense.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/ko/entities/underFDL.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/ko/entities/underGPL.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/ko/entities/underX11License.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/ko/entities/update-doc.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/ko/lang.entities
+debian/tmp/usr/share/apps/ksgmltools2/customization/ko/strings.entities
+debian/tmp/usr/share/apps/ksgmltools2/customization/ko/user.entities
+debian/tmp/usr/share/apps/ksgmltools2/customization/lt/catalog
+debian/tmp/usr/share/apps/ksgmltools2/customization/lt/contributor.entities
+debian/tmp/usr/share/apps/ksgmltools2/customization/lt/entities/fdl-notice.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/lt/entities/gpl-notice.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/lt/entities/help-menu.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/lt/entities/install-compile.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/lt/entities/install-intro.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/lt/entities/lgpl-notice.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/lt/entities/report-bugs.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/lt/entities/underArtisticLicense.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/lt/entities/underBSDLicense.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/lt/entities/underFDL.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/lt/entities/underGPL.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/lt/entities/underX11License.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/lt/entities/update-doc.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/lt/lang.entities
+debian/tmp/usr/share/apps/ksgmltools2/customization/lt/strings.entities
+debian/tmp/usr/share/apps/ksgmltools2/customization/lt/user.entities
+debian/tmp/usr/share/apps/ksgmltools2/customization/nl/catalog
+debian/tmp/usr/share/apps/ksgmltools2/customization/nl/entities/fdl-notice.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/nl/entities/gpl-notice.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/nl/entities/help-menu.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/nl/entities/install-compile.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/nl/entities/install-intro.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/nl/entities/lgpl-notice.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/nl/entities/report-bugs.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/nl/entities/underArtisticLicense.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/nl/entities/underBSDLicense.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/nl/entities/underFDL.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/nl/entities/underGPL.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/nl/entities/underX11License.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/nl/entities/update-doc.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/nl/lang.entities
+debian/tmp/usr/share/apps/ksgmltools2/customization/nl/strings.entities
+debian/tmp/usr/share/apps/ksgmltools2/customization/nl/user.entities
+debian/tmp/usr/share/apps/ksgmltools2/customization/nn/catalog
+debian/tmp/usr/share/apps/ksgmltools2/customization/nn/entities/fdl-notice.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/nn/entities/gpl-notice.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/nn/entities/help-menu.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/nn/entities/install-compile.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/nn/entities/install-intro.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/nn/entities/lgpl-notice.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/nn/entities/report-bugs.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/nn/entities/underArtisticLicense.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/nn/entities/underBSDLicense.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/nn/entities/underFDL.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/nn/entities/underGPL.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/nn/entities/underX11License.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/nn/entities/update-doc.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/nn/lang.entities
+debian/tmp/usr/share/apps/ksgmltools2/customization/nn/strings.entities
+debian/tmp/usr/share/apps/ksgmltools2/customization/nn/user.entities
+debian/tmp/usr/share/apps/ksgmltools2/customization/no/catalog
+debian/tmp/usr/share/apps/ksgmltools2/customization/no/entities/fdl-notice.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/no/entities/gpl-notice.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/no/entities/help-menu.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/no/entities/install-compile.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/no/entities/install-intro.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/no/entities/lgpl-notice.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/no/entities/report-bugs.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/no/entities/underArtisticLicense.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/no/entities/underBSDLicense.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/no/entities/underFDL.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/no/entities/underGPL.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/no/entities/underX11License.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/no/entities/update-doc.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/no/lang.entities
+debian/tmp/usr/share/apps/ksgmltools2/customization/no/strings.entities
+debian/tmp/usr/share/apps/ksgmltools2/customization/no/user.entities
+debian/tmp/usr/share/apps/ksgmltools2/customization/obsolete/general.entities
+debian/tmp/usr/share/apps/ksgmltools2/customization/obsolete/kdex-412-10.dtd
+debian/tmp/usr/share/apps/ksgmltools2/customization/obsolete/kdex.dtd
+debian/tmp/usr/share/apps/ksgmltools2/customization/obsolete/modifications.elements
+debian/tmp/usr/share/apps/ksgmltools2/customization/obsolete/rdbpool.elements
+debian/tmp/usr/share/apps/ksgmltools2/customization/pl/catalog
+debian/tmp/usr/share/apps/ksgmltools2/customization/pl/entities/fdl-notice.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/pl/entities/gpl-notice.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/pl/entities/help-menu.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/pl/entities/install-compile.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/pl/entities/install-intro.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/pl/entities/lgpl-notice.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/pl/entities/report-bugs.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/pl/entities/underArtisticLicense.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/pl/entities/underBSDLicense.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/pl/entities/underFDL.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/pl/entities/underGPL.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/pl/entities/underX11License.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/pl/entities/update-doc.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/pl/lang.entities
+debian/tmp/usr/share/apps/ksgmltools2/customization/pl/strings.entities
+debian/tmp/usr/share/apps/ksgmltools2/customization/pl/user.entities
+debian/tmp/usr/share/apps/ksgmltools2/customization/pt-BR/catalog
+debian/tmp/usr/share/apps/ksgmltools2/customization/pt-BR/entities/fdl-notice.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/pt-BR/entities/gpl-notice.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/pt-BR/entities/help-menu.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/pt-BR/entities/install-compile.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/pt-BR/entities/install-intro.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/pt-BR/entities/lgpl-notice.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/pt-BR/entities/report-bugs.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/pt-BR/entities/underArtisticLicense.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/pt-BR/entities/underBSDLicense.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/pt-BR/entities/underFDL.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/pt-BR/entities/underGPL.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/pt-BR/entities/underLGPL.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/pt-BR/entities/underX11License.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/pt-BR/entities/update-doc.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/pt-BR/lang.entities
+debian/tmp/usr/share/apps/ksgmltools2/customization/pt-BR/strings.entities
+debian/tmp/usr/share/apps/ksgmltools2/customization/pt-BR/user.entities
+debian/tmp/usr/share/apps/ksgmltools2/customization/pt/catalog
+debian/tmp/usr/share/apps/ksgmltools2/customization/pt/contributor.entities
+debian/tmp/usr/share/apps/ksgmltools2/customization/pt/entities/fdl-notice.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/pt/entities/gpl-notice.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/pt/entities/help-menu.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/pt/entities/install-compile.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/pt/entities/install-intro.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/pt/entities/lgpl-notice.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/pt/entities/report-bugs.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/pt/entities/underArtisticLicense.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/pt/entities/underBSDLicense.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/pt/entities/underFDL.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/pt/entities/underGPL.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/pt/entities/underX11License.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/pt/entities/update-doc.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/pt/lang.entities
+debian/tmp/usr/share/apps/ksgmltools2/customization/pt/strings.entities
+debian/tmp/usr/share/apps/ksgmltools2/customization/pt/user.entities
+debian/tmp/usr/share/apps/ksgmltools2/customization/README
+debian/tmp/usr/share/apps/ksgmltools2/customization/ro/catalog
+debian/tmp/usr/share/apps/ksgmltools2/customization/ro/entities/fdl-notice.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/ro/entities/gpl-notice.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/ro/entities/help-menu.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/ro/entities/install-compile.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/ro/entities/install-intro.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/ro/entities/lgpl-notice.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/ro/entities/report-bugs.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/ro/entities/underArtisticLicense.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/ro/entities/underBSDLicense.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/ro/entities/underFDL.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/ro/entities/underGPL.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/ro/entities/underLGPL.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/ro/entities/underX11License.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/ro/entities/update-doc.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/ro/lang.entities
+debian/tmp/usr/share/apps/ksgmltools2/customization/ro/strings.entities
+debian/tmp/usr/share/apps/ksgmltools2/customization/ro/user.entities
+debian/tmp/usr/share/apps/ksgmltools2/customization/ru/catalog
+debian/tmp/usr/share/apps/ksgmltools2/customization/ru/entities/fdl-notice.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/ru/entities/gpl-notice.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/ru/entities/help-menu.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/ru/entities/install-compile.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/ru/entities/install-intro.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/ru/entities/lgpl-notice.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/ru/entities/report-bugs.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/ru/entities/underArtisticLicense.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/ru/entities/underBSDLicense.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/ru/entities/underFDL.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/ru/entities/underGPL.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/ru/entities/underX11License.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/ru/entities/update-doc.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/ru/lang.entities
+debian/tmp/usr/share/apps/ksgmltools2/customization/ru/strings.entities
+debian/tmp/usr/share/apps/ksgmltools2/customization/ru/user.entities
+debian/tmp/usr/share/apps/ksgmltools2/customization/sk/catalog
+debian/tmp/usr/share/apps/ksgmltools2/customization/sk/entities/fdl-notice.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/sk/entities/gpl-notice.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/sk/entities/help-menu.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/sk/entities/install-compile.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/sk/entities/install-intro.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/sk/entities/lgpl-notice.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/sk/entities/report-bugs.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/sk/entities/underArtisticLicense.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/sk/entities/underBSDLicense.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/sk/entities/underFDL.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/sk/entities/underGPL.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/sk/entities/underX11License.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/sk/entities/update-doc.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/sk/lang.entities
+debian/tmp/usr/share/apps/ksgmltools2/customization/sk/strings.entities
+debian/tmp/usr/share/apps/ksgmltools2/customization/sk/user.entities
+debian/tmp/usr/share/apps/ksgmltools2/customization/sl/catalog
+debian/tmp/usr/share/apps/ksgmltools2/customization/sl/entities/fdl-notice.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/sl/entities/gpl-notice.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/sl/entities/help-menu.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/sl/entities/install-compile.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/sl/entities/install-intro.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/sl/entities/lgpl-notice.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/sl/entities/report-bugs.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/sl/entities/underArtisticLicense.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/sl/entities/underBSDLicense.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/sl/entities/underFDL.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/sl/entities/underGPL.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/sl/entities/underX11License.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/sl/entities/update-doc.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/sl/lang.entities
+debian/tmp/usr/share/apps/ksgmltools2/customization/sl/strings.entities
+debian/tmp/usr/share/apps/ksgmltools2/customization/sl/user.entities
+debian/tmp/usr/share/apps/ksgmltools2/customization/sr/catalog
+debian/tmp/usr/share/apps/ksgmltools2/customization/sr/entities/fdl-notice.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/sr/entities/gpl-notice.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/sr/entities/help-menu.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/sr/entities/install-compile.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/sr/entities/install-intro.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/sr/entities/lgpl-notice.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/sr/entities/report-bugs.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/sr/entities/underArtisticLicense.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/sr/entities/underBSDLicense.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/sr/entities/underFDL.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/sr/entities/underGPL.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/sr/entities/underX11License.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/sr/entities/update-doc.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/sr/lang.entities
+debian/tmp/usr/share/apps/ksgmltools2/customization/sr/strings.entities
+debian/tmp/usr/share/apps/ksgmltools2/customization/sr/user.entities
+debian/tmp/usr/share/apps/ksgmltools2/customization/sv/catalog
+debian/tmp/usr/share/apps/ksgmltools2/customization/sv/entities/fdl-notice.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/sv/entities/gpl-notice.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/sv/entities/help-menu.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/sv/entities/install-compile.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/sv/entities/install-intro.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/sv/entities/lgpl-notice.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/sv/entities/report-bugs.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/sv/entities/underArtisticLicense.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/sv/entities/underBSDLicense.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/sv/entities/underFDL.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/sv/entities/underGPL.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/sv/entities/underLGPL.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/sv/entities/underX11License.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/sv/entities/update-doc.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/sv/lang.entities
+debian/tmp/usr/share/apps/ksgmltools2/customization/sv/strings.entities
+debian/tmp/usr/share/apps/ksgmltools2/customization/sv/user.entities
+debian/tmp/usr/share/apps/ksgmltools2/customization/tr/catalog
+debian/tmp/usr/share/apps/ksgmltools2/customization/tr/entities/fdl-notice.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/tr/entities/gpl-notice.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/tr/entities/help-menu.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/tr/entities/install-compile.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/tr/entities/install-intro.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/tr/entities/lgpl-notice.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/tr/entities/report-bugs.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/tr/entities/underArtisticLicense.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/tr/entities/underBSDLicense.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/tr/entities/underFDL.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/tr/entities/underGPL.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/tr/entities/underX11License.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/tr/entities/update-doc.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/tr/lang.entities
+debian/tmp/usr/share/apps/ksgmltools2/customization/tr/strings.entities
+debian/tmp/usr/share/apps/ksgmltools2/customization/tr/user.entities
+debian/tmp/usr/share/apps/ksgmltools2/customization/uk/catalog
+debian/tmp/usr/share/apps/ksgmltools2/customization/uk/entities/fdl-notice.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/uk/entities/gpl-notice.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/uk/entities/help-menu.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/uk/entities/install-compile.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/uk/entities/install-intro.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/uk/entities/lgpl-notice.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/uk/entities/report-bugs.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/uk/entities/underArtisticLicense.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/uk/entities/underBSDLicense.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/uk/entities/underFDL.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/uk/entities/underGPL.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/uk/entities/underX11License.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/uk/entities/update-doc.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/uk/lang.entities
+debian/tmp/usr/share/apps/ksgmltools2/customization/uk/strings.entities
+debian/tmp/usr/share/apps/ksgmltools2/customization/uk/user.entities
+debian/tmp/usr/share/apps/ksgmltools2/customization/wa/catalog
+debian/tmp/usr/share/apps/ksgmltools2/customization/wa/contributor.entities
+debian/tmp/usr/share/apps/ksgmltools2/customization/wa/entities/fdl-notice.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/wa/entities/gpl-notice.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/wa/entities/help-menu.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/wa/entities/install-compile.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/wa/entities/install-intro.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/wa/entities/lgpl-notice.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/wa/entities/report-bugs.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/wa/entities/underArtisticLicense.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/wa/entities/underBSDLicense.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/wa/entities/underFDL.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/wa/entities/underGPL.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/wa/entities/underX11License.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/wa/entities/update-doc.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/wa/lang.entities
+debian/tmp/usr/share/apps/ksgmltools2/customization/wa/strings.entities
+debian/tmp/usr/share/apps/ksgmltools2/customization/wa/user.entities
+debian/tmp/usr/share/apps/ksgmltools2/customization/xh/catalog
+debian/tmp/usr/share/apps/ksgmltools2/customization/xh/contributor.entities
+debian/tmp/usr/share/apps/ksgmltools2/customization/xh/entities/fdl-notice.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/xh/entities/gpl-notice.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/xh/entities/help-menu.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/xh/entities/install-compile.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/xh/entities/install-intro.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/xh/entities/lgpl-notice.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/xh/entities/report-bugs.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/xh/entities/underArtisticLicense.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/xh/entities/underBSDLicense.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/xh/entities/underFDL.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/xh/entities/underGPL.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/xh/entities/underX11License.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/xh/entities/update-doc.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/xh/lang.entities
+debian/tmp/usr/share/apps/ksgmltools2/customization/xh/strings.entities
+debian/tmp/usr/share/apps/ksgmltools2/customization/xh/user.entities
+debian/tmp/usr/share/apps/ksgmltools2/customization/xsl/ca.xml
+debian/tmp/usr/share/apps/ksgmltools2/customization/xsl/cs.xml
+debian/tmp/usr/share/apps/ksgmltools2/customization/xsl/da.xml
+debian/tmp/usr/share/apps/ksgmltools2/customization/xsl/de.xml
+debian/tmp/usr/share/apps/ksgmltools2/customization/xsl/el.xml
+debian/tmp/usr/share/apps/ksgmltools2/customization/xsl/en.xml
+debian/tmp/usr/share/apps/ksgmltools2/customization/xsl/es.xml
+debian/tmp/usr/share/apps/ksgmltools2/customization/xsl/et.xml
+debian/tmp/usr/share/apps/ksgmltools2/customization/xsl/fi.xml
+debian/tmp/usr/share/apps/ksgmltools2/customization/xsl/fr.xml
+debian/tmp/usr/share/apps/ksgmltools2/customization/xsl/hu.xml
+debian/tmp/usr/share/apps/ksgmltools2/customization/xsl/it.xml
+debian/tmp/usr/share/apps/ksgmltools2/customization/xsl/ja.xml
+debian/tmp/usr/share/apps/ksgmltools2/customization/xsl/ko.xml
+debian/tmp/usr/share/apps/ksgmltools2/customization/xsl/nl.xml
+debian/tmp/usr/share/apps/ksgmltools2/customization/xsl/nn.xml
+debian/tmp/usr/share/apps/ksgmltools2/customization/xsl/no.xml
+debian/tmp/usr/share/apps/ksgmltools2/customization/xsl/pl.xml
+debian/tmp/usr/share/apps/ksgmltools2/customization/xsl/pt_br.xml
+debian/tmp/usr/share/apps/ksgmltools2/customization/xsl/pt.xml
+debian/tmp/usr/share/apps/ksgmltools2/customization/xsl/README
+debian/tmp/usr/share/apps/ksgmltools2/customization/xsl/ro.xml
+debian/tmp/usr/share/apps/ksgmltools2/customization/xsl/ru.xml
+debian/tmp/usr/share/apps/ksgmltools2/customization/xsl/sk.xml
+debian/tmp/usr/share/apps/ksgmltools2/customization/xsl/sl.xml
+debian/tmp/usr/share/apps/ksgmltools2/customization/xsl/sr.xml
+debian/tmp/usr/share/apps/ksgmltools2/customization/xsl/sv.xml
+debian/tmp/usr/share/apps/ksgmltools2/customization/xsl/zh_tw.xml
+debian/tmp/usr/share/apps/ksgmltools2/customization/xx/catalog
+debian/tmp/usr/share/apps/ksgmltools2/customization/xx/contributor.entities
+debian/tmp/usr/share/apps/ksgmltools2/customization/xx/entities/fdl-notice.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/xx/entities/gpl-notice.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/xx/entities/help-menu.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/xx/entities/install-compile.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/xx/entities/install-intro.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/xx/entities/lgpl-notice.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/xx/entities/report-bugs.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/xx/entities/underArtisticLicense.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/xx/entities/underBSDLicense.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/xx/entities/underFDL.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/xx/entities/underGPL.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/xx/entities/underX11License.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/xx/entities/update-doc.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/xx/lang.entities
+debian/tmp/usr/share/apps/ksgmltools2/customization/xx/strings.entities
+debian/tmp/usr/share/apps/ksgmltools2/customization/xx/user.entities
+debian/tmp/usr/share/apps/ksgmltools2/customization/zh-CN/catalog
+debian/tmp/usr/share/apps/ksgmltools2/customization/zh-CN/entities/fdl-notice.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/zh-CN/entities/gpl-notice.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/zh-CN/entities/help-menu.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/zh-CN/entities/install-compile.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/zh-CN/entities/install-intro.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/zh-CN/entities/install-intro.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/zh-CN/entities/lgpl-notice.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/zh-CN/entities/report-bugs.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/zh-CN/entities/underArtisticLicense.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/zh-CN/entities/underBSDLicense.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/zh-CN/entities/underFDL.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/zh-CN/entities/underGPL.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/zh-CN/entities/underLGPL.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/zh-CN/entities/underX11License.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/zh-CN/entities/update-doc.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/zh-CN/lang.entities
+debian/tmp/usr/share/apps/ksgmltools2/customization/zh-CN/strings.entities
+debian/tmp/usr/share/apps/ksgmltools2/customization/zh-CN/user.entities
+debian/tmp/usr/share/apps/ksgmltools2/customization/zh-TW/catalog
+debian/tmp/usr/share/apps/ksgmltools2/customization/zh-TW/entities/fdl-notice.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/zh-TW/entities/gpl-notice.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/zh-TW/entities/help-menu.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/zh-TW/entities/install-compile.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/zh-TW/entities/install-intro.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/zh-TW/entities/lgpl-notice.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/zh-TW/entities/report-bugs.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/zh-TW/entities/underArtisticLicense.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/zh-TW/entities/underBSDLicense.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/zh-TW/entities/underFDL.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/zh-TW/entities/underGPL.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/zh-TW/entities/underX11License.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/zh-TW/entities/update-doc.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/zh-TW/lang.entities
+debian/tmp/usr/share/apps/ksgmltools2/customization/zh-TW/strings.entities
+debian/tmp/usr/share/apps/ksgmltools2/customization/zh-TW/user.entities
+debian/tmp/usr/share/apps/ksgmltools2/docbook/README.kde
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xml-dtd-4.1.2/40chg.txt
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xml-dtd-4.1.2/41chg.txt
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xml-dtd-4.1.2/calstblx.dtd
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xml-dtd-4.1.2/ChangeLog
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xml-dtd-4.1.2/dbcentx.mod
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xml-dtd-4.1.2/dbgenent.mod
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xml-dtd-4.1.2/dbhierx.mod
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xml-dtd-4.1.2/dbnotnx.mod
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xml-dtd-4.1.2/dbpoolx.mod
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xml-dtd-4.1.2/docbook.cat
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xml-dtd-4.1.2/docbookx.dtd
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xml-dtd-4.1.2/ent/iso-amsa.ent
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xml-dtd-4.1.2/ent/iso-amsb.ent
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xml-dtd-4.1.2/ent/iso-amsc.ent
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xml-dtd-4.1.2/ent/iso-amsn.ent
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xml-dtd-4.1.2/ent/iso-amso.ent
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xml-dtd-4.1.2/ent/iso-amsr.ent
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xml-dtd-4.1.2/ent/iso-box.ent
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xml-dtd-4.1.2/ent/iso-cyr1.ent
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xml-dtd-4.1.2/ent/iso-cyr2.ent
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xml-dtd-4.1.2/ent/iso-dia.ent
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xml-dtd-4.1.2/ent/iso-grk1.ent
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xml-dtd-4.1.2/ent/iso-grk2.ent
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xml-dtd-4.1.2/ent/iso-grk3.ent
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xml-dtd-4.1.2/ent/iso-grk4.ent
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xml-dtd-4.1.2/ent/iso-lat1.ent
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xml-dtd-4.1.2/ent/iso-lat2.ent
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xml-dtd-4.1.2/ent/iso-num.ent
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xml-dtd-4.1.2/ent/iso-pub.ent
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xml-dtd-4.1.2/ent/iso-tech.ent
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xml-dtd-4.1.2/readme.txt
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xml-dtd-4.1.2/soextblx.dtd
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xml-dtd-4.2/calstblx.dtd
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xml-dtd-4.2/catalog.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xml-dtd-4.2/ChangeLog
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xml-dtd-4.2/dbcentx.mod
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xml-dtd-4.2/dbgenent.mod
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xml-dtd-4.2/dbhierx.mod
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xml-dtd-4.2/dbnotnx.mod
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xml-dtd-4.2/dbpoolx.mod
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xml-dtd-4.2/docbook.cat
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xml-dtd-4.2/docbookx.dtd
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xml-dtd-4.2/ent/iso-amsa.ent
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xml-dtd-4.2/ent/iso-amsb.ent
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xml-dtd-4.2/ent/iso-amsc.ent
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xml-dtd-4.2/ent/iso-amsn.ent
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xml-dtd-4.2/ent/iso-amso.ent
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xml-dtd-4.2/ent/iso-amsr.ent
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xml-dtd-4.2/ent/iso-box.ent
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xml-dtd-4.2/ent/iso-cyr1.ent
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xml-dtd-4.2/ent/iso-cyr2.ent
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xml-dtd-4.2/ent/iso-dia.ent
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xml-dtd-4.2/ent/iso-grk1.ent
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xml-dtd-4.2/ent/iso-grk2.ent
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xml-dtd-4.2/ent/iso-grk3.ent
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xml-dtd-4.2/ent/iso-grk4.ent
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xml-dtd-4.2/ent/iso-lat1.ent
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xml-dtd-4.2/ent/iso-lat2.ent
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xml-dtd-4.2/ent/iso-num.ent
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xml-dtd-4.2/ent/iso-pub.ent
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xml-dtd-4.2/ent/iso-tech.ent
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xml-dtd-4.2/README
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xml-dtd-4.2/soextblx.dtd
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/BUGS
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/ChangeLog
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/common/af.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/common/ar.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/common/autoidx-ng.xsl
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/common/bg.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/common/bn.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/common/bs.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/common/ca.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/common/ChangeLog
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/common/common.xsl
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/common/cs.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/common/da.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/common/de.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/common/el.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/common/en.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/common/es.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/common/et.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/common/eu.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/common/fi.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/common/fr.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/common/gentext.xsl
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/common/he.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/common/hr.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/common/hu.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/common/id.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/common/it.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/common/ja.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/common/ko.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/common/l10n.dtd
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/common/l10n.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/common/l10n.xsl
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/common/labels.xsl
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/common/la.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/common/lt.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/common/nl.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/common/nn.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/common/no.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/common/olink.xsl
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/common/pi.xsl
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/common/pl.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/common/pt_br.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/common/pt.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/common/ro.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/common/ru.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/common/sk.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/common/sl.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/common/sr_Latn.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/common/sr.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/common/subtitles.xsl
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/common/sv.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/common/table.xsl
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/common/targetdatabase.dtd
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/common/targets.xsl
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/common/th.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/common/titles.xsl
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/common/tr.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/common/uk.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/common/vi.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/common/xh.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/common/zh_cn.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/common/zh_tw.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/html/admon.xsl
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/html/autoidx-ng.xsl
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/html/autoidx.xsl
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/html/autotoc.xsl
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/html/biblio.xsl
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/html/block.xsl
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/html/callout.xsl
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/html/changebars.xsl
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/html/ChangeLog
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/html/chunk-code.xsl
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/html/chunk-common.xsl
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/html/chunker.xsl
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/html/chunkfast.xsl
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/html/chunktoc.xsl
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/html/chunk.xsl
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/html/component.xsl
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/html/division.xsl
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/html/docbookng.xsl
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/html/docbook.xsl
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/html/ebnf.xsl
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/html/footnote.xsl
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/html/formal.xsl
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/html/glossary.xsl
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/html/graphics.xsl
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/html/html-rtf.xsl
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/html/htmltbl.xsl
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/html/html.xsl
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/html/index.xsl
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/html/info.xsl
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/html/inline.xsl
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/html/keywords.xsl
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/html/lists.xsl
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/html/maketoc.xsl
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/html/manifest.xsl
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/html/math.xsl
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/html/oldchunker.xsl
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/html/onechunk.xsl
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/html/param.ent
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/html/param.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/html/param.xsl
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/html/param.xweb
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/html/pi.xsl
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/html/profile-chunk-code.xsl
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/html/profile-chunk.xsl
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/html/profile-docbook.xsl
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/html/profile-onechunk.xsl
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/html/qandaset.xsl
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/html/refentry.xsl
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/html/sections.xsl
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/html/synop.xsl
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/html/table.xsl
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/html/task.xsl
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/html/titlepage.templates.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/html/titlepage.templates.xsl
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/html/titlepage.xsl
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/html/toc.xsl
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/html/verbatim.xsl
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/html/xref.xsl
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/images/blank.png
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/images/callouts/10.gif
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/images/callouts/10.png
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/images/callouts/11.gif
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/images/callouts/11.png
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/images/callouts/12.gif
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/images/callouts/12.png
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/images/callouts/13.gif
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/images/callouts/13.png
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/images/callouts/14.gif
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/images/callouts/14.png
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/images/callouts/15.gif
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/images/callouts/15.png
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/images/callouts/1.gif
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/images/callouts/1.png
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/images/callouts/2.gif
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/images/callouts/2.png
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/images/callouts/3.gif
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/images/callouts/3.png
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/images/callouts/4.gif
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/images/callouts/4.png
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/images/callouts/5.gif
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/images/callouts/5.png
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/images/callouts/6.gif
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/images/callouts/6.png
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/images/callouts/7.gif
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/images/callouts/7.png
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/images/callouts/8.gif
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/images/callouts/8.png
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/images/callouts/9.gif
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/images/callouts/9.png
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/images/callouts/ChangeLog
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/images/caution.gif
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/images/caution.png
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/images/caution.tif
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/images/ChangeLog
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/images/draft.png
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/images/home.gif
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/images/home.png
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/images/important.gif
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/images/important.png
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/images/important.tif
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/images/next.gif
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/images/next.png
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/images/note.gif
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/images/note.png
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/images/note.tif
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/images/prev.gif
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/images/prev.png
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/images/tip.gif
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/images/tip.png
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/images/tip.tif
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/images/toc-blank.png
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/images/toc-minus.png
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/images/toc-plus.png
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/images/up.gif
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/images/up.png
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/images/warning.gif
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/images/warning.png
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/images/warning.tif
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/lib/ChangeLog
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/lib/lib.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/lib/lib.xsl
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/lib/lib.xweb
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/manpages/ChangeLog
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/manpages/docbook.xsl
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/manpages/lists.xsl
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/manpages/README
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/manpages/sect23.xsl
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/manpages/synop.xsl
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/manpages/xref.xsl
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/admon.graphics.extension.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/admon.graphics.path.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/admon.graphics.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/admonition.properties.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/admonition.title.properties.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/admon.style.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/admon.textlabel.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/alignment.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/annotate.toc.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/appendix.autolabel.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/arbortext.extensions.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/article.appendix.title.properties.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/author.othername.in.middle.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/autotoc.label.separator.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/axf.extensions.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/base.dir.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/biblioentry.item.separator.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/bibliography.collection.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/bibliography.numbered.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/blockquote.properties.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/body.font.family.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/body.font.master.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/body.font.size.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/body.margin.bottom.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/body.margin.top.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/bridgehead.in.toc.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/callout.defaultcolumn.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/callout.graphics.extension.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/callout.graphics.number.limit.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/callout.graphics.path.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/callout.graphics.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/callout.list.table.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/callouts.extension.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/callout.unicode.font.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/callout.unicode.number.limit.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/callout.unicode.start.character.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/callout.unicode.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/ChangeLog
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/chapter.autolabel.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/chunker.output.cdata-section-elements.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/chunker.output.doctype-public.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/chunker.output.doctype-system.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/chunker.output.encoding.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/chunker.output.indent.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/chunker.output.media-type.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/chunker.output.method.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/chunker.output.omit-xml-declaration.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/chunker.output.standalone.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/chunk.first.sections.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/chunk.quietly.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/chunk.section.depth.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/chunk.sections.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/chunk.separate.lots.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/chunk.tocs.and.lots.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/chunk.toc.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/citerefentry.link.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/collect.xref.targets.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/column.count.back.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/column.count.body.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/column.count.front.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/column.count.index.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/column.count.lot.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/column.count.titlepage.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/column.gap.back.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/column.gap.body.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/column.gap.front.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/column.gap.index.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/column.gap.lot.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/column.gap.titlepage.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/compact.list.item.spacing.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/component.label.includes.part.label.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/component.title.properties.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/css.decoration.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/current.docid.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/default.float.class.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/default.image.width.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/default.table.width.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/default.units.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/dingbat.font.family.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/double.sided.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/draft.mode.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/draft.watermark.image.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/ebnf.assignment.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/ebnf.statement.terminator.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/ebnf.table.bgcolor.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/ebnf.table.border.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/eclipse.autolabel.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/eclipse.plugin.id.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/eclipse.plugin.name.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/eclipse.plugin.provider.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/emphasis.propagates.style.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/entry.propagates.style.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/equation.properties.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/example.properties.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/figure.properties.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/firstterm.only.link.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/footer.column.widths.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/footer.content.properties.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/footer.rule.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/footers.on.blank.pages.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/footnote.font.size.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/footnote.number.format.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/footnote.number.symbols.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/footnote.sep.leader.properties.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/fop.extensions.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/formal.object.properties.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/formal.procedures.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/formal.title.placement.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/formal.title.properties.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/funcsynopsis.decoration.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/funcsynopsis.style.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/funcsynopsis.tabular.threshold.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/function.parens.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/generate.id.attributes.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/generate.index.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/generate.legalnotice.link.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/generate.manifest.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/generate.meta.abstract.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/generate.section.toc.level.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/generate.toc.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/glossary.as.blocks.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/glossary.collection.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/glossentry.show.acronym.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/glosslist.as.blocks.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/glossterm.auto.link.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/glossterm.separation.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/glossterm.width.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/graphic.default.extension.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/graphicsize.extension.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/header.column.widths.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/header.content.properties.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/header.rule.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/headers.on.blank.pages.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/html.base.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/html.cellpadding.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/html.cellspacing.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/html.cleanup.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/html.extra.head.links.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/html.ext.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.alias.file.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.autolabel.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.button.back.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.button.forward.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.button.hideshow.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.button.home.url.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.button.home.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.button.jump1.title.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.button.jump1.url.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.button.jump1.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.button.jump2.title.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.button.jump2.url.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.button.jump2.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.button.locate.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.button.next.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.button.options.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.button.prev.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.button.print.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.button.refresh.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.button.stop.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.button.zoom.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.chm.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.default.topic.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.display.progress.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.encoding.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.enhanced.decompilation.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.enumerate.images.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.force.map.and.alias.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.hhc.binary.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.hhc.folders.instead.books.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.hhc.section.depth.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.hhc.show.root.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.hhc.width.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.hhc.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.hhk.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.hhp.tail.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.hhp.windows.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.hhp.window.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.hhp.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.map.file.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.only.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.remember.window.position.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.show.advanced.search.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.show.favorities.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.show.menu.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.show.toolbar.text.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.title.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.use.hhk.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.window.geometry.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/html.longdesc.link.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/html.longdesc.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/html.stylesheet.type.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/html.stylesheet.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/hyphenate.verbatim.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/hyphenate.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/ignore.image.scaling.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/img.src.path.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/index.on.role.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/index.on.type.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/index.preferred.page.properties.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/index.prefer.titleabbrev.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/informalequation.properties.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/informalexample.properties.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/informalfigure.properties.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/informal.object.properties.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/informaltable.properties.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/inherit.keywords.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/insert.olink.page.number.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/insert.olink.pdf.frag.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/insert.xref.page.number.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/l10n.gentext.default.language.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/l10n.gentext.language.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/l10n.gentext.use.xref.language.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/label.from.part.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/line-height.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/linenumbering.everyNth.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/linenumbering.extension.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/linenumbering.separator.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/linenumbering.width.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/link.mailto.url.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/list.block.spacing.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/list.item.spacing.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/make.graphic.viewport.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/make.index.markup.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/make.single.year.ranges.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/make.valid.html.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/make.year.ranges.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/manifest.in.base.dir.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/manifest.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/manual.toc.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/marker.section.level.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/menuchoice.menu.separator.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/menuchoice.separator.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/monospace.font.family.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/monospace.properties.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/monospace.verbatim.properties.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/navig.graphics.extension.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/navig.graphics.path.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/navig.graphics.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/navig.showtitles.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/nominal.image.depth.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/nominal.image.width.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/nominal.table.width.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/normal.para.spacing.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/olink.base.uri.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/olink.debug.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/olink.doctitle.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/olink.fragid.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/olink.lang.fallback.sequence.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/olink.outline.ext.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/olink.properties.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/olink.pubid.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/olink.resolver.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/olink.sysid.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/page.height.portrait.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/page.height.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/page.margin.bottom.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/page.margin.inner.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/page.margin.outer.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/page.margin.top.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/page.orientation.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/page.width.portrait.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/page.width.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/paper.type.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/para.propagates.style.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/part.autolabel.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/passivetex.extensions.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/phrase.propagates.style.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/pixels.per.inch.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/points.per.em.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/preface.autolabel.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/prefer.internal.olink.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/preferred.mediaobject.role.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/procedure.properties.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/process.empty.source.toc.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/process.source.toc.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/profile.arch.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/profile.attribute.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/profile.condition.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/profile.conformance.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/profile.lang.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/profile.os.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/profile.revisionflag.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/profile.revision.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/profile.role.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/profile.security.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/profile.separator.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/profile.userlevel.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/profile.value.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/profile.vendor.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/punct.honorific.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/qanda.defaultlabel.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/qandadiv.autolabel.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/qanda.inherit.numeration.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/qanda.title.level1.properties.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/qanda.title.level2.properties.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/qanda.title.level3.properties.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/qanda.title.level4.properties.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/qanda.title.level5.properties.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/qanda.title.level6.properties.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/qanda.title.properties.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/refentry.generate.name.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/refentry.generate.title.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/refentry.pagebreak.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/refentry.separator.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/refentry.title.properties.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/refentry.xref.manvolnum.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/region.after.extent.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/region.before.extent.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/root.filename.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/rootid.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/root.properties.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/runinhead.default.title.end.punct.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/runinhead.title.end.punct.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/sans.font.family.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/saxon.callouts.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/saxon.character.representation.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/saxon.linenumbering.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/saxon.tablecolumns.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/section.autolabel.max.depth.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/section.autolabel.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/section.label.includes.component.label.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/section.level1.properties.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/section.level2.properties.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/section.level3.properties.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/section.level4.properties.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/section.level5.properties.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/section.level6.properties.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/section.properties.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/section.title.level1.properties.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/section.title.level2.properties.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/section.title.level3.properties.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/section.title.level4.properties.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/section.title.level5.properties.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/section.title.level6.properties.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/section.title.properties.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/segmentedlist.as.table.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/shade.verbatim.style.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/shade.verbatim.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/show.comments.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/show.revisionflag.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/sidebar.properties.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/simplesect.in.toc.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/spacing.paras.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/subscript.properties.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/superscript.properties.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/suppress.footer.navigation.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/suppress.header.navigation.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/suppress.navigation.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/symbol.font.family.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/table.borders.with.css.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/table.cell.border.color.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/table.cell.border.style.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/table.cell.border.thickness.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/table.cell.padding.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/tablecolumns.extension.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/table.entry.padding.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/table.footnote.number.format.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/table.footnote.number.symbols.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/table.frame.border.color.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/table.frame.border.style.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/table.frame.border.thickness.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/table.properties.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/table.table.properties.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/target.database.document.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/targets.filename.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/template.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/tex.math.delims.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/tex.math.file.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/tex.math.in.alt.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/textdata.default.encoding.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/textinsert.extension.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/title.font.family.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/title.margin.left.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/toc.indent.width.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/toc.list.type.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/toc.margin.properties.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/toc.max.depth.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/toc.section.depth.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/ulink.footnote.number.format.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/ulink.footnotes.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/ulink.hyphenate.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/ulink.show.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/ulink.target.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/use.embed.for.svg.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/use.extensions.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/use.id.as.filename.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/use.id.function.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/use.local.olink.style.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/use.role.as.xrefstyle.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/use.role.for.mediaobject.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/use.svg.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/variablelist.as.blocks.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/variablelist.as.table.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/variablelist.max.termlength.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/verbatim.properties.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/wordml.template.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/xep.extensions.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/xep.index.item.properties.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/xref.label-page.separator.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/xref.label-title.separator.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/xref.properties.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/xref.title-page.separator.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/params/xref.with.number.and.title.xml
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/README
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/TODO
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/VERSION
+debian/tmp/usr/share/apps/ksgmltools2/docbook/xsl/WhatsNew
+debian/tmp/usr/share/apps/kssl/ca-bundle.crt
+debian/tmp/usr/share/apps/kstyle/pixmaps/riscos/arrowdown_down.png
+debian/tmp/usr/share/apps/kstyle/pixmaps/riscos/arrowdown.png
+debian/tmp/usr/share/apps/kstyle/pixmaps/riscos/arrowleft_down.png
+debian/tmp/usr/share/apps/kstyle/pixmaps/riscos/arrowleft.png
+debian/tmp/usr/share/apps/kstyle/pixmaps/riscos/arrowright_down.png
+debian/tmp/usr/share/apps/kstyle/pixmaps/riscos/arrowright.png
+debian/tmp/usr/share/apps/kstyle/pixmaps/riscos/arrowup_down.png
+debian/tmp/usr/share/apps/kstyle/pixmaps/riscos/arrowup.png
+debian/tmp/usr/share/apps/kstyle/pixmaps/riscos/background.png
+debian/tmp/usr/share/apps/kstyle/pixmaps/riscos/check_checked.png
+debian/tmp/usr/share/apps/kstyle/pixmaps/riscos/checkmark.png
+debian/tmp/usr/share/apps/kstyle/pixmaps/riscos/check.png
+debian/tmp/usr/share/apps/kstyle/pixmaps/riscos/combo_down.png
+debian/tmp/usr/share/apps/kstyle/pixmaps/riscos/combo.png
+debian/tmp/usr/share/apps/kstyle/pixmaps/riscos/hscrollback.png
+debian/tmp/usr/share/apps/kstyle/pixmaps/riscos/hscrollbar_down.png
+debian/tmp/usr/share/apps/kstyle/pixmaps/riscos/hscrollbar.png
+debian/tmp/usr/share/apps/kstyle/pixmaps/riscos/hscrollborder.png
+debian/tmp/usr/share/apps/kstyle/pixmaps/riscos/htab.png
+debian/tmp/usr/share/apps/kstyle/pixmaps/riscos/menu_back.png
+debian/tmp/usr/share/apps/kstyle/pixmaps/riscos/radio_down.png
+debian/tmp/usr/share/apps/kstyle/pixmaps/riscos/radio.png
+debian/tmp/usr/share/apps/kstyle/pixmaps/riscos/raised_border.png
+debian/tmp/usr/share/apps/kstyle/pixmaps/riscos/scrollborder.png
+debian/tmp/usr/share/apps/kstyle/pixmaps/riscos/slider.png
+debian/tmp/usr/share/apps/kstyle/pixmaps/riscos/sunk_border.png
+debian/tmp/usr/share/apps/kstyle/pixmaps/riscos/tab_up.png
+debian/tmp/usr/share/apps/kstyle/pixmaps/riscos/vscrollback.png
+debian/tmp/usr/share/apps/kstyle/pixmaps/riscos/vscrollbar_down.png
+debian/tmp/usr/share/apps/kstyle/pixmaps/riscos/vscrollbar.png
+debian/tmp/usr/share/apps/kstyle/pixmaps/riscos/vscrollborder.png
+debian/tmp/usr/share/apps/kstyle/pixmaps/riscos/vtab.png
+debian/tmp/usr/share/apps/kstyle/themes/b3.themerc
+debian/tmp/usr/share/apps/kstyle/themes/default.themerc
+debian/tmp/usr/share/apps/kstyle/themes/highcolor.themerc
+debian/tmp/usr/share/apps/kstyle/themes/highcontrast.themerc
+debian/tmp/usr/share/apps/kstyle/themes/keramik.themerc
+debian/tmp/usr/share/apps/kstyle/themes/light-v2.themerc
+debian/tmp/usr/share/apps/kstyle/themes/light-v3.themerc
+debian/tmp/usr/share/apps/kstyle/themes/plastik.themerc
+debian/tmp/usr/share/apps/kstyle/themes/qtcde.themerc
+debian/tmp/usr/share/apps/kstyle/themes/qtmotifplus.themerc
+debian/tmp/usr/share/apps/kstyle/themes/qtmotif.themerc
+debian/tmp/usr/share/apps/kstyle/themes/qtplatinum.themerc
+debian/tmp/usr/share/apps/kstyle/themes/qtsgi.themerc
+debian/tmp/usr/share/apps/kstyle/themes/qtwindows.themerc
+debian/tmp/usr/share/apps/kstyle/themes/riscos.themerc
+debian/tmp/usr/share/apps/ktexteditor_docwordcompletion/docwordcompletionui.rc
+debian/tmp/usr/share/apps/ktexteditor_insertfile/ktexteditor_insertfileui.rc
+debian/tmp/usr/share/apps/ktexteditor_isearch/ktexteditor_isearchui.rc
+debian/tmp/usr/share/apps/ktexteditor_kdatatool/ktexteditor_kdatatoolui.rc
+debian/tmp/usr/share/apps/LICENSES/ARTISTIC
+debian/tmp/usr/share/apps/LICENSES/BSD
+debian/tmp/usr/share/apps/LICENSES/GPL_V2
+debian/tmp/usr/share/apps/LICENSES/LGPL_V2
+debian/tmp/usr/share/apps/LICENSES/QPL_V1.0
+debian/tmp/usr/share/apps/proxyscout/eventsrc
+debian/tmp/usr/share/autostart/kab2kabc.desktop
+debian/tmp/usr/share/doc/kde/HTML/en/common/10.png
+debian/tmp/usr/share/doc/kde/HTML/en/common/1.png
+debian/tmp/usr/share/doc/kde/HTML/en/common/2.png
+debian/tmp/usr/share/doc/kde/HTML/en/common/3.png
+debian/tmp/usr/share/doc/kde/HTML/en/common/4.png
+debian/tmp/usr/share/doc/kde/HTML/en/common/5.png
+debian/tmp/usr/share/doc/kde/HTML/en/common/6.png
+debian/tmp/usr/share/doc/kde/HTML/en/common/7.png
+debian/tmp/usr/share/doc/kde/HTML/en/common/8.png
+debian/tmp/usr/share/doc/kde/HTML/en/common/9.png
+debian/tmp/usr/share/doc/kde/HTML/en/common/appheader.html
+debian/tmp/usr/share/doc/kde/HTML/en/common/artistic-license.html
+debian/tmp/usr/share/doc/kde/HTML/en/common/bottom1.png
+debian/tmp/usr/share/doc/kde/HTML/en/common/bottom2.png
+debian/tmp/usr/share/doc/kde/HTML/en/common/bottom-left.png
+debian/tmp/usr/share/doc/kde/HTML/en/common/bottom-middle.png
+debian/tmp/usr/share/doc/kde/HTML/en/common/bottom-right.png
+debian/tmp/usr/share/doc/kde/HTML/en/common/bsd-license.html
+debian/tmp/usr/share/doc/kde/HTML/en/common/docheadergears.png
+debian/tmp/usr/share/doc/kde/HTML/en/common/doctop1a.png
+debian/tmp/usr/share/doc/kde/HTML/en/common/doctop1b.png
+debian/tmp/usr/share/doc/kde/HTML/en/common/doctop1.png
+debian/tmp/usr/share/doc/kde/HTML/en/common/doctop2.png
+debian/tmp/usr/share/doc/kde/HTML/en/common/doxygen.css
+debian/tmp/usr/share/doc/kde/HTML/en/common/favicon.ico
+debian/tmp/usr/share/doc/kde/HTML/en/common/fdl-license
+debian/tmp/usr/share/doc/kde/HTML/en/common/fdl-license.html
+debian/tmp/usr/share/doc/kde/HTML/en/common/fdl-notice.html
+debian/tmp/usr/share/doc/kde/HTML/en/common/footer.html
+debian/tmp/usr/share/doc/kde/HTML/en/common/gpl-license
+debian/tmp/usr/share/doc/kde/HTML/en/common/gpl-license.html
+debian/tmp/usr/share/doc/kde/HTML/en/common/grad.png
+debian/tmp/usr/share/doc/kde/HTML/en/common/headerbg.png
+debian/tmp/usr/share/doc/kde/HTML/en/common/header.html
+debian/tmp/usr/share/doc/kde/HTML/en/common/kde-common.css
+debian/tmp/usr/share/doc/kde/HTML/en/common/kde-default.css
+debian/tmp/usr/share/doc/kde/HTML/en/common/kde_gear_64.png
+debian/tmp/usr/share/doc/kde/HTML/en/common/kde-localised.css.template
+debian/tmp/usr/share/doc/kde/HTML/en/common/kde_logo_bg.png
+debian/tmp/usr/share/doc/kde/HTML/en/common/kde_logo.png
+debian/tmp/usr/share/doc/kde/HTML/en/common/kde-web.css
+debian/tmp/usr/share/doc/kde/HTML/en/common/kmenu.png
+debian/tmp/usr/share/doc/kde/HTML/en/common/lgpl-license
+debian/tmp/usr/share/doc/kde/HTML/en/common/lgpl-license.html
+debian/tmp/usr/share/doc/kde/HTML/en/common/mainfooter.html
+debian/tmp/usr/share/doc/kde/HTML/en/common/mainheader.html
+debian/tmp/usr/share/doc/kde/HTML/en/common/qpl-license.html
+debian/tmp/usr/share/doc/kde/HTML/en/common/shadow.png
+debian/tmp/usr/share/doc/kde/HTML/en/common/top-left.png
+debian/tmp/usr/share/doc/kde/HTML/en/common/top-middle.png
+debian/tmp/usr/share/doc/kde/HTML/en/common/top-right-konqueror.png
+debian/tmp/usr/share/doc/kde/HTML/en/common/web-docbottom.png
+debian/tmp/usr/share/doc/kde/HTML/en/common/web-doctop.png
+debian/tmp/usr/share/doc/kde/HTML/en/common/x11-license.html
+debian/tmp/usr/share/doc/kde/HTML/en/common/xml.dcl
+debian/tmp/usr/share/doc/kde/HTML/en/kspell/common
+debian/tmp/usr/share/doc/kde/HTML/en/kspell/index.cache.bz2
+debian/tmp/usr/share/doc/kde/HTML/en/kspell/index.docbook
+debian/tmp/usr/share/emoticons/Default/angry.png
+debian/tmp/usr/share/emoticons/Default/bat.png
+debian/tmp/usr/share/emoticons/Default/beer.png
+debian/tmp/usr/share/emoticons/Default/biggrin.png
+debian/tmp/usr/share/emoticons/Default/cake.png
+debian/tmp/usr/share/emoticons/Default/camera.png
+debian/tmp/usr/share/emoticons/Default/cat.png
+debian/tmp/usr/share/emoticons/Default/clock.png
+debian/tmp/usr/share/emoticons/Default/cocktail.png
+debian/tmp/usr/share/emoticons/Default/confused.png
+debian/tmp/usr/share/emoticons/Default/cry.png
+debian/tmp/usr/share/emoticons/Default/cup.png
+debian/tmp/usr/share/emoticons/Default/dog.png
+debian/tmp/usr/share/emoticons/Default/email.png
+debian/tmp/usr/share/emoticons/Default/embarassed.png
+debian/tmp/usr/share/emoticons/Default/emoticons.xml
+debian/tmp/usr/share/emoticons/Default/film.png
+debian/tmp/usr/share/emoticons/Default/foot_in_mouth.png
+debian/tmp/usr/share/emoticons/Default/innocent.png
+debian/tmp/usr/share/emoticons/Default/kiss.png
+debian/tmp/usr/share/emoticons/Default/lightbulb.png
+debian/tmp/usr/share/emoticons/Default/love.png
+debian/tmp/usr/share/emoticons/Default/note.png
+debian/tmp/usr/share/emoticons/Default/oh.png
+debian/tmp/usr/share/emoticons/Default/omg.png
+debian/tmp/usr/share/emoticons/Default/phone.png
+debian/tmp/usr/share/emoticons/Default/present.png
+debian/tmp/usr/share/emoticons/Default/rose.png
+debian/tmp/usr/share/emoticons/Default/sad.png
+debian/tmp/usr/share/emoticons/Default/shade.png
+debian/tmp/usr/share/emoticons/Default/sleep.png
+debian/tmp/usr/share/emoticons/Default/smile.png
+debian/tmp/usr/share/emoticons/Default/star.png
+debian/tmp/usr/share/emoticons/Default/teeth.png
+debian/tmp/usr/share/emoticons/Default/thumbs_down.png
+debian/tmp/usr/share/emoticons/Default/thumbs_up.png
+debian/tmp/usr/share/emoticons/Default/tongue.png
+debian/tmp/usr/share/emoticons/Default/undecided.png
+debian/tmp/usr/share/emoticons/Default/unhappy.png
+debian/tmp/usr/share/emoticons/Default/unlove.png
+debian/tmp/usr/share/emoticons/Default/wilted_rose.png
+debian/tmp/usr/share/emoticons/Default/wink.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/actions/fileopen.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/actions/launch.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/actions/share.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/apps/kmenu.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/apps/kttsd.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/apps/password.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/devices/blockdevice.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/devices/camera_mount.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/devices/camera_unmount.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/devices/chardevice.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/devices/compact_flash_mount.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/devices/compact_flash_unmount.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/devices/hdd_mount.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/devices/hdd_unmount.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/devices/ipod_mount.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/devices/ipod_unmount.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/devices/memory_stick_mount.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/devices/memory_stick_unmount.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/devices/mouse.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/devices/print_class.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/devices/printer1.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/devices/sd_mmc_mount.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/devices/sd_mmc_unmount.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/devices/smart_media_mount.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/devices/smart_media_unmount.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/devices/system.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/devices/usbpendrive_mount.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/devices/usbpendrive_unmount.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/filesystems/desktop.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/filesystems/exec.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/filesystems/file_broken.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/filesystems/folder_crystal.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/filesystems/folder_favorite.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/filesystems/folder_green_open.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/filesystems/folder_green.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/filesystems/folder_grey_open.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/filesystems/folder_grey.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/filesystems/folder_home2.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/filesystems/folder_home.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/filesystems/folder_html.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/filesystems/folder_image.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/filesystems/folder_important.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/filesystems/folder_locked.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/filesystems/folder_man.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/filesystems/folder_open.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/filesystems/folder_orange_open.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/filesystems/folder_orange.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/filesystems/folder.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/filesystems/folder_print.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/filesystems/folder_red_open.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/filesystems/folder_red.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/filesystems/folder_sound.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/filesystems/folder_tar.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/filesystems/folder_txt.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/filesystems/folder_video.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/filesystems/folder_violet_open.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/filesystems/folder_violet.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/filesystems/folder_yellow_open.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/filesystems/folder_yellow.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/filesystems/link_overlay.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/filesystems/lock_overlay.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/filesystems/network_local.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/filesystems/network.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/filesystems/pipe.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/filesystems/trashcan_empty.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/filesystems/trashcan_full.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/filesystems/www.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/filesystems/zip_overlay.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/mimetypes/applix.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/mimetypes/ascii.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/mimetypes/binary.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/mimetypes/bt.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/mimetypes/cdimage.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/mimetypes/cdr.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/mimetypes/cdtrack.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/mimetypes/colorscm.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/mimetypes/core.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/mimetypes/deb.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/mimetypes/document2.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/mimetypes/document.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/mimetypes/dvi.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/mimetypes/empty.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/mimetypes/encrypted.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/mimetypes/exec_wine.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/mimetypes/font_bitmap.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/mimetypes/font.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/mimetypes/font_truetype.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/mimetypes/font_type1.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/mimetypes/gf.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/mimetypes/html.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/mimetypes/image.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/mimetypes/info.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/mimetypes/karbon_karbon.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/mimetypes/kexi_kexi.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/mimetypes/kmultiple.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/mimetypes/koffice.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/mimetypes/krita_kra.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/mimetypes/log.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/mimetypes/make.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/mimetypes/man.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/mimetypes/message.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/mimetypes/metafont.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/mimetypes/midi.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/mimetypes/misc.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/mimetypes/mozilla_doc.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/mimetypes/netscape_doc.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/mimetypes/pdf.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/mimetypes/pk.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/mimetypes/postscript.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/mimetypes/quicktime.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/mimetypes/readme.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/mimetypes/recycled.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/mimetypes/resource.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/mimetypes/rpm.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/mimetypes/shellscript.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/mimetypes/soffice.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/mimetypes/sound.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/mimetypes/source_c.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/mimetypes/source_cpp.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/mimetypes/source_f.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/mimetypes/source_h.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/mimetypes/source_java.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/mimetypes/source_j.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/mimetypes/source_l.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/mimetypes/source_moc.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/mimetypes/source_o.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/mimetypes/source_php.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/mimetypes/source_pl.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/mimetypes/source.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/mimetypes/source_p.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/mimetypes/source_py.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/mimetypes/source_s.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/mimetypes/source_y.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/mimetypes/spreadsheet.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/mimetypes/tar.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/mimetypes/template_source.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/mimetypes/tex.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/mimetypes/tgz.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/mimetypes/txt2.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/mimetypes/txt.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/mimetypes/unknown.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/mimetypes/vcalendar.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/mimetypes/vcard.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/mimetypes/vectorgfx.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/mimetypes/video.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/mimetypes/widget_doc.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/mimetypes/wordprocessing.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/mimetypes/zip.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/1downarrow.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/1leftarrow.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/1rightarrow.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/1uparrow.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/2downarrow.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/2leftarrow.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/2rightarrow.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/2uparrow.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/about_kde.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/add.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/airbrush.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/apply.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/attach.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/back.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/blend.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/bookmark_add.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/bookmark_folder.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/bookmark.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/bookmarks_list_add.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/bookmark_toolbar.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/bottom.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/cancel.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/charset.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/clear_left.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/color_fill.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/colorize.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/color_line.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/colorpicker.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/compfile.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/completion.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/configure.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/configure_shortcuts.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/configure_toolbars.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/connect_creating.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/connect_established.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/connect_no.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/contents2.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/contents.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/contexthelp.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/crop.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/decrypted.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/down.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/editclear.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/editcopy.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/editcut.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/editdelete.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/editpaste.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/edit.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/editshred.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/edittrash.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/emptytrash.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/encrypted.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/eraser.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/exec.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/exit.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/fileclose.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/fileexport.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/filefind.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/fileimport.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/filenew.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/fileopen.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/fileprint.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/filequickprint.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/filesaveas.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/filesave.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/fill.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/filter.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/find.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/finish.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/flag.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/folder_new.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/fontsizedown.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/fontsizeup.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/fork.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/forward.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/frame_edit.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/frame_formula.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/frame_image.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/frameprint.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/frame_query.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/frame_spreadsheet.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/frame_text.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/gear.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/gohome.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/goto.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/halfencrypted.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/help.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/history_clear.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/history.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/idea.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/identity.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/info.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/inline_image.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/inline_table.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/kde1.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/kde3.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/kde4.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/kde5.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/kde6.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/kde.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/key_enter.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/knewstuff.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/launch.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/locationbar_erase.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/lock.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/mail_find.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/mail_forward.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/mail_generic.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/mail_get.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/mail_new.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/mail_post_to.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/mail_replyall.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/mail_replylist.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/mail_reply.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/mail_send.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/make_kdevelop.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/math_abs.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/math_brace.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/math_brackets.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/math_frac.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/math_int.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/math_lsub.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/math_lsup.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/math_matrix.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/math_onetwomatrix.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/math_paren.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/math_prod.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/math_rsub.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/math_rsup.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/math_sqrt.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/math_sum.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/misc.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/move.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/music_32ndnote.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/music_cleficon.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/music_cross.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/music_dottednote.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/music_eightnote.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/music_fermatenote.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/music_flat.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/music_fullnote.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/music_halfnote.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/music_natur.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/music_quarternote.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/music_sixteenthnote.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/news_subscribe.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/news_unsubscribe.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/next.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/no.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/ok.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/openterm.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/paintbrush.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/pencil.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/player_eject.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/player_end.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/player_fwd.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/player_pause.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/player_playlist.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/player_play.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/player_rew.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/player_start.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/player_stop.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/player_time.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/player_volume.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/presence_away.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/presence_offline.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/presence_online.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/presence_unknown.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/previous.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/project_open.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/queue.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/rebuild.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/redo.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/reload_all_tabs.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/reload_page.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/reload.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/remove.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/revert.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/rotate_ccw.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/rotate_cw.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/rotate.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/run.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/save_all.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/services.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/share.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/show_side_panel.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/signature.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/spellcheck.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/stamp.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/start.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/stop.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/switchuser.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/tab_breakoff.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/tab_duplicate.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/tab_new_bg.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/tab_new.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/tab_new_raised.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/tab_remove_other.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/tab_remove.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/text_block.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/text_bold.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/text_center.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/text_italic.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/text_left.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/text.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/text_right.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/text_strike.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/text_sub.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/text_super.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/text_under.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/thumbnail.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/today.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/top.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/transform.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/translate.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/undo.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/unlock.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/up.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/view_bottom.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/view_choose.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/view_detailed.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/view_fit_height.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/view_fit_width.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/view_fit_window.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/view_icon.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/view_left_right.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/viewmag1.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/viewmagfit.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/viewmag-.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/viewmag.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/viewmag+.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/view_multicolumn.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/view_remove.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/view_right.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/view_sidetree.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/view_text.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/view_top_bottom.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/view_tree.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/window_fullscreen.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/window_new.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/window_nofullscreen.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/window_suppressed.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/wizard.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/apps/kmenu.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/apps/kttsd.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/apps/password.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/devices/3floppy_mount.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/devices/3floppy_unmount.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/devices/5floppy_mount.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/devices/5floppy_unmount.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/devices/blockdevice.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/devices/camera_mount.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/devices/camera_unmount.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/devices/cdaudio_mount.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/devices/cdaudio_unmount.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/devices/cdrom_mount.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/devices/cdrom_unmount.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/devices/cdwriter_mount.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/devices/cdwriter_unmount.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/devices/chardevice.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/devices/compact_flash_mount.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/devices/compact_flash_unmount.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/devices/dvd_mount.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/devices/dvd_unmount.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/devices/hdd_mount.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/devices/hdd_unmount.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/devices/ipod_mount.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/devices/ipod_unmount.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/devices/joystick.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/devices/memory.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/devices/memory_stick_mount.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/devices/memory_stick_unmount.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/devices/mo_mount.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/devices/mo_unmount.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/devices/mouse.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/devices/nfs_mount.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/devices/nfs_unmount.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/devices/pda_black.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/devices/pda_blue.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/devices/print_class.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/devices/printer1.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/devices/scanner.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/devices/sd_mmc_mount.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/devices/sd_mmc_unmount.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/devices/smart_media_mount.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/devices/smart_media_unmount.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/devices/system.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/devices/tablet.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/devices/tv.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/devices/usbpendrive_mount.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/devices/usbpendrive_unmount.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/devices/zip_mount.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/devices/zip_unmount.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/filesystems/desktop.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/filesystems/exec.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/filesystems/file_broken.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/filesystems/folder_crystal.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/filesystems/folder_favorite.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/filesystems/folder_green_open.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/filesystems/folder_green.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/filesystems/folder_grey_open.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/filesystems/folder_grey.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/filesystems/folder_home2.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/filesystems/folder_home.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/filesystems/folder_html.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/filesystems/folder_image.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/filesystems/folder_important.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/filesystems/folder_inbox.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/filesystems/folder_locked.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/filesystems/folder_man.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/filesystems/folder_open.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/filesystems/folder_orange_open.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/filesystems/folder_orange.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/filesystems/folder_outbox.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/filesystems/folder.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/filesystems/folder_print.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/filesystems/folder_red_open.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/filesystems/folder_red.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/filesystems/folder_sent_mail.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/filesystems/folder_sound.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/filesystems/folder_tar.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/filesystems/folder_txt.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/filesystems/folder_video.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/filesystems/folder_violet_open.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/filesystems/folder_violet.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/filesystems/folder_yellow_open.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/filesystems/folder_yellow.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/filesystems/ftp.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/filesystems/link_overlay.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/filesystems/lock_overlay.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/filesystems/network_local.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/filesystems/network.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/filesystems/pipe.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/filesystems/server.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/filesystems/trashcan_empty.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/filesystems/trashcan_full.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/filesystems/www.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/filesystems/zip_overlay.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/mimetypes/applix.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/mimetypes/ascii.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/mimetypes/binary.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/mimetypes/bt.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/mimetypes/cdimage.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/mimetypes/cdr.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/mimetypes/cdtrack.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/mimetypes/colorscm.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/mimetypes/core.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/mimetypes/deb.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/mimetypes/document2.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/mimetypes/document.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/mimetypes/dvi.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/mimetypes/empty.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/mimetypes/encrypted.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/mimetypes/exec_wine.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/mimetypes/font_bitmap.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/mimetypes/font.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/mimetypes/font_truetype.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/mimetypes/font_type1.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/mimetypes/gettext.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/mimetypes/gf.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/mimetypes/html.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/mimetypes/image.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/mimetypes/info.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/mimetypes/karbon_karbon.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/mimetypes/kchart_chrt.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/mimetypes/kexi_kexi.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/mimetypes/kformula_kfo.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/mimetypes/kivio_flw.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/mimetypes/kmultiple.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/mimetypes/kpresenter_kpr.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/mimetypes/krita_kra.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/mimetypes/kspread_ksp.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/mimetypes/kugar_kud.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/mimetypes/kword_kwd.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/mimetypes/log.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/mimetypes/make.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/mimetypes/man.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/mimetypes/message.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/mimetypes/metafont.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/mimetypes/midi.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/mimetypes/misc.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/mimetypes/netscape_doc.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/mimetypes/news.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/mimetypes/pdf.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/mimetypes/pk.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/mimetypes/postscript.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/mimetypes/quicktime.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/mimetypes/readme.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/mimetypes/recycled.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/mimetypes/resource.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/mimetypes/rpm.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/mimetypes/shellscript.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/mimetypes/sound.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/mimetypes/source_c.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/mimetypes/source_cpp.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/mimetypes/source_f.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/mimetypes/source_h.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/mimetypes/source_java.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/mimetypes/source_l.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/mimetypes/source_moc.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/mimetypes/source_o.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/mimetypes/source_php.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/mimetypes/source_pl.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/mimetypes/source.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/mimetypes/source_py.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/mimetypes/source_s.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/mimetypes/source_y.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/mimetypes/spreadsheet.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/mimetypes/tar.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/mimetypes/template_source.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/mimetypes/tex.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/mimetypes/tgz.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/mimetypes/txt2.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/mimetypes/txt.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/mimetypes/unknown.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/mimetypes/vcalendar.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/mimetypes/vcard.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/mimetypes/vectorgfx.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/mimetypes/video.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/mimetypes/widget_doc.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/mimetypes/wordprocessing.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/mimetypes/zip.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/1downarrow.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/1leftarrow.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/1rightarrow.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/1uparrow.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/2downarrow.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/2leftarrow.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/2rightarrow.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/2uparrow.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/about_kde.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/add.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/airbrush.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/apply.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/attach.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/back.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/blend.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/bookmark_add.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/bookmark_folder.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/bookmark.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/bookmarks_list_add.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/bottom.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/button_cancel.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/button_ok.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/cd.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/centrejust.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/charset.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/clear_left.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/color_fill.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/colorize.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/color_line.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/colorpicker.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/compfile.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/configure.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/connect_creating.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/connect_established.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/connect_no.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/contents2.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/contents.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/contexthelp.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/crop.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/dbgnext.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/dbgrun.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/dbgrunto.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/dbgstep.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/decrypted.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/down.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/editclear.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/editcopy.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/editcut.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/editdelete.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/editpaste.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/edit.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/editshred.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/edittrash.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/emptytrash.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/encrypted.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/eraser.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/exec.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/exit.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/fileclose.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/fileexport.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/filefind.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/fileimport.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/filenew.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/fileopen.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/fileprint.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/filequickprint.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/filesaveas.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/filesave.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/fill.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/filter.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/find.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/finish.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/folder_new.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/folder.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/fontsizedown.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/fontsizeup.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/fork.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/forward.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/frame_chart.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/frame_edit.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/frame_formula.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/frame_image.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/frameprint.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/frame_query.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/frame_spreadsheet.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/frame_text.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/gear.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/gohome.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/goto.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/halfencrypted.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/help.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/history.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/idea.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/identity.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/inline_image.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/inline_table.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/kde.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/key_enter.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/launch.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/leftjust.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/locationbar_erase.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/lock.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/mail_delete.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/mail_find.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/mail_forward.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/mail_generic.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/mail_get.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/mail_new3.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/mail_new.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/mail_post_to3.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/mail_post_to.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/mail_replyall.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/mail_replylist.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/mail_reply.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/mail_send.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/make_kdevelop.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/math_abs.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/math_brace.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/math_brackets.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/math_frac.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/math_int.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/math_lsub.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/math_lsup.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/math_matrix.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/math_onetwomatrix.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/math_paren.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/math_prod.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/math_rsub.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/math_rsup.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/math_sqrt.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/math_sum.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/message_reply.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/misc.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/mouse.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/move.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/music_32ndnote.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/music_cleficon.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/music_cross.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/music_dottednote.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/music_eightnote.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/music_fermatenote.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/music_flat.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/music_fullnote.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/music_halfnote.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/music_natur.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/music_quarternote.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/music_sixteenthnote.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/news_subscribe.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/news_unsubscribe.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/next.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/openterm.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/paintbrush.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/pencil.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/player_eject.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/player_end.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/player_fwd.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/player_pause.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/player_playlist.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/player_play.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/player_rew.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/player_start.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/player_stop.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/previous.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/project_open.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/queue.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/rebuild.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/redo.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/reload3.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/reload_all_tabs.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/reload_page.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/reload.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/remove.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/revert.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/rightjust.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/rotate_ccw.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/rotate_cw.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/rotate.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/run.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/save_all.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/share.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/showmenu.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/show_side_panel.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/signature.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/spellcheck.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/start.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/stop.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/switchuser.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/text_block.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/text_bold.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/text_center.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/text_italic.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/text_left.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/text.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/text_right.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/text_strike.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/text_sub.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/text_super.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/text_under.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/thumbnail.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/today.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/toggle_log.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/top.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/translate.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/undo.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/unlock.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/up.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/view_bottom.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/view_choose.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/view_detailed.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/view_fit_height.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/view_fit_width.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/view_fit_window.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/view_icon.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/view_left_right.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/viewmag1.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/viewmagfit.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/viewmag-.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/viewmag.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/viewmag+.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/view_multicolumn.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/view_remove.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/view_right.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/view_sidetree.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/view_text.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/view_top_bottom.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/view_tree.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/window_fullscreen.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/window_new.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/window_nofullscreen.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/wizard.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/apps/kmenu.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/apps/kttsd.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/apps/password.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/devices/3floppy_mount.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/devices/3floppy_unmount.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/devices/camera_mount.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/devices/camera_unmount.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/devices/cdaudio_unmount.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/devices/compact_flash_mount.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/devices/compact_flash_unmount.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/devices/hdd_mount.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/devices/hdd_unmount.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/devices/ipod_mount.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/devices/ipod_unmount.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/devices/joystick.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/devices/memory_stick_mount.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/devices/memory_stick_unmount.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/devices/print_class.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/devices/printer1.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/devices/sd_mmc_mount.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/devices/sd_mmc_unmount.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/devices/smart_media_mount.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/devices/smart_media_unmount.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/devices/system.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/devices/usbpendrive_mount.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/devices/usbpendrive_unmount.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/filesystems/desktop.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/filesystems/folder_green_open.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/filesystems/folder_green.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/filesystems/folder_grey_open.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/filesystems/folder_grey.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/filesystems/folder_home.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/filesystems/folder_open.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/filesystems/folder_orange_open.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/filesystems/folder_orange.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/filesystems/folder.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/filesystems/folder_print.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/filesystems/folder_red_open.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/filesystems/folder_red.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/filesystems/folder_violet_open.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/filesystems/folder_violet.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/filesystems/folder_yellow_open.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/filesystems/folder_yellow.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/filesystems/link_overlay.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/filesystems/network.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/filesystems/trashcan_empty.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/filesystems/trashcan_full.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/filesystems/www.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/filesystems/zip_overlay.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/mimetypes/applix.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/mimetypes/ascii.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/mimetypes/binary.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/mimetypes/bt.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/mimetypes/cdimage.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/mimetypes/cdtrack.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/mimetypes/colorscm.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/mimetypes/core.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/mimetypes/deb.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/mimetypes/document2.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/mimetypes/document.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/mimetypes/dvi.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/mimetypes/empty.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/mimetypes/encrypted.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/mimetypes/exec_wine.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/mimetypes/file_locked.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/mimetypes/file_temporary.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/mimetypes/font_bitmap.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/mimetypes/font.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/mimetypes/font_truetype.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/mimetypes/font_type1.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/mimetypes/gf.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/mimetypes/html.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/mimetypes/image.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/mimetypes/info.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/mimetypes/karbon_karbon.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/mimetypes/kchart_chrt.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/mimetypes/kexi_kexi.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/mimetypes/kformula_kfo.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/mimetypes/kivio_flw.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/mimetypes/kmultiple.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/mimetypes/koffice.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/mimetypes/kpresenter_kpr.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/mimetypes/krita_kra.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/mimetypes/kspread_ksp.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/mimetypes/kugar_kud.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/mimetypes/kword_kwd.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/mimetypes/log.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/mimetypes/make.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/mimetypes/man.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/mimetypes/message.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/mimetypes/metafont.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/mimetypes/midi.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/mimetypes/mozilla_doc.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/mimetypes/netscape_doc.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/mimetypes/news.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/mimetypes/pdf.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/mimetypes/pk.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/mimetypes/postscript.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/mimetypes/quicktime.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/mimetypes/readme.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/mimetypes/recycled.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/mimetypes/rpm.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/mimetypes/shellscript.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/mimetypes/soffice.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/mimetypes/sound.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/mimetypes/source_c.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/mimetypes/source_cpp.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/mimetypes/source_f.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/mimetypes/source_h.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/mimetypes/source_java.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/mimetypes/source_j.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/mimetypes/source_l.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/mimetypes/source_moc.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/mimetypes/source_o.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/mimetypes/source_pl.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/mimetypes/source.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/mimetypes/source_p.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/mimetypes/source_py.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/mimetypes/source_s.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/mimetypes/source_y.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/mimetypes/spreadsheet.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/mimetypes/tar.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/mimetypes/tex.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/mimetypes/tgz.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/mimetypes/txt2.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/mimetypes/txt.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/mimetypes/unknown.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/mimetypes/vcalendar.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/mimetypes/vcard.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/mimetypes/vectorgfx.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/mimetypes/video.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/mimetypes/widget_doc.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/mimetypes/wordprocessing.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/mimetypes/zip.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/about_kde.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/add.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/apply.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/attach.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/back.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/blend.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/bookmark_add.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/bookmark_folder.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/bookmark.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/bookmarks_list_add.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/bookmark_toolbar.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/bottom.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/button_cancel.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/button_ok.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/centrejust.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/charset.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/clear_left.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/colorize.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/colorpicker.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/compfile.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/configure.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/connect_creating.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/connect_established.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/connect_no.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/contents2.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/contents.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/contexthelp.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/decrypted.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/down.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/editclear.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/editcopy.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/editcut.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/editdelete.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/editpaste.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/edit.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/editshred.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/edittrash.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/emptytrash.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/encrypted.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/eraser.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/exec.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/exit.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/fileclose.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/filefind.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/fileimport.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/filenew.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/fileopen.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/fileprint.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/filequickprint.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/filesaveas.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/filesave.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/filter.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/find.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/finish.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/folder_new.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/fonts.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/forward.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/frameprint.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/gear.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/gohome.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/goto.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/halfencrypted.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/help.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/identity.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/indent.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/kde.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/kdevelop_down.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/knewstuff.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/launch.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/leftjust.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/locationbar_erase.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/lock.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/mail_delete.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/mail_find.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/mail_forward.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/mail_generic.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/mail_get.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/mail_new.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/mail_post_to.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/mail_replyall.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/mail_replylist.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/mail_reply.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/mail_send.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/make_kdevelop.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/math_abs.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/math_brace.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/math_brackets.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/math_frac.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/math_int.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/math_lsub.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/math_lsup.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/math_matrix.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/math_onetwomatrix.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/math_paren.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/math_prod.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/math_rsub.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/math_rsup.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/math_sqrt.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/math_sum.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/messagebox_critical.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/messagebox_info.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/messagebox_warning.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/misc.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/mouse.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/music_32ndnote.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/music_cleficon.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/music_cross.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/music_dottednote.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/music_eightnote.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/music_fermatenote.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/music_flat.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/music_fullnote.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/music_halfnote.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/music_natur.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/music_quarternote.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/music_sixteenthnote.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/next.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/openterm.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/player_eject.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/player_end.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/player_fwd.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/player_pause.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/player_playlist.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/player_play.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/player_rew.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/player_start.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/player_stop.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/presence_away.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/presence_offline.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/presence_online.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/presence_unknown.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/previous.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/project_open.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/queue.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/rebuild.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/redo.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/reload_all_tabs.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/reload_page.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/reload.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/remove.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/revert.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/rightjust.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/rotate_ccw.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/rotate_cw.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/rotate.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/run.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/save_all.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/share.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/show_side_panel.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/signature.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/spellcheck.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/start.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/stop.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/switchuser.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/text_block.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/text_bold.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/text_center.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/text_italic.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/text_left.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/text_right.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/text_strike.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/text_sub.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/text_super.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/text_under.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/today.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/toggle_log.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/top.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/undo.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/unindent.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/unlock.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/up.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/view_bottom.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/view_choose.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/view_detailed.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/view_fit_height.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/view_fit_width.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/view_fit_window.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/view_icon.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/view_left_right.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/viewmag1.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/viewmagfit.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/viewmag-.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/viewmag.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/viewmag+.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/view_multicolumn.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/view_remove.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/view_right.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/view_sidetree.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/view_text.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/view_top_bottom.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/view_tree.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/window_fullscreen.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/window_new.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/window_nofullscreen.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/wizard.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/apps/kmenu.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/apps/kttsd.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/apps/password.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/devices/3floppy_mount.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/devices/3floppy_unmount.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/devices/5floppy_mount.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/devices/5floppy_unmount.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/devices/blockdevice.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/devices/camera_mount.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/devices/camera_unmount.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/devices/cdaudio_mount.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/devices/cdaudio_unmount.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/devices/cdrom_mount.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/devices/cdrom_unmount.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/devices/cdwriter_mount.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/devices/cdwriter_unmount.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/devices/chardevice.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/devices/compact_flash_mount.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/devices/compact_flash_unmount.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/devices/dvd_mount.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/devices/dvd_unmount.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/devices/hdd_mount.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/devices/hdd_unmount.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/devices/ipod_mount.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/devices/ipod_unmount.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/devices/joystick.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/devices/memory.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/devices/memory_stick_mount.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/devices/memory_stick_unmount.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/devices/mo_mount.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/devices/mo_unmount.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/devices/mouse.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/devices/nfs_mount.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/devices/nfs_unmount.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/devices/pda_black.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/devices/pda_blue.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/devices/print_class.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/devices/printer1.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/devices/scanner.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/devices/sd_mmc_mount.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/devices/sd_mmc_unmount.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/devices/smart_media_mount.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/devices/smart_media_unmount.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/devices/system.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/devices/tablet.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/devices/tv.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/devices/usbpendrive_mount.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/devices/usbpendrive_unmount.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/devices/zip_mount.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/devices/zip_unmount.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/filesystems/desktop.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/filesystems/exec.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/filesystems/file_broken.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/filesystems/folder_crystal.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/filesystems/folder_favorite.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/filesystems/folder_green_open.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/filesystems/folder_green.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/filesystems/folder_grey_open.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/filesystems/folder_grey.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/filesystems/folder_home2.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/filesystems/folder_home.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/filesystems/folder_html.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/filesystems/folder_image.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/filesystems/folder_important.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/filesystems/folder_locked.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/filesystems/folder_man.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/filesystems/folder_open.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/filesystems/folder_orange_open.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/filesystems/folder_orange.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/filesystems/folder.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/filesystems/folder_print.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/filesystems/folder_red_open.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/filesystems/folder_red.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/filesystems/folder_sound.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/filesystems/folder_tar.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/filesystems/folder_txt.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/filesystems/folder_video.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/filesystems/folder_violet_open.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/filesystems/folder_violet.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/filesystems/folder_yellow_open.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/filesystems/folder_yellow.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/filesystems/ftp.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/filesystems/link_overlay.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/filesystems/lock_overlay.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/filesystems/network_local.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/filesystems/network.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/filesystems/pipe.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/filesystems/trashcan_empty.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/filesystems/trashcan_full.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/filesystems/www.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/filesystems/zip_overlay.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/mimetypes/applix.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/mimetypes/ascii.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/mimetypes/binary.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/mimetypes/bt.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/mimetypes/cdimage.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/mimetypes/cdr.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/mimetypes/cdtrack.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/mimetypes/colorscm.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/mimetypes/core.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/mimetypes/deb.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/mimetypes/document2.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/mimetypes/document.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/mimetypes/dvi.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/mimetypes/empty.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/mimetypes/exec_wine.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/mimetypes/file_locked.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/mimetypes/file_temporary.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/mimetypes/font_bitmap.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/mimetypes/font.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/mimetypes/font_truetype.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/mimetypes/font_type1.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/mimetypes/gettext.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/mimetypes/gf.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/mimetypes/html.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/mimetypes/image.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/mimetypes/info.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/mimetypes/karbon_karbon.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/mimetypes/kchart_chrt.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/mimetypes/kexi_kexi.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/mimetypes/kformula_kfo.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/mimetypes/kivio_flw.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/mimetypes/kmultiple.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/mimetypes/kpresenter_kpr.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/mimetypes/krita_kra.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/mimetypes/kspread_ksp.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/mimetypes/kugar_kud.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/mimetypes/kword_kwd.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/mimetypes/log.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/mimetypes/make.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/mimetypes/man.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/mimetypes/message.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/mimetypes/metafont.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/mimetypes/midi.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/mimetypes/misc.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/mimetypes/netscape_doc.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/mimetypes/pdf.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/mimetypes/pk.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/mimetypes/postscript.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/mimetypes/quicktime.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/mimetypes/readme.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/mimetypes/recycled.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/mimetypes/resource.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/mimetypes/rpm.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/mimetypes/shellscript.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/mimetypes/soffice.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/mimetypes/sound.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/mimetypes/source_c.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/mimetypes/source_cpp.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/mimetypes/source_f.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/mimetypes/source_h.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/mimetypes/source_java.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/mimetypes/source_j.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/mimetypes/source_l.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/mimetypes/source_moc.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/mimetypes/source_o.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/mimetypes/source_php.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/mimetypes/source_pl.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/mimetypes/source.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/mimetypes/source_p.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/mimetypes/source_py.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/mimetypes/source_s.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/mimetypes/source_y.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/mimetypes/spreadsheet.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/mimetypes/tar.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/mimetypes/template_source.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/mimetypes/tex.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/mimetypes/tgz.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/mimetypes/txt2.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/mimetypes/txt.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/mimetypes/unknown.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/mimetypes/vcalendar.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/mimetypes/vcard.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/mimetypes/vectorgfx.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/mimetypes/video.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/mimetypes/widget_doc.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/mimetypes/wordprocessing.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/mimetypes/zip.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/actions/add.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/actions/back.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/actions/bookmark.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/actions/colorpicker.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/actions/contents2.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/actions/down.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/actions/eraser.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/actions/exit.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/actions/fileclose.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/actions/filenew.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/actions/fileprint.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/actions/filequickprint.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/actions/forward.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/actions/frameprint.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/actions/gear.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/actions/gohome.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/actions/identity.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/actions/indent.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/actions/kde.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/actions/launch.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/actions/lock.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/actions/mail_new.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/actions/mail_post_to.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/actions/misc.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/actions/next.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/actions/player_playlist.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/actions/presence_away.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/actions/presence_offline.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/actions/presence_online.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/actions/previous.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/actions/reload_all_tabs.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/actions/reload_page.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/actions/reload.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/actions/remove.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/actions/rotate_ccw.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/actions/rotate_cw.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/actions/rotate.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/actions/share.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/actions/stop.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/actions/switchuser.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/actions/unindent.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/actions/up.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/actions/wizard.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/apps/kmenu.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/apps/kttsd.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/apps/password.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/devices/3floppy_mount.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/devices/3floppy_unmount.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/devices/5floppy_mount.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/devices/5floppy_unmount.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/devices/blockdevice.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/devices/camera_mount.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/devices/camera_unmount.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/devices/cdaudio_mount.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/devices/cdaudio_unmount.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/devices/cdrom_mount.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/devices/cdrom_unmount.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/devices/cdwriter_mount.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/devices/cdwriter_unmount.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/devices/chardevice.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/devices/compact_flash_mount.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/devices/compact_flash_unmount.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/devices/dvd_mount.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/devices/dvd_unmount.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/devices/hdd_mount.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/devices/hdd_unmount.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/devices/ipod_mount.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/devices/ipod_unmount.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/devices/joystick.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/devices/memory.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/devices/memory_stick_mount.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/devices/memory_stick_unmount.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/devices/mo_mount.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/devices/mo_unmount.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/devices/mouse.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/devices/nfs_mount.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/devices/nfs_unmount.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/devices/pda_black.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/devices/pda_blue.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/devices/print_class.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/devices/printer1.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/devices/scanner.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/devices/sd_mmc_mount.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/devices/sd_mmc_unmount.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/devices/smart_media_mount.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/devices/smart_media_unmount.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/devices/system.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/devices/tablet.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/devices/tv.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/devices/usbpendrive_mount.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/devices/usbpendrive_unmount.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/devices/zip_mount.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/devices/zip_unmount.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/filesystems/desktop.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/filesystems/exec.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/filesystems/file_broken.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/filesystems/folder_crystal.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/filesystems/folder_favorite.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/filesystems/folder_green_open.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/filesystems/folder_green.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/filesystems/folder_grey_open.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/filesystems/folder_grey.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/filesystems/folder_home2.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/filesystems/folder_home.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/filesystems/folder_html.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/filesystems/folder_image.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/filesystems/folder_important.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/filesystems/folder_inbox.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/filesystems/folder_locked.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/filesystems/folder_man.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/filesystems/folder_open.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/filesystems/folder_orange_open.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/filesystems/folder_orange.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/filesystems/folder_outbox.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/filesystems/folder.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/filesystems/folder_print.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/filesystems/folder_red_open.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/filesystems/folder_red.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/filesystems/folder_sound.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/filesystems/folder_tar.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/filesystems/folder_txt.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/filesystems/folder_video.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/filesystems/folder_violet_open.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/filesystems/folder_violet.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/filesystems/folder_yellow_open.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/filesystems/folder_yellow.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/filesystems/ftp.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/filesystems/link_overlay.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/filesystems/lock_overlay.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/filesystems/network_local.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/filesystems/network.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/filesystems/pipe.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/filesystems/server.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/filesystems/trashcan_empty.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/filesystems/trashcan_full.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/filesystems/www.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/filesystems/zip_overlay.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/mimetypes/applix.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/mimetypes/ascii.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/mimetypes/binary.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/mimetypes/bt.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/mimetypes/cdimage.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/mimetypes/cdr.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/mimetypes/cdtrack.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/mimetypes/colorscm.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/mimetypes/core.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/mimetypes/deb.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/mimetypes/document2.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/mimetypes/document.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/mimetypes/dvi.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/mimetypes/empty.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/mimetypes/encrypted.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/mimetypes/exec_wine.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/mimetypes/font_bitmap.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/mimetypes/font.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/mimetypes/font_truetype.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/mimetypes/font_type1.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/mimetypes/gettext.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/mimetypes/gf.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/mimetypes/html.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/mimetypes/image.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/mimetypes/info.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/mimetypes/karbon_karbon.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/mimetypes/kchart_chrt.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/mimetypes/kexi_kexi.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/mimetypes/kformula_kfo.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/mimetypes/kivio_flw.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/mimetypes/kmultiple.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/mimetypes/koffice.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/mimetypes/kpresenter_kpr.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/mimetypes/krita_kra.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/mimetypes/kspread_ksp.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/mimetypes/kugar_kud.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/mimetypes/kword_kwd.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/mimetypes/log.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/mimetypes/make.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/mimetypes/man.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/mimetypes/message.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/mimetypes/metafont.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/mimetypes/midi.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/mimetypes/misc.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/mimetypes/mozilla_doc.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/mimetypes/netscape_doc.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/mimetypes/pdf.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/mimetypes/pk.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/mimetypes/postscript.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/mimetypes/quicktime.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/mimetypes/readme.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/mimetypes/recycled.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/mimetypes/resource.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/mimetypes/rpm.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/mimetypes/shellscript.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/mimetypes/soffice.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/mimetypes/sound.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/mimetypes/source_c.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/mimetypes/source_cpp.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/mimetypes/source_f.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/mimetypes/source_h.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/mimetypes/source_java.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/mimetypes/source_j.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/mimetypes/source_l.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/mimetypes/source_moc.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/mimetypes/source_o.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/mimetypes/source_php.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/mimetypes/source_pl.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/mimetypes/source.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/mimetypes/source_p.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/mimetypes/source_py.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/mimetypes/source_s.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/mimetypes/source_y.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/mimetypes/spreadsheet.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/mimetypes/tar.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/mimetypes/template_source.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/mimetypes/tex.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/mimetypes/tgz.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/mimetypes/txt2.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/mimetypes/txt.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/mimetypes/unknown.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/mimetypes/vcalendar.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/mimetypes/vcard.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/mimetypes/vectorgfx.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/mimetypes/video.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/mimetypes/widget_doc.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/mimetypes/wordprocessing.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/mimetypes/zip.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/actions/favorites.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/actions/fileopen.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/actions/knewstuff.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/actions/player_play.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/actions/share.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/apps/kmenu.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/apps/kttsd.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/apps/password.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/devices/3floppy_mount.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/devices/3floppy_unmount.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/devices/5floppy_mount.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/devices/5floppy_unmount.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/devices/blockdevice.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/devices/camera_mount.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/devices/camera_unmount.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/devices/cdaudio_mount.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/devices/cdaudio_unmount.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/devices/cdrom_mount.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/devices/cdrom_unmount.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/devices/cdwriter_mount.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/devices/cdwriter_unmount.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/devices/chardevice.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/devices/compact_flash_mount.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/devices/compact_flash_unmount.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/devices/dvd_mount.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/devices/dvd_unmount.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/devices/hdd_mount.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/devices/hdd_unmount.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/devices/ipod_mount.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/devices/ipod_unmount.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/devices/joystick.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/devices/memory.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/devices/memory_stick_mount.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/devices/memory_stick_unmount.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/devices/mo_mount.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/devices/mo_unmount.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/devices/mouse.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/devices/nfs_mount.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/devices/nfs_unmount.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/devices/pda_black.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/devices/pda_blue.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/devices/print_class.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/devices/printer1.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/devices/scanner.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/devices/sd_mmc_mount.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/devices/sd_mmc_unmount.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/devices/smart_media_mount.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/devices/smart_media_unmount.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/devices/system.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/devices/tablet.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/devices/tv.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/devices/usbpendrive_mount.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/devices/usbpendrive_unmount.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/devices/zip_mount.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/devices/zip_unmount.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/filesystems/desktop.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/filesystems/exec.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/filesystems/file_broken.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/filesystems/folder_crystal.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/filesystems/folder_favorite.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/filesystems/folder_green_open.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/filesystems/folder_green.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/filesystems/folder_grey_open.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/filesystems/folder_grey.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/filesystems/folder_home2.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/filesystems/folder_home.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/filesystems/folder_html.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/filesystems/folder_image.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/filesystems/folder_important.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/filesystems/folder_locked.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/filesystems/folder_man.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/filesystems/folder_open.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/filesystems/folder_orange_open.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/filesystems/folder_orange.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/filesystems/folder.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/filesystems/folder_print.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/filesystems/folder_red_open.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/filesystems/folder_red.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/filesystems/folder_sound.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/filesystems/folder_tar.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/filesystems/folder_txt.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/filesystems/folder_video.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/filesystems/folder_violet_open.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/filesystems/folder_violet.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/filesystems/folder_yellow_open.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/filesystems/folder_yellow.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/filesystems/link_overlay.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/filesystems/lock_overlay.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/filesystems/network_local.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/filesystems/network.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/filesystems/pipe.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/filesystems/trashcan_empty.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/filesystems/trashcan_full.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/filesystems/www.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/filesystems/zip_overlay.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/mimetypes/applix.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/mimetypes/ascii.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/mimetypes/binary.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/mimetypes/bt.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/mimetypes/cdimage.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/mimetypes/cdr.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/mimetypes/cdtrack.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/mimetypes/colorscm.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/mimetypes/core.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/mimetypes/deb.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/mimetypes/document2.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/mimetypes/document.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/mimetypes/dvi.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/mimetypes/empty.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/mimetypes/encrypted.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/mimetypes/exec_wine.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/mimetypes/font_bitmap.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/mimetypes/font.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/mimetypes/font_truetype.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/mimetypes/font_type1.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/mimetypes/gf.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/mimetypes/html.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/mimetypes/image.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/mimetypes/info.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/mimetypes/karbon_karbon.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/mimetypes/kchart_chrt.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/mimetypes/kformula_kfo.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/mimetypes/kivio_flw.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/mimetypes/kmultiple.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/mimetypes/koffice.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/mimetypes/kpresenter_kpr.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/mimetypes/krita_kra.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/mimetypes/kspread_ksp.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/mimetypes/kugar_kud.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/mimetypes/kword_kwd.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/mimetypes/log.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/mimetypes/make.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/mimetypes/man.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/mimetypes/message.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/mimetypes/metafont.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/mimetypes/midi.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/mimetypes/misc.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/mimetypes/mozilla_doc.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/mimetypes/netscape_doc.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/mimetypes/pdf.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/mimetypes/pk.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/mimetypes/postscript.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/mimetypes/quicktime.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/mimetypes/readme.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/mimetypes/recycled.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/mimetypes/resource.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/mimetypes/rpm.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/mimetypes/shellscript.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/mimetypes/soffice.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/mimetypes/sound.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/mimetypes/source_c.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/mimetypes/source_cpp.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/mimetypes/source_f.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/mimetypes/source_h.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/mimetypes/source_java.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/mimetypes/source_j.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/mimetypes/source_l.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/mimetypes/source_moc.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/mimetypes/source_o.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/mimetypes/source_php.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/mimetypes/source_pl.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/mimetypes/source.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/mimetypes/source_p.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/mimetypes/source_py.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/mimetypes/source_s.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/mimetypes/source_y.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/mimetypes/spreadsheet.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/mimetypes/tar.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/mimetypes/template_source.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/mimetypes/tex.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/mimetypes/tgz.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/mimetypes/txt2.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/mimetypes/txt.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/mimetypes/unknown.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/mimetypes/vcalendar.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/mimetypes/vcard.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/mimetypes/vectorgfx.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/mimetypes/video.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/mimetypes/widget_doc.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/mimetypes/wordprocessing.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/mimetypes/zip.png
+debian/tmp/usr/share/icons/crystalsvg/index.theme
+debian/tmp/usr/share/icons/default.kde
+debian/tmp/usr/share/locale/all_languages
+debian/tmp/usr/share/mimelnk/all/all.desktop
+debian/tmp/usr/share/mimelnk/all/allfiles.desktop
+debian/tmp/usr/share/mimelnk/application/chm.desktop
+debian/tmp/usr/share/mimelnk/application/fits.desktop
+debian/tmp/usr/share/mimelnk/application/illustrator.desktop
+debian/tmp/usr/share/mimelnk/application/java.desktop
+debian/tmp/usr/share/mimelnk/application/mathml+xml.desktop
+debian/tmp/usr/share/mimelnk/application/mbox.desktop
+debian/tmp/usr/share/mimelnk/application/msexcel.desktop
+debian/tmp/usr/share/mimelnk/application/mspowerpoint.desktop
+debian/tmp/usr/share/mimelnk/application/msword.desktop
+debian/tmp/usr/share/mimelnk/application/octet-stream.desktop
+debian/tmp/usr/share/mimelnk/application/ogg.desktop
+debian/tmp/usr/share/mimelnk/application/pdf.desktop
+debian/tmp/usr/share/mimelnk/application/pgp.desktop
+debian/tmp/usr/share/mimelnk/application/pgp-encrypted.desktop
+debian/tmp/usr/share/mimelnk/application/pgp-keys.desktop
+debian/tmp/usr/share/mimelnk/application/pgp-signature.desktop
+debian/tmp/usr/share/mimelnk/application/pkcs10.desktop
+debian/tmp/usr/share/mimelnk/application/pkcs7-mime.desktop
+debian/tmp/usr/share/mimelnk/application/pkcs7-signature.desktop
+debian/tmp/usr/share/mimelnk/application/postscript.desktop
+debian/tmp/usr/share/mimelnk/application/relaxng.desktop
+debian/tmp/usr/share/mimelnk/application/sieve.desktop
+debian/tmp/usr/share/mimelnk/application/smil.desktop
+debian/tmp/usr/share/mimelnk/application/vnd.mozilla.xul+xml.desktop
+debian/tmp/usr/share/mimelnk/application/vnd.ms-asf.desktop
+debian/tmp/usr/share/mimelnk/application/vnd.ms-excel.desktop
+debian/tmp/usr/share/mimelnk/application/vnd.ms-powerpoint.desktop
+debian/tmp/usr/share/mimelnk/application/vnd.ms-word.desktop
+debian/tmp/usr/share/mimelnk/application/vnd.oasis.opendocument.chart.desktop
+debian/tmp/usr/share/mimelnk/application/vnd.oasis.opendocument.formula.desktop
+debian/tmp/usr/share/mimelnk/application/vnd.oasis.opendocument.graphics.desktop
+debian/tmp/usr/share/mimelnk/application/vnd.oasis.opendocument.graphics-template.desktop
+debian/tmp/usr/share/mimelnk/application/vnd.oasis.opendocument.image.desktop
+debian/tmp/usr/share/mimelnk/application/vnd.oasis.opendocument.presentation.desktop
+debian/tmp/usr/share/mimelnk/application/vnd.oasis.opendocument.presentation-template.desktop
+debian/tmp/usr/share/mimelnk/application/vnd.oasis.opendocument.spreadsheet.desktop
+debian/tmp/usr/share/mimelnk/application/vnd.oasis.opendocument.spreadsheet-template.desktop
+debian/tmp/usr/share/mimelnk/application/vnd.oasis.opendocument.text.desktop
+debian/tmp/usr/share/mimelnk/application/vnd.oasis.opendocument.text-template.desktop
+debian/tmp/usr/share/mimelnk/application/vnd.palm.desktop
+debian/tmp/usr/share/mimelnk/application/vnd.rn-realmedia.desktop
+debian/tmp/usr/share/mimelnk/application/vnd.stardivision.calc.desktop
+debian/tmp/usr/share/mimelnk/application/vnd.stardivision.chart.desktop
+debian/tmp/usr/share/mimelnk/application/vnd.stardivision.draw.desktop
+debian/tmp/usr/share/mimelnk/application/vnd.stardivision.impress.desktop
+debian/tmp/usr/share/mimelnk/application/vnd.stardivision.math.desktop
+debian/tmp/usr/share/mimelnk/application/vnd.stardivision.writer.desktop
+debian/tmp/usr/share/mimelnk/application/vnd.stardivision.writer-global.desktop
+debian/tmp/usr/share/mimelnk/application/vnd.sun.xml.base.desktop
+debian/tmp/usr/share/mimelnk/application/vnd.sun.xml.calc.desktop
+debian/tmp/usr/share/mimelnk/application/vnd.sun.xml.calc.template.desktop
+debian/tmp/usr/share/mimelnk/application/vnd.sun.xml.draw.desktop
+debian/tmp/usr/share/mimelnk/application/vnd.sun.xml.draw.template.desktop
+debian/tmp/usr/share/mimelnk/application/vnd.sun.xml.impress.desktop
+debian/tmp/usr/share/mimelnk/application/vnd.sun.xml.impress.template.desktop
+debian/tmp/usr/share/mimelnk/application/vnd.sun.xml.writer.desktop
+debian/tmp/usr/share/mimelnk/application/vnd.sun.xml.writer.master.desktop
+debian/tmp/usr/share/mimelnk/application/vnd.sun.xml.writer.template.desktop
+debian/tmp/usr/share/mimelnk/application/wordperfect.desktop
+debian/tmp/usr/share/mimelnk/application/x-7z.desktop
+debian/tmp/usr/share/mimelnk/application/x-abiword.desktop
+debian/tmp/usr/share/mimelnk/application/x-ace.desktop
+debian/tmp/usr/share/mimelnk/application/x-afm.desktop
+debian/tmp/usr/share/mimelnk/application/x-amipro.desktop
+debian/tmp/usr/share/mimelnk/application/x-applix.desktop
+debian/tmp/usr/share/mimelnk/application/x-applixgraphics.desktop
+debian/tmp/usr/share/mimelnk/application/x-applixspread.desktop
+debian/tmp/usr/share/mimelnk/application/x-applixword.desktop
+debian/tmp/usr/share/mimelnk/application/x-arc.desktop
+debian/tmp/usr/share/mimelnk/application/x-archive.desktop
+debian/tmp/usr/share/mimelnk/application/x-arj.desktop
+debian/tmp/usr/share/mimelnk/application/x-awk.desktop
+debian/tmp/usr/share/mimelnk/application/x-bittorrent.desktop
+debian/tmp/usr/share/mimelnk/application/x-bz2dvi.desktop
+debian/tmp/usr/share/mimelnk/application/x-bzip2.desktop
+debian/tmp/usr/share/mimelnk/application/x-bzip.desktop
+debian/tmp/usr/share/mimelnk/application/x-cda.desktop
+debian/tmp/usr/share/mimelnk/application/x-compress.desktop
+debian/tmp/usr/share/mimelnk/application/x-core.desktop
+debian/tmp/usr/share/mimelnk/application/x-cpio.desktop
+debian/tmp/usr/share/mimelnk/application/x-cue.desktop
+debian/tmp/usr/share/mimelnk/application/x-dbase.desktop
+debian/tmp/usr/share/mimelnk/application/x-deb.desktop
+debian/tmp/usr/share/mimelnk/application/x-debian-package.desktop
+debian/tmp/usr/share/mimelnk/application/x-designer.desktop
+debian/tmp/usr/share/mimelnk/application/x-desktop.desktop
+debian/tmp/usr/share/mimelnk/application/x-dvi.desktop
+debian/tmp/usr/share/mimelnk/application/x-executable.desktop
+debian/tmp/usr/share/mimelnk/application/x-executable-script.desktop
+debian/tmp/usr/share/mimelnk/application/x-font-bdf.desktop
+debian/tmp/usr/share/mimelnk/application/x-font-ghostscript.desktop
+debian/tmp/usr/share/mimelnk/application/x-font-otf.desktop
+debian/tmp/usr/share/mimelnk/application/x-font-pcf.desktop
+debian/tmp/usr/share/mimelnk/application/x-font-snf.desktop
+debian/tmp/usr/share/mimelnk/application/x-font-speedo.desktop
+debian/tmp/usr/share/mimelnk/application/x-font-ttc.desktop
+debian/tmp/usr/share/mimelnk/application/x-font-ttf.desktop
+debian/tmp/usr/share/mimelnk/application/x-font-type1.desktop
+debian/tmp/usr/share/mimelnk/application/x-gettext.desktop
+debian/tmp/usr/share/mimelnk/application/x-gnumeric.desktop
+debian/tmp/usr/share/mimelnk/application/x-graphite.desktop
+debian/tmp/usr/share/mimelnk/application/x-gzdvi.desktop
+debian/tmp/usr/share/mimelnk/application/x-gzip.desktop
+debian/tmp/usr/share/mimelnk/application/x-gzpostscript.desktop
+debian/tmp/usr/share/mimelnk/application/x-hancomword.desktop
+debian/tmp/usr/share/mimelnk/application/xhtml+xml.desktop
+debian/tmp/usr/share/mimelnk/application/x-ica.desktop
+debian/tmp/usr/share/mimelnk/application/x-iso.desktop
+debian/tmp/usr/share/mimelnk/application/x-jar.desktop
+debian/tmp/usr/share/mimelnk/application/x-java-applet.desktop
+debian/tmp/usr/share/mimelnk/application/x-java.desktop
+debian/tmp/usr/share/mimelnk/application/x-java-jnlp-file.desktop
+debian/tmp/usr/share/mimelnk/application/x-javascript.desktop
+debian/tmp/usr/share/mimelnk/application/x-karbon.desktop
+debian/tmp/usr/share/mimelnk/application/x-kchart.desktop
+debian/tmp/usr/share/mimelnk/application/x-kcsrc.desktop
+debian/tmp/usr/share/mimelnk/application/x-kde-wallet.desktop
+debian/tmp/usr/share/mimelnk/application/x-kformula.desktop
+debian/tmp/usr/share/mimelnk/application/x-kivio.desktop
+debian/tmp/usr/share/mimelnk/application/x-kontour.desktop
+debian/tmp/usr/share/mimelnk/application/x-kpovmodeler.desktop
+debian/tmp/usr/share/mimelnk/application/x-kpresenter.desktop
+debian/tmp/usr/share/mimelnk/application/x-krita.desktop
+debian/tmp/usr/share/mimelnk/application/x-kspread.desktop
+debian/tmp/usr/share/mimelnk/application/x-kudesigner.desktop
+debian/tmp/usr/share/mimelnk/application/x-kugar.desktop
+debian/tmp/usr/share/mimelnk/application/x-kword.desktop
+debian/tmp/usr/share/mimelnk/application/x-lha.desktop
+debian/tmp/usr/share/mimelnk/application/x-linguist.desktop
+debian/tmp/usr/share/mimelnk/application/x-lyx.desktop
+debian/tmp/usr/share/mimelnk/application/x-lzop.desktop
+debian/tmp/usr/share/mimelnk/application/x-magicpoint.desktop
+debian/tmp/usr/share/mimelnk/application/x-mimearchive.desktop
+debian/tmp/usr/share/mimelnk/application/xml.desktop
+debian/tmp/usr/share/mimelnk/application/xml-dtd.desktop
+debian/tmp/usr/share/mimelnk/application/x-mplayer2.desktop
+debian/tmp/usr/share/mimelnk/application/x-msaccess.desktop
+debian/tmp/usr/share/mimelnk/application/x-msdos-program.desktop
+debian/tmp/usr/share/mimelnk/application/x-msmetafile.desktop
+debian/tmp/usr/share/mimelnk/application/x-mswrite.desktop
+debian/tmp/usr/share/mimelnk/application/x-object.desktop
+debian/tmp/usr/share/mimelnk/application/x-ogg.desktop
+debian/tmp/usr/share/mimelnk/application/x-ooimpress.desktop
+debian/tmp/usr/share/mimelnk/application/x-oowriter.desktop
+debian/tmp/usr/share/mimelnk/application/x-pak.desktop
+debian/tmp/usr/share/mimelnk/application/x-perl.desktop
+debian/tmp/usr/share/mimelnk/application/x-perl-module.desktop
+debian/tmp/usr/share/mimelnk/application/x-php.desktop
+debian/tmp/usr/share/mimelnk/application/x-pkcs12.desktop
+debian/tmp/usr/share/mimelnk/application/x-python-bytecode.desktop
+debian/tmp/usr/share/mimelnk/application/x-python.desktop
+debian/tmp/usr/share/mimelnk/application/x-quattropro.desktop
+debian/tmp/usr/share/mimelnk/application/x-rar-compressed.desktop
+debian/tmp/usr/share/mimelnk/application/x-rar.desktop
+debian/tmp/usr/share/mimelnk/application/x-rpm.desktop
+debian/tmp/usr/share/mimelnk/application/x-ruby.desktop
+debian/tmp/usr/share/mimelnk/application/xsd.desktop
+debian/tmp/usr/share/mimelnk/application/x-sharedlib.desktop
+debian/tmp/usr/share/mimelnk/application/x-shellscript.desktop
+debian/tmp/usr/share/mimelnk/application/x-shockwave-flash.desktop
+debian/tmp/usr/share/mimelnk/application/x-sqlite2.desktop
+debian/tmp/usr/share/mimelnk/application/x-sqlite3.desktop
+debian/tmp/usr/share/mimelnk/application/x-tar.desktop
+debian/tmp/usr/share/mimelnk/application/x-tarz.desktop
+debian/tmp/usr/share/mimelnk/application/x-tbz.desktop
+debian/tmp/usr/share/mimelnk/application/x-tex-gf.desktop
+debian/tmp/usr/share/mimelnk/application/x-tex-pk.desktop
+debian/tmp/usr/share/mimelnk/application/x-tgif.desktop
+debian/tmp/usr/share/mimelnk/application/x-tgz.desktop
+debian/tmp/usr/share/mimelnk/application/x-trash.desktop
+debian/tmp/usr/share/mimelnk/application/x-troff.desktop
+debian/tmp/usr/share/mimelnk/application/x-troff-man.desktop
+debian/tmp/usr/share/mimelnk/application/x-tzo.desktop
+debian/tmp/usr/share/mimelnk/application/x-vnd.kde.kexi.desktop
+debian/tmp/usr/share/mimelnk/application/x-vnd.kde.kplato.desktop
+debian/tmp/usr/share/mimelnk/application/x-vnd.kde.kugar.mixed.desktop
+debian/tmp/usr/share/mimelnk/application/x-webarchive.desktop
+debian/tmp/usr/share/mimelnk/application/x-x509-ca-cert.desktop
+debian/tmp/usr/share/mimelnk/application/x-xliff.desktop
+debian/tmp/usr/share/mimelnk/application/x-zerosize.desktop
+debian/tmp/usr/share/mimelnk/application/x-zip.desktop
+debian/tmp/usr/share/mimelnk/application/x-zoo.desktop
+debian/tmp/usr/share/mimelnk/application/x-nzb.desktop
+debian/tmp/usr/share/mimelnk/audio/aac.desktop
+debian/tmp/usr/share/mimelnk/audio/ac3.desktop
+debian/tmp/usr/share/mimelnk/audio/basic.desktop
+debian/tmp/usr/share/mimelnk/audio/mp4.desktop
+debian/tmp/usr/share/mimelnk/audio/mpeg.desktop
+debian/tmp/usr/share/mimelnk/audio/mpegurl.desktop
+debian/tmp/usr/share/mimelnk/audio/prs.sid.desktop
+debian/tmp/usr/share/mimelnk/audio/vnd.rn-realaudio.desktop
+debian/tmp/usr/share/mimelnk/audio/vorbis.desktop
+debian/tmp/usr/share/mimelnk/audio/x-adpcm.desktop
+debian/tmp/usr/share/mimelnk/audio/x-aiff.desktop
+debian/tmp/usr/share/mimelnk/audio/x-flac.desktop
+debian/tmp/usr/share/mimelnk/audio/x-matroska.desktop
+debian/tmp/usr/share/mimelnk/audio/x-midi.desktop
+debian/tmp/usr/share/mimelnk/audio/x-mod.desktop
+debian/tmp/usr/share/mimelnk/audio/x-mp2.desktop
+debian/tmp/usr/share/mimelnk/audio/x-mp3.desktop
+debian/tmp/usr/share/mimelnk/audio/x-mpegurl.desktop
+debian/tmp/usr/share/mimelnk/audio/x-ms-wma.desktop
+debian/tmp/usr/share/mimelnk/audio/x-musepack.desktop
+debian/tmp/usr/share/mimelnk/audio/x-oggflac.desktop
+debian/tmp/usr/share/mimelnk/audio/x-pn-realaudio.desktop
+debian/tmp/usr/share/mimelnk/audio/x-pn-realaudio-plugin.desktop
+debian/tmp/usr/share/mimelnk/audio/x-scpls.desktop
+debian/tmp/usr/share/mimelnk/audio/x-speex.desktop
+debian/tmp/usr/share/mimelnk/audio/x-vorbis.desktop
+debian/tmp/usr/share/mimelnk/audio/x-wav.desktop
+debian/tmp/usr/share/mimelnk/image/cgm.desktop
+debian/tmp/usr/share/mimelnk/image/fax-g3.desktop
+debian/tmp/usr/share/mimelnk/image/fits.desktop
+debian/tmp/usr/share/mimelnk/image/gif.desktop
+debian/tmp/usr/share/mimelnk/image/jp2.desktop
+debian/tmp/usr/share/mimelnk/image/jpeg.desktop
+debian/tmp/usr/share/mimelnk/image/jpg.desktop
+debian/tmp/usr/share/mimelnk/image/pjpeg.desktop
+debian/tmp/usr/share/mimelnk/image/png.desktop
+debian/tmp/usr/share/mimelnk/image/svg-xml.desktop
+debian/tmp/usr/share/mimelnk/image/svg+xml.desktop
+debian/tmp/usr/share/mimelnk/image/tiff.desktop
+debian/tmp/usr/share/mimelnk/image/wmf.desktop
+debian/tmp/usr/share/mimelnk/image/x-bmp.desktop
+debian/tmp/usr/share/mimelnk/image/x-dds.desktop
+debian/tmp/usr/share/mimelnk/image/x-djvu-2.desktop
+debian/tmp/usr/share/mimelnk/image/x-djvu.desktop
+debian/tmp/usr/share/mimelnk/image/x-eps.desktop
+debian/tmp/usr/share/mimelnk/image/x-exr.desktop
+debian/tmp/usr/share/mimelnk/image/x-hdr.desktop
+debian/tmp/usr/share/mimelnk/image/x-ico.desktop
+debian/tmp/usr/share/mimelnk/image/x-jng.desktop
+debian/tmp/usr/share/mimelnk/image/x-msod.desktop
+debian/tmp/usr/share/mimelnk/image/x-pcx.desktop
+debian/tmp/usr/share/mimelnk/image/x-photo-cd.desktop
+debian/tmp/usr/share/mimelnk/image/x-portable-bitmap.desktop
+debian/tmp/usr/share/mimelnk/image/x-portable-greymap.desktop
+debian/tmp/usr/share/mimelnk/image/x-portable-pixmap.desktop
+debian/tmp/usr/share/mimelnk/image/x-raw.desktop
+debian/tmp/usr/share/mimelnk/image/x-rgb.desktop
+debian/tmp/usr/share/mimelnk/image/x-targa.desktop
+debian/tmp/usr/share/mimelnk/image/x-vnd.adobe.photoshop.desktop
+debian/tmp/usr/share/mimelnk/image/x-vnd.trolltech.qpicture.desktop
+debian/tmp/usr/share/mimelnk/image/x-wmf.desktop
+debian/tmp/usr/share/mimelnk/image/x-xbm.desktop
+debian/tmp/usr/share/mimelnk/image/x-xcf-gimp.desktop
+debian/tmp/usr/share/mimelnk/image/x-xcursor.desktop
+debian/tmp/usr/share/mimelnk/image/x-xfig.desktop
+debian/tmp/usr/share/mimelnk/image/x-xpm.desktop
+debian/tmp/usr/share/mimelnk/inode/block.desktop
+debian/tmp/usr/share/mimelnk/inode/chardevice.desktop
+debian/tmp/usr/share/mimelnk/inode/directory.desktop
+debian/tmp/usr/share/mimelnk/inode/directory-locked.desktop
+debian/tmp/usr/share/mimelnk/inode/fifo.desktop
+debian/tmp/usr/share/mimelnk/inode/socket.desktop
+debian/tmp/usr/share/mimelnk/magic
+debian/tmp/usr/share/mimelnk/message/news.desktop
+debian/tmp/usr/share/mimelnk/message/rfc822.desktop
+debian/tmp/usr/share/mimelnk/model/vrml.desktop
+debian/tmp/usr/share/mimelnk/multipart/mixed.desktop
+debian/tmp/usr/share/mimelnk/multipart/x-mixed-replace.desktop
+debian/tmp/usr/share/mimelnk/text/calendar.desktop
+debian/tmp/usr/share/mimelnk/text/css.desktop
+debian/tmp/usr/share/mimelnk/text/docbook.desktop
+debian/tmp/usr/share/mimelnk/text/enriched.desktop
+debian/tmp/usr/share/mimelnk/text/html.desktop
+debian/tmp/usr/share/mimelnk/text/javascript.desktop
+debian/tmp/usr/share/mimelnk/text/plain.desktop
+debian/tmp/usr/share/mimelnk/text/rdf.desktop
+debian/tmp/usr/share/mimelnk/text/rss.desktop
+debian/tmp/usr/share/mimelnk/text/rtf.desktop
+debian/tmp/usr/share/mimelnk/text/sgml.desktop
+debian/tmp/usr/share/mimelnk/text/vnd.abc.desktop
+debian/tmp/usr/share/mimelnk/text/vnd.wap.wml.desktop
+debian/tmp/usr/share/mimelnk/text/x-adasrc.desktop
+debian/tmp/usr/share/mimelnk/text/x-bibtex.desktop
+debian/tmp/usr/share/mimelnk/text/x-c++hdr.desktop
+debian/tmp/usr/share/mimelnk/text/x-chdr.desktop
+debian/tmp/usr/share/mimelnk/text/x-c++src.desktop
+debian/tmp/usr/share/mimelnk/text/x-csrc.desktop
+debian/tmp/usr/share/mimelnk/text/x-csv.desktop
+debian/tmp/usr/share/mimelnk/text/x-diff.desktop
+debian/tmp/usr/share/mimelnk/text/x-hex.desktop
+debian/tmp/usr/share/mimelnk/text/x-java.desktop
+debian/tmp/usr/share/mimelnk/text/x-katefilelist.desktop
+debian/tmp/usr/share/mimelnk/text/x-latex.desktop
+debian/tmp/usr/share/mimelnk/text/x-ldif.desktop
+debian/tmp/usr/share/mimelnk/text/x-log.desktop
+debian/tmp/usr/share/mimelnk/text/x-lyx.desktop
+debian/tmp/usr/share/mimelnk/text/x-makefile.desktop
+debian/tmp/usr/share/mimelnk/text/xml.desktop
+debian/tmp/usr/share/mimelnk/text/x-moc.desktop
+debian/tmp/usr/share/mimelnk/text/x-mswinurl.desktop
+debian/tmp/usr/share/mimelnk/text/x-objchdr.desktop
+debian/tmp/usr/share/mimelnk/text/x-objcsrc.desktop
+debian/tmp/usr/share/mimelnk/text/x-pascal.desktop
+debian/tmp/usr/share/mimelnk/text/x-perl.desktop
+debian/tmp/usr/share/mimelnk/text/x-python.desktop
+debian/tmp/usr/share/mimelnk/text/x-tcl.desktop
+debian/tmp/usr/share/mimelnk/text/x-tex.desktop
+debian/tmp/usr/share/mimelnk/text/x-vcalendar.desktop
+debian/tmp/usr/share/mimelnk/text/x-vcard.desktop
+debian/tmp/usr/share/mimelnk/text/x-xslfo.desktop
+debian/tmp/usr/share/mimelnk/text/x-xslt.desktop
+debian/tmp/usr/share/mimelnk/uri/mms.desktop
+debian/tmp/usr/share/mimelnk/uri/mmst.desktop
+debian/tmp/usr/share/mimelnk/uri/mmsu.desktop
+debian/tmp/usr/share/mimelnk/uri/pnm.desktop
+debian/tmp/usr/share/mimelnk/uri/rtspt.desktop
+debian/tmp/usr/share/mimelnk/uri/rtspu.desktop
+debian/tmp/usr/share/mimelnk/video/avi.desktop
+debian/tmp/usr/share/mimelnk/video/mp4.desktop
+debian/tmp/usr/share/mimelnk/video/mpeg.desktop
+debian/tmp/usr/share/mimelnk/video/quicktime.desktop
+debian/tmp/usr/share/mimelnk/video/vnd.rn-realvideo.desktop
+debian/tmp/usr/share/mimelnk/video/x-flic.desktop
+debian/tmp/usr/share/mimelnk/video/x-matroska.desktop
+debian/tmp/usr/share/mimelnk/video/x-mng.desktop
+debian/tmp/usr/share/mimelnk/video/x-ms-asf.desktop
+debian/tmp/usr/share/mimelnk/video/x-msvideo.desktop
+debian/tmp/usr/share/mimelnk/video/x-ms-wmv.desktop
+debian/tmp/usr/share/mimelnk/video/x-ogm.desktop
+debian/tmp/usr/share/mimelnk/video/x-theora.desktop
+debian/tmp/usr/share/services/bmp.kimgio
+debian/tmp/usr/share/services/data.protocol
+debian/tmp/usr/share/services/dds.kimgio
+debian/tmp/usr/share/services/eps.kimgio
+debian/tmp/usr/share/services/exr.kimgio
+debian/tmp/usr/share/services/file.protocol
+debian/tmp/usr/share/services/ftp.protocol
+debian/tmp/usr/share/services/ghelp.protocol
+debian/tmp/usr/share/services/gif.kimgio
+debian/tmp/usr/share/services/hdr.kimgio
+debian/tmp/usr/share/services/help.protocol
+debian/tmp/usr/share/services/http_cache_cleaner.desktop
+debian/tmp/usr/share/services/http.protocol
+debian/tmp/usr/share/services/https.protocol
+debian/tmp/usr/share/services/ico.kimgio
+debian/tmp/usr/share/services/jp2.kimgio
+debian/tmp/usr/share/services/jpeg.kimgio
+debian/tmp/usr/share/services/katepart.desktop
+debian/tmp/usr/share/services/kbzip2filter.desktop
+debian/tmp/usr/share/services/kcertpart.desktop
+debian/tmp/usr/share/services/kded/kcookiejar.desktop
+debian/tmp/usr/share/services/kded/kdeprintd.desktop
+debian/tmp/usr/share/services/kded/kdetrayproxy.desktop
+debian/tmp/usr/share/services/kded/kpasswdserver.desktop
+debian/tmp/usr/share/services/kded/kssld.desktop
+debian/tmp/usr/share/services/kded/kwalletd.desktop
+debian/tmp/usr/share/services/kded/proxyscout.desktop
+debian/tmp/usr/share/services/kgzipfilter.desktop
+debian/tmp/usr/share/services/khtml.desktop
+debian/tmp/usr/share/services/khtmlimage.desktop
+debian/tmp/usr/share/services/kio_uiserver.desktop
+debian/tmp/usr/share/services/kjavaappletviewer.desktop
+debian/tmp/usr/share/services/kmailservice.protocol
+debian/tmp/usr/share/services/kmultipart.desktop
+debian/tmp/usr/share/services/knotify.desktop
+debian/tmp/usr/share/services/kresources/kabc/dir.desktop
+debian/tmp/usr/share/services/kresources/kabc/file.desktop
+debian/tmp/usr/share/services/kresources/kabc/ldapkio.desktop
+debian/tmp/usr/share/services/kresources/kabc_manager.desktop
+debian/tmp/usr/share/services/kspell_aspell.desktop
+debian/tmp/usr/share/services/kspell_hspell.desktop
+debian/tmp/usr/share/services/kspell_ispell.desktop
+debian/tmp/usr/share/services/ktexteditor_docwordcompletion.desktop
+debian/tmp/usr/share/services/ktexteditor_insertfile.desktop
+debian/tmp/usr/share/services/ktexteditor_isearch.desktop
+debian/tmp/usr/share/services/ktexteditor_kdatatool.desktop
+debian/tmp/usr/share/services/metainfo.protocol
+debian/tmp/usr/share/services/mms.protocol
+debian/tmp/usr/share/services/mmst.protocol
+debian/tmp/usr/share/services/mmsu.protocol
+debian/tmp/usr/share/services/mng.kimgio
+debian/tmp/usr/share/services/pbm.kimgio
+debian/tmp/usr/share/services/pcx.kimgio
+debian/tmp/usr/share/services/pgm.kimgio
+debian/tmp/usr/share/services/png.kimgio
+debian/tmp/usr/share/services/pnm.protocol
+debian/tmp/usr/share/services/ppm.kimgio
+debian/tmp/usr/share/services/psd.kimgio
+debian/tmp/usr/share/services/rgb.kimgio
+debian/tmp/usr/share/services/rlogin.protocol
+debian/tmp/usr/share/services/rtsp.protocol
+debian/tmp/usr/share/services/rtspt.protocol
+debian/tmp/usr/share/services/rtspu.protocol
+debian/tmp/usr/share/services/shellscript.desktop
+debian/tmp/usr/share/services/ssh.protocol
+debian/tmp/usr/share/services/telnet.protocol
+debian/tmp/usr/share/services/tga.kimgio
+debian/tmp/usr/share/services/tiff.kimgio
+debian/tmp/usr/share/services/webdav.protocol
+debian/tmp/usr/share/services/webdavs.protocol
+debian/tmp/usr/share/services/xbm.kimgio
+debian/tmp/usr/share/services/xcf.kimgio
+debian/tmp/usr/share/services/xpm.kimgio
+debian/tmp/usr/share/services/xv.kimgio
+debian/tmp/usr/share/servicetypes/application.desktop
+debian/tmp/usr/share/servicetypes/browserview.desktop
+debian/tmp/usr/share/servicetypes/dcopinstantmessenger.desktop
+debian/tmp/usr/share/servicetypes/dcoptexttospeech.desktop
+debian/tmp/usr/share/servicetypes/kbytesedit.desktop
+debian/tmp/usr/share/servicetypes/kcmodule.desktop
+debian/tmp/usr/share/servicetypes/kcomprfilter.desktop
+debian/tmp/usr/share/servicetypes/kdatatool.desktop
+debian/tmp/usr/share/servicetypes/kdedmodule.desktop
+debian/tmp/usr/share/servicetypes/kfileplugin.desktop
+debian/tmp/usr/share/servicetypes/kmediaplayer.desktop
+debian/tmp/usr/share/servicetypes/kmediaplayerengine.desktop
+debian/tmp/usr/share/servicetypes/kpart.desktop
+debian/tmp/usr/share/servicetypes/kplugininfo.desktop
+debian/tmp/usr/share/servicetypes/kpropsdlgplugin.desktop
+debian/tmp/usr/share/servicetypes/kregexpeditor.desktop
+debian/tmp/usr/share/servicetypes/kresources_manager.desktop
+debian/tmp/usr/share/servicetypes/kresources_plugin.desktop
+debian/tmp/usr/share/servicetypes/krop.desktop
+debian/tmp/usr/share/servicetypes/krwp.desktop
+debian/tmp/usr/share/servicetypes/kscan.desktop
+debian/tmp/usr/share/servicetypes/kspellclient.desktop
+debian/tmp/usr/share/servicetypes/ktexteditor.desktop
+debian/tmp/usr/share/servicetypes/ktexteditoreditor.desktop
+debian/tmp/usr/share/servicetypes/ktexteditorplugin.desktop
+debian/tmp/usr/share/servicetypes/kurifilterplugin.desktop
+debian/tmp/usr/share/servicetypes/renamedlgplugin.desktop
+debian/tmp/usr/share/servicetypes/scriptinterface.desktop
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/suspend.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/suspend.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/suspend.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/actions/suspend.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/hibernate.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/hibernate.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/hibernate.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/actions/hibernate.png
--- kdelibs-3.5.7.orig/debian/changelog
+++ kdelibs-3.5.7/debian/changelog
@@ -0,0 +1,3588 @@
+kdelibs (4:3.5.7-1ubuntu2) gutsy; urgency=low
+
+  * Fix .install files for 3.5.7
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 22 May 2007 19:48:30 +0100
+
+kdelibs (4:3.5.7-1ubuntu1) gutsy; urgency=low
+
+  [ Sarah Hobbs ]
+  * Merge with Debian for new upstream version, remaining changes in KUBUNTU-DEBIAN-CHANGES
+  * Removed kubuntu_94_real_mimetype.diff. Applied upstream
+
+  [ Jonathan Riddell ]
+  * Updated kubuntu_52_xinerama.diff
+  * Add kubuntu_69_applications_merged.diff to add applications-merged to apps menu, closes 
+    https://bugs.launchpad.net/ubuntu/+source/wine/+bug/86824
+  * Build-dep on arts 1.5.7
+
+ -- Sarah Hobbs <hobbsee@ubuntu.com>  Mon, 21 May 2007 09:10:10 -0500
+
+kdelibs (4:3.5.7.dfsg.1-1) unstable; urgency=low
+
+  * New upstream release.
+    - Ability to have addressbook on remote kioslaves is disabled.
+      It is quite broken. (Closes: #416366)
+
+  +++ Changes by Ana Beatriz Guerrero Lopez:
+  
+  * Resync debian/patches:
+    - Remove, applied upstream: 
+       22_konq_scroll2top_before_new_page_fix.diff,
+       25_khtml_non_existant_page_crash.diff,
+       45_konqueror-CVE-2007-0537.diff,
+       46_CVE-2007-1564-kdelibs-3.5.6.diff,
+       47_kdelibs-kjs-utf8-parsing.diff.
+  * Apply patch 45_gmail_spoof.diff by Allan Sandfeld, fixes gmail.com when browsing 
+    the website spoofing konqueror as firefox browser.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sun, 20 May 2007 15:44:32 +0100
+
+kdelibs (4:3.5.6-4ubuntu2) gutsy; urgency=low
+
+  * remove kdelibs4c2a depends on menu-xdg
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 01 May 2007 12:21:06 +0100
+
+kdelibs (4:3.5.6-4ubuntu1) gutsy; urgency=low
+
+  * Merge with Debian
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 27 Apr 2007 18:08:33 +0100
+
+kdelibs (4:3.5.6.r1.dfsg.1-4) unstable; urgency=low
+
+  +++ Changes by Daniel Schepler:
+
+  * Rebuild against new jasper packages, and update the Build-Depends
+    and kdelibs4-dev dependencies accordingly.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Fri, 20 Apr 2007 13:58:36 -0400
+
+kdelibs (4:3.5.6-0ubuntu14) feisty; urgency=low
+
+  * SECURITY UPDATE: possible XSS via incorrect UTF8 truncation.
+  * Add kubuntu_97_kjs_utf8_fixes.diff: upstream fixes.
+  * References
+    CVE-2007-0242
+
+ -- Kees Cook <kees@ubuntu.com>  Tue, 10 Apr 2007 11:19:42 -0700
+
+kdelibs (4:3.5.6-0ubuntu13) feisty; urgency=low
+
+  * SECURITY UPDATE: FTP PASV scanning vulnerability.
+  * Add kubuntu_96_ftp_pasv_scanning.diff
+  * References
+    ftp://ftp.kde.org/pub/kde/security_patches/CVE-2007-1564-kdelibs-3.5.6.diff
+    CVE-2007-1564
+
+ -- Kees Cook <kees@ubuntu.com>  Tue, 27 Mar 2007 16:24:53 -0700
+
+kdelibs (4:3.5.6-0ubuntu12) feisty; urgency=low
+
+  * Add kubuntu_95_ajax_encoding.diff, closes http://bugs.kde.org/130234
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 26 Mar 2007 18:28:18 +0100
+
+kdelibs (4:3.5.6-0ubuntu11) feisty; urgency=low
+
+  * Build-dep on new qt 3.3.7
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 26 Mar 2007 15:35:26 +0100
+
+kdelibs (4:3.5.6-0ubuntu10) feisty; urgency=low
+
+  * Add kubuntu_94_real_mimetype.diff, installs realaudio plugin mimetype
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 26 Mar 2007 12:24:15 +0100
+
+kdelibs (4:3.5.6-0ubuntu9) feisty; urgency=low
+
+  * Improved kubuntu_65_nzb_mimetype.diff, fixes Makefiles
+    for installation
+  * Add 35_jump_to_top.diff, fix jumping to the top right before
+    loading a new page. (LP: #84555)
+    Patch from Robert Carr <racarr@beryl-project.org>
+
+ -- Anthony Mercatante <tonio@ubuntu.com>  Tue, 20 Mar 2007 04:02:32 +0100
+
+kdelibs (4:3.5.6-0ubuntu8) feisty; urgency=low
+
+  * Add kubuntu_93_kjs_iframe_crash.diff from SVN,
+    fixes javascript crash when referencing iframe with FTP URL
+    http://bindshell.net/advisories/konq355
+    CVE-2007-1308
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Tue,  6 Mar 2007 17:42:42 +0000
+
+kdelibs (4:3.5.6-0ubuntu7) feisty; urgency=low
+
+  * Add kubuntu_92_kdeprint_filter.diff, closes Malone
+    #51354. Patch from Marcus Trautwig
+
+ -- Anthony Mercatante <tonio@ubuntu.com>  Thu, 22 Feb 2007 17:27:47 +0100
+
+kdelibs (4:3.5.6-0ubuntu6) feisty; urgency=low
+
+  * Fixed kubuntu_56_langpacks_desktop_files.diff, don't avoid
+    Catalogue loading for kdesktop
+
+ -- Anthony Mercatante <tonio@ubuntu.com>  Tue, 20 Feb 2007 17:14:32 +0100
+
+kdelibs (4:3.5.6-0ubuntu5) feisty; urgency=low
+
+  * Add kubuntu_91_execute_feedback.diff, replaces the zooming
+    rectangle that is drawn if you activate an icon in konqueror
+    for execution feedback. Patch from Johannes Schriewer
+  * Update kubuntu_68_xdg_autostart.diff to read xdg config path
+    from XDG_CONFIG_DIRS
+
+ -- Anthony Mercatante <tonio@ubuntu.com>  Tue, 13 Feb 2007 07:02:54 +0100
+
+kdelibs (4:3.5.6-0ubuntu4) feisty; urgency=low
+
+  * Add kubuntu_68_xdg_autostart.diff, kinit provides autostart
+    via /etc/xdg/autostart
+
+ -- Anthony Mercatante <tonio@ubuntu.com>  Mon, 12 Feb 2007 21:42:32 +0100
+
+kdelibs (4:3.5.6-0ubuntu3) feisty; urgency=low
+
+  * SECURITY UPDATE: XSS attacks possible with comment in TITLE tag.
+  * Add 'debian/patches/kubuntu_90_title_tokenizer.diff': fix parser,
+    from upstream Subversion.
+  * References
+    CVE-2007-0537
+
+ -- Kees Cook <kees@ubuntu.com>  Mon,  5 Feb 2007 19:32:41 -0800
+
+kdelibs (4:3.5.6-0ubuntu2) feisty; urgency=low
+
+  * Add kubuntu_67_kwallet_auto_save.diff
+    Kwallet auto-saves any modification.
+    Closes Malone #67521
+
+ -- Anthony Mercatante <tonio@ubuntu.com>  Fri, 26 Jan 2007 02:33:45 +0100
+
+kdelibs (4:3.5.6-0ubuntu1) feisty; urgency=low
+
+  * Remove 02_kate_kdeprint_fixes_branch.diff
+  * Update 27_kdnssd_avahi.dif
+  * Remove 33_cups12_kprinter_fixes.diff
+  * Remove 35_cups_unify_ipp_uri_assembling.diff
+  * Remove 36_kdeprintd_64bit_fix.diff
+  * Remove 41_x_kde_getactionmenu_no_timeout.diff
+  * Remove kubuntu_63_ark.diff
+  * Remove kubuntu_65_kstyle_password_noasterisk
+  * Add kubuntu_66_konsole_pty.diff from Michael Vogt to support
+    attaching new ptys to konsole, needed for kubuntu-update-tool
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 17 Jan 2007 11:46:17 +0000
+
+kdelibs (4:3.5.5a.dfsg.1-3ubuntu9) feisty; urgency=low
+
+  * Added kubuntu_65_kstyle_password_noasterisk.diff to change the asterisks
+    in any password field to dots.  Thanks to Danimo for this patch.
+
+ -- Sarah Hobbs <hobbsee@ubuntu.com>  Sun, 10 Dec 2006 23:55:33 +1100
+
+kdelibs (4:3.5.5a.dfsg.1-3ubuntu8) feisty; urgency=low
+
+  * Fix syntax error in kubuntu_64_rosetta_translation.diff
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Thu,  7 Dec 2006 11:03:01 +0000
+
+kdelibs (4:3.5.5a.dfsg.1-3ubuntu7) feisty; urgency=low
+
+  * Add kubuntu_64_rosetta_translation.diff to explain in
+    application About box that translations are not always the same as
+    KDE.  Requested at
+    http://wiki.kde.org/tiki-index.php?page=KDERosettaCollaboration
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Tue,  5 Dec 2006 19:47:28 +0000
+
+kdelibs (4:3.5.5a.dfsg.1-3ubuntu6) feisty; urgency=low
+
+  * Add suspend and hibernate icons to kdelibs.install
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Tue,  5 Dec 2006 17:32:20 +0000
+
+kdelibs (4:3.5.5a.dfsg.1-3ubuntu5) feisty; urgency=low
+
+  * Build-dep on sudo and make kdelibs4c2a depend on sudo
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 21 Nov 2006 10:59:43 +0000
+
+kdelibs (4:3.5.5a.dfsg.1-3ubuntu4) feisty; urgency=low
+
+  * Compile with --with-sudo-kdesu-backend
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 20 Nov 2006 10:16:08 +0000
+
+kdelibs (4:3.5.5a.dfsg.1-3ubuntu3) feisty; urgency=low
+
+  * Add gettext-kde, kdesdk-scripts depends on kdelibs4-dev
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 16 Nov 2006 07:16:18 +0000
+
+kdelibs (4:3.5.5a.dfsg.1-3ubuntu2) feisty; urgency=low
+
+  * Add missing kubuntu_01_kdepot.diff patch
+  * Use local kde.mk due to different .pot generation rules
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 15 Nov 2006 21:15:00 +0000
+
+kdelibs (4:3.5.5a.dfsg.1-3ubuntu1) feisty; urgency=low
+
+  * Merge with Debian
+  * Add --enable-gcc-hidden-visibility
+  * Delta from Deban in KUBUNTU-DEBIAN-CHANGES
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 14 Nov 2006 22:45:03 +0000
+
+kdelibs (4:3.5.6.r1.dfsg.1-3) unstable; urgency=low
+
+  +++ Changes by Sune Vuorela:
+
+  * Take the patches from branches/etch to fix two security issues
+    46_CVE-2007-1564-kdelibs-3.5.6.diff and 47_kdelibs-kjs-utf8-parsing.diff
+    Fixes CVE-2007-1564 and CVE-2007-0242. (Closes: #417394, #416318)
+
+  +++ Changes by Ana Beatriz Guerrero Lopez:
+
+  * Add 44_sync_kwallet_changes to make kwallet write changes to disk
+    immediately, avoiding losing passwords if kwallet doesn't shutdown
+    cleanly. Patch by Josh Metzler. (Closes: #407272)
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Wed, 18 Apr 2007 14:45:54 +0100
+
+kdelibs (4:3.5.6.r1.dfsg.1-2) experimental; urgency=low
+
+  +++ Changes by Modestas Vainius:
+
+  * Fix the bug of KDE 3.5.6 - an annoying issue with konqueror scrolling to the top
+    of the old page before loading a new one. Patch from upstream svn (22nd patch).
+  * New patch (No. 25) from KDE bug #128564. Fixes khtml crash on loading
+    some non existing pages when javascript is disabled (Closes: #408413).
+    Probably fixes these KDE bugs too: #126812, #127137, #135117, #138449.
+
+  +++ Changes by Sune Vuorela:
+
+  * Bump shlibs.
+  
+  +++ Changes by Ana Beatriz Guerrero Lopez:
+
+  * Add patch 45_konqueror-CVE-2007-0537.diff which fixes: Konqueror does not 
+    properly parse HTML comments, which allows remote attackers to conduct 
+    cross-site scripting (XSS) attacks. CVE-2007-0537.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Wed, 07 Feb 2007 20:16:33 +0100
+
+kdelibs (4:3.5.6.r1.dfsg.1-1) experimental; urgency=low
+
+  * New upstream tarball.
+
+ -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Thu, 18 Jan 2007 18:57:06 +0100
+
+kdelibs (4:3.5.6.dfsg.1-1) experimental; urgency=low
+
+  * New upstream release:
+    * Fixes "Up arrow confused with PrintScrn on evdev keyboards". (Closes: #400887)
+    * Fixes infinite recursion in khtml when rendering combination of blocks
+      with overflow:auto and float:right styles. (Closes: #392547)
+    * Fixes "Fatal IO error: client killed" problem in knode. (Closes: #356142)
+    * Fixes non-standard rendering of floats (khtml). (Closes: #357017)
+    * Fixes konqueror (khtml) crash when resolving ns in a stylesheet
+      @imported from external one. (Closes: #401937)
+
+  +++ Changes by Modestas Vainius:
+
+  * Update kdelibs-data.install
+  * Resync debian/patches:
+    * Adapt to upstream changes - 27.
+    * Remove, applied upstream - 02, 33, 35 (different patch), 36, 41, 42.
+    * Fix offsets - 10, 16, 19, 21, 23.
+  * Add libc6-dbg to kdelibs-dbg dependencies on amd64. It seems to be
+    needed to get a useful backtrace from drkonqi on this arch.
+  * Add myself to Uploaders.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Tue, 16 Jan 2007 15:54:12 +0100
+
+kdelibs (4:3.5.5a.dfsg.1-5) unstable; urgency=low
+
+  +++ Changes by Sune Vuorela:
+
+  * Add qt3-x11-free-dbg to kdelibs-dbg to try to get better backtraces.
+  * Add multiple manpages to kdelibs4c2a. Thanks very much to Holger Hartmann.
+    (Closes: #376099, #351610, #368180)
+  * Add kdelibs4c2a.links to handle common manpages.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Tue, 21 Nov 2006 19:30:14 +0100
+
+kdelibs (4:3.5.5a.dfsg.1-4) unstable; urgency=medium
+
+  [ Debian Qt/KDE Maintainers ]
+  * Add 42_xdgMenuPrefix_support patch: add XDG_MENU_PREFIX support. Thanks to
+    Kevin Krammer. (Closes: #397057, #398734)
+  * Add 43_hardcode_xdgMenuPrefix patch: hardcode xdgMenuPrefix to "kde-"
+    string until proper upstream fix.
+  * Remove 18_applications_menu_rename patch.
+  * Urgency medium, as along with kdebase this upload fixes broken fresh
+    installs.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Thu, 16 Nov 2006 17:07:00 -0500
+
+kdelibs (4:3.5.5a.dfsg.1-3) unstable; urgency=medium
+
+  * Patch: 41_x_kde_getactionmenu_no_timeout.diff
+    Do not time out when waiting for the reply for the X-KDE-GetActionMenu
+    DCOP call. DCOP protocol is synchronouos by design and a reply for the
+    timed out call (i.e. garbage) still arrives and might be falsely returned
+    as a valid reply for the subsequent DCOP call on the same connection. The
+    application currently known to be badly hurt by this is kdesvn and its
+    konqueror service menu integration. Its X-KDE-GetActionMenu might take
+    longer than current 100 milisecond timeout to complete. As a result
+    then, a late reply will "pollute" a main DCOP connection of the client
+    application (e.g. konqueror) causing further DCOP failures.
+    (Closes: #348411)
+
+  * Add 2 patches from upstream BTS http://bugs.kde.org/115891:
+    * 33_cups12_kprinter_fixes.diff - fix various failures with CUPS 1.2
+      when there are no printers.
+    * 35_cups_unify_ipp_uri_assembling.diff - ensure proper IPP URI
+      generation when CUPS is accessed via a UNIX socket. (Closes: #379216)
+  * Add 36_kdeprintd_64bit_fix.diff - fix a bug on 64bit arches when kdeprint
+    is not able to get a configuration file from CUPS server because kdeprintd
+    fails to retreive the password from kpasswdserver.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Thu,  2 Nov 2006 17:54:30 -0500
+
+kdelibs (4:3.5.5a.dfsg.1-2) unstable; urgency=high
+
+  * Rebuild against qt-x11-free 3.3.7. There exists a strange KDE build system
+    bug wherein some packages fail to build if the kdelibs against which they
+    are building was itself built against a release of qt-x11-free different
+    from the one currently present. Until we figure this out, let's just
+    rebuild kdelibs against the new qt-x11-free, and thus make the problem
+    go away for now. Urgency=high because this doesn't actually change
+    anything.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Mon, 23 Oct 2006 20:02:45 -0400
+
+kdelibs (4:3.5.5a.dfsg.1-1) unstable; urgency=medium
+
+  * Remove non-free RFC documentation from the upstream tarball.
+    (Closes: #393378)
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Mon, 16 Oct 2006 17:49:07 -0400
+
+kdelibs (4:3.5.5a-2) unstable; urgency=medium
+
+  * Grab two more fixes from KDE_3_5_BRANCH.
+    + Fix kate's indentation of C/C++ files.
+    + Fix kdeprint's timeout when trying to find cupsd.
+      (Closes: #392052, #392052)
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Fri, 13 Oct 2006 17:04:21 -0400
+
+kdelibs (4:3.5.5a-1) unstable; urgency=medium
+
+  * Nes upstream tarball, fixes a grave bug in katepart (Closes: 391414).
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sat,  7 Oct 2006 16:58:29 +0200
+
+kdelibs (4:3.5.5-1) unstable; urgency=low
+
+  * New upstream release.
+    + Fixes crashes in kate when creating doxygen comments.
+      (Closes: #381578)
+
+  +++ Changes by Christopher Martin:
+
+  * Drop the kjanuswidget highlight-on-mouseover patch. Though a very nice
+    touch, it caused crashes in applications such as adept.
+
+  * Drop the CUPS 1.2 patches that no longer apply, as more or less working
+    support was merged upstream. Salvage a few changes to prevent errors
+    from popping up when the user has no printers defined. Please report
+    obvious regressions.
+
+  +++ Changes by Fathi Boudra:
+
+  * Update copyright file to new KDE source location. (Closes: #385649)
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Tue,  3 Oct 2006 18:28:15 -0400
+
+kdelibs (4:3.5.4-3) unstable; urgency=low
+
+  +++ Changes by Christopher Martin:
+
+  * Fix the avahi patch so that kdelibs builds with or without --enable-final.
+    (Disabling it on slow architectures had the unfortunate side effect of
+    revealing a problem in the patch, which had unwittingly made
+    --enable-final necessary to build the package.) kdelibs should now build
+    on arm and m68k.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Mon, 31 Jul 2006 20:12:25 -0400
+
+kdelibs (4:3.5.4-2) unstable; urgency=low
+
+  * KDE_3_5_BRANCH update (up to r567679).
+
+  +++ Changes by Christopher Martin:
+
+  * Re-upload 3.5.4 with a new build hack that disables the use of
+    --enable-final on slow architectures. This will hopefully allow kdelibs
+    (and other KDE modules) to build on arm and m68k more easily. This should
+    in turn ease the movement of recent KDE modules into Testing. Thanks to
+    Adeodato Simo for the fix.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sat, 29 Jul 2006 15:22:37 -0400
+
+kdelibs (4:3.5.4-1) unstable; urgency=low
+
+  * new upstreal release:
+
+    + Fixes null dereference in khtml, which could cause the browser to crash.
+      This resolves CVE-2006-3672. Thankfully not every reproducible Konq crash
+      bug gets a CVE number... (Closes: #378962)
+
+  +++ Changes by Christopher Martin:
+
+  * Add replaces for kaffeine (<< 0.8.1-3), since x-mplayer2.desktop is now in
+    kdelibs-data.
+
+  * Add a number of patches, courtesy of Kubuntu, which attempt to get
+    kdeprint working reasonably well with CUPS 1.2.x. These patches should
+    resolve a number of user glitches, such as cryptic errors popping up when
+    no printer has yet been added to CUPS.
+    (Closes: #369140, #370403, #375477, #379216)
+
+  * Apply a GNU/kFreeBSD build patch from Petr Salinger. (Closes: #377213)
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Thu, 27 Jul 2006 10:14:08 +0200
+
+kdelibs (4:3.5.5-0ubuntu4) feisty; urgency=low
+
+  * Add kubuntu_63_ark.diff for better 7z management
+
+ -- Anthony Mercatante <tonio@ubuntu.com>  Tue, 24 Oct 2006 00:32:33 +0200
+
+kdelibs (4:3.5.5-0ubuntu3) edgy; urgency=low
+
+  * Update kubuntu_56_langpacks_desktop_files.diff to fix
+    malone No 63325
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Sun, 22 Oct 2006 19:57:23 +0100
+
+kdelibs (4:3.5.5-0ubuntu2) edgy; urgency=low
+
+  * Revert kdeprint directory and patches to those from kde 3.5.4 packages
+    closes malone No 65665
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Sat, 14 Oct 2006 01:54:33 +0000
+
+kdelibs (4:3.5.5-0ubuntu1) edgy; urgency=low
+
+  * New upstream release
+  * Remove patches which no longer apply:
+   - kubuntu_40_cups12_remove_async.diff
+   - kubuntu_42_cups12_addmodify.diff
+   - kubuntu_43_cups12_empty_printers.diff
+   - kubuntu_48_cups12_cupsdconf.diff
+   - kubuntu_54_mouse_scroll_speed.diff
+   - cups 1.2 domain socket fixed upstream
+  * Remove kubuntu_01_kdesu_sudo.diff, and kubuntu_50_kdesu_non_root.patch
+    patches gone upstream, use new --with-sudo-kdesu-backend
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Tue,  3 Oct 2006 11:23:11 +0000
+
+kdelibs (4:3.5.4-0ubuntu18) edgy; urgency=low
+
+  * Add kubuntu_62_flash_installer.diff. Make it easier to
+    install flash plugin, the same way Firefox does.
+
+ -- Anthony Mercatante <tonio@ubuntu.com>  Tue, 26 Sep 2006 11:41:01 +0200
+
+kdelibs (4:3.5.4-0ubuntu17) edgy; urgency=low
+
+  * Remove dependency on menu-xdg from kdelibs4c2a
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 21 Sep 2006 16:01:01 +0100
+
+kdelibs (4:3.5.4-0ubuntu16) edgy; urgency=low
+
+  * Rebuild on latest cdbs to change .pot files to UTF8
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 20 Sep 2006 13:08:59 +0100
+
+kdelibs (4:3.5.4-0ubuntu15) edgy; urgency=low
+
+  * Add kubuntu_61_hibernate_icons.diff.uu, add icons for suspend and hibernate
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 19 Sep 2006 12:11:45 +0100
+
+kdelibs (4:3.5.4-0ubuntu14) edgy; urgency=low
+
+  * Add common-post-build-arch rule to debian/rules to merge 
+    kde.pot into kdelibs.pot, closes malone #61107
+  * Fix distribution string
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 18 Sep 2006 18:50:35 +0100
+
+kdelibs (4:3.5.4-0ubuntu13) edgy; urgency=low
+
+  * Fix kubuntu_version in debian/rules
+  * Use newer version of kubuntu_19_debianize_useragent.diff from Debian
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 18 Sep 2006 15:55:52 +0100
+
+kdelibs (4:3.5.4-0ubuntu12) edgy; urgency=low
+
+  * Add kubuntu_60_kresolver_asserts.diff, fixes http://bugs.kde.org/132851
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 18 Sep 2006 15:18:52 +0100
+
+kdelibs (4:3.5.4-0ubuntu11) edgy; urgency=low
+
+  * Removed kubuntu_58_aboutpage_artwork.diff.uu since kubuntu
+    colors are changing back to blue.
+
+ -- Anthony Mercatante <tonio@ubuntu.com>  Tue, 12 Sep 2006 12:14:58 +0000
+
+kdelibs (4:3.5.4-0ubuntu10) edgy; urgency=low
+
+  * Update kubuntu_52_xinerama.diff with improved patch by Lubos Lunak
+  * Add kubuntu_59_nomediaioslave_kfile_speedbar.diff from Simon Edwards
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Fri,  1 Sep 2006 17:20:58 +0000
+
+kdelibs (4:3.5.4-0ubuntu9) edgy; urgency=low
+
+  * Add missing .h file to kubuntu_56_langpacks_desktop_files.diff
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 30 Aug 2006 21:11:59 +0000
+
+kdelibs (4:3.5.4-0ubuntu8) edgy; urgency=low
+
+  * Add missing #include to kubuntu_56_langpacks_desktop_files.diff
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 30 Aug 2006 16:12:14 +0000
+
+kdelibs (4:3.5.4-0ubuntu7) edgy; urgency=low
+
+  * Add kubuntu_58_aboutpage_artwork.diff with artwork by
+    Brandon Holtsclaw <imbrandon@kubuntu.org>
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 29 Aug 2006 16:11:49 +0000
+
+kdelibs (4:3.5.4-0ubuntu6) edgy; urgency=low
+
+  * Ensure kubuntu_57_nomediaioslave_fileio.diff patch is not applied
+    before upload.
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 22 Aug 2006 13:35:21 +0000
+
+kdelibs (4:3.5.4-0ubuntu5) edgy; urgency=low
+
+  * Modified kubuntu_57_nomediaioslave_fileio.diff from 
+    Simon Edwards, https://wiki.ubuntu.com/KubuntuKDEMedia with new updates
+
+ -- Brandon Holtsclaw <imbrandon@kubuntu.org>  Tue, 22 Aug 2006 13:27:49 -0500
+
+kdelibs (4:3.5.4-0ubuntu4) edgy; urgency=low
+
+  * Add kubuntu_57_nomediaioslave_fileio.diff from 
+    Simon Edwards, http://www.kdedevelopers.org/node/2231
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 21 Aug 2006 13:27:49 +0000
+
+kdelibs (4:3.5.4-0ubuntu3) edgy; urgency=low
+
+  * Add kubuntu_56_langpacks_desktop_files.diff 
+    and debian/kubuntu-desktop-i18n/
+    for https://launchpad.net/distros/ubuntu/+spec/langpacks-desktopfiles-kde
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Thu,  3 Aug 2006 00:52:20 +0000
+
+kdelibs (4:3.5.4-0ubuntu2) edgy; urgency=low
+
+  * Remove debugging output from kubuntu_28_fix_sudo.diff
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Tue,  1 Aug 2006 16:59:36 +0000
+
+kdelibs (4:3.5.4-0ubuntu1) edgy; urgency=low
+
+  * New upstream release
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 25 Jul 2006 10:12:19 +0000
+
+kdelibs (4:3.5.3-1ubuntu9) edgy; urgency=low
+
+  * Add kubuntu_55_printer_sharing.diff for
+    https://launchpad.net/distros/ubuntu/+spec/kubuntu-printer-sharing
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 24 Jul 2006 14:45:17 +0100
+
+kdelibs (4:3.5.3-1ubuntu8) edgy; urgency=low
+
+  * Added kubuntu_53_tabs_hover_close_delaying.diff to remove delay on
+    tabs close button
+  * Added kubuntu_54_mouse_scroll_speed.diff to improve the scroll on 
+    middle click
+
+ -- Anthony Mercatante <tonio@ubuntu.com>  Fri, 21 Jul 2006 22:15:34 +0200
+
+kdelibs (4:3.5.3-1ubuntu7) edgy; urgency=low
+
+  * SECURITY UPDATE: fix remote browser crash
+  * KDE Konqueror allows remote attackers to cause a denial
+    of service (application crash) by calling the replaceChild method on a
+    DOM object, which triggers a null dereference, as demonstrated by calling
+    document.replaceChild with a 0 (zero) argument.
+  * Add kubuntu_00_CVE-2006-3672.diff
+  * References:
+    http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2006-3672
+    http://www.mandriva.com/security/advisories?name=MDKSA-2006:130
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 21 Jul 2006 13:23:01 +0100
+
+kdelibs (4:3.5.3-1ubuntu6) edgy; urgency=low
+
+  * Add kubuntu_52_xinerama.diff from 
+    http://ktown.kde.org/~seli/xinerama/
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 20 Jul 2006 17:38:55 +0100
+
+kdelibs (4:3.5.3-1ubuntu5) edgy; urgency=low
+
+  * Fix kubuntu_28_fix_sudo.diff for https://launchpad.net/bugs/44920
+  * Make kdelibs4c2a depend on launchpad-integration
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 17 Jul 2006 20:44:47 +0000
+
+kdelibs (4:3.5.3-1ubuntu4) edgy; urgency=low
+
+  * Add kubuntu_51_launchpad_integration.diff for 
+    https://launchpad.net/distros/ubuntu/+spec/kubuntu-launchpad-integration
+    and add launchpad.png icon
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 12 Jul 2006 16:40:37 +0000
+
+kdelibs (4:3.5.3-1ubuntu3) edgy; urgency=low
+
+  * Add gettext-kde, kdesdk-scripts as depends to kdelibs4-dev
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 28 Jun 2006 16:31:18 +0000
+
+kdelibs (4:3.5.3-1ubuntu2) edgy; urgency=low
+
+  * Rebuild on new Qt to fix binary compatibility breakage
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 28 Jun 2006 14:21:28 +0000
+
+kdelibs (4:3.5.3-1ubuntu1) edgy; urgency=low
+
+  * Merge with Debian
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 26 Jun 2006 13:42:57 +0000
+
+kdelibs (4:3.5.3-1) unstable; urgency=low
+
+  * New upstream release:
+    + Fixes crashes in konqueror. (Closes: #356876)
+
+  +++ Changes by Pierre Habouzit:
+
+  * Remove branch pull patches.
+
+  +++ Changes by Christopher Martin:
+
+  * Eliminate the kdelibs-bin package, merging it completely into kdelibs4c2a.
+
+    There existed a (necessary) circular dependency between kdelibs-bin and
+    kdelibs4c2a. kdelibs-bin is linked to kdelibs4c2a. Also, every KDE
+    application needs the binaries in kdelibs-bin to function properly, yet
+    virtually none depend on it. So to break the circular dependency by
+    removing kdelibs4c2a's dependency on kdelibs-bin would require that all
+    KDE packages be re-uploaded. And every KDE-using system would still need
+    both kdelibs-bin and kdelibs4c2a.
+
+    So we'll simply merge them. The general practice of separating libraries
+    and programs makes no sense for kdelibs, given the close ties between the
+    two. Multiple versions of the KDE libraries can't be installed
+    side-by-side in any case.
+
+    For the rare package which depends on kdelibs-bin, kdelibs4c2a will
+    "Provides: kdelibs-bin".
+
+    The removal of the circular dependency should make future transitions
+    easier for users, avoiding difficulties such as those encountered during
+    Woody to Sarge upgrades. (Closes: #310873)
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sun, 28 May 2006 16:57:06 +0200
+
+kdelibs (4:3.5.2-2) unstable; urgency=low
+
+  * KDE_3_5_BRANCH update (up to r526316). Contains important fixes for khtml.
+    Pages which, since the last upload, didn't render at all, or only showed
+    headers, should be fixed.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Tue,  4 Apr 2006 09:03:26 -0400
+
+kdelibs (4:3.5.2-1) unstable; urgency=low
+
+  * New upstream release.
+
+  * KDE_3_5_BRANCH update (up to r523640).
+
+  +++ Changes by Christopher Martin:
+
+  * Remove apparently obsolete python dependency from kdelibs-bin.
+    (Closes: #356934)
+
+  * Enable inotify support, and change the Recommends: gamin to a Suggests:
+    fam, since a third-party tool is only advantageous for remote filesystems.
+
+  * Add dcopstart and dcopfind manpages, from Dr. Johannes Ranke. Thanks!
+    (Closes: #359097)
+
+  +++ Changes by Pierre Habouzit:
+
+  * Update debian/control for new kfreebsd-amd64 port.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Tue, 28 Mar 2006 18:02:00 -0500
+
+kdelibs (4:3.5.1-4) unstable; urgency=low
+
+  * KDE_3_5_BRANCH update (up to r517245).
+
+  +++ Changes by Christopher Martin:
+
+  * Add a Makefile.am patch that works around a bit of libtool oddness, to be
+    investigated. This problem was causing the kdelibs build to fail. Thanks
+    to Daniel Schepler for finding the fix. (Closes: #355099)
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Fri, 10 Mar 2006 12:06:36 -0500
+
+kdelibs (4:3.5.1-3) unstable; urgency=medium
+
+  * KDE_3_5_BRANCH update (up to r515119).
+
+  +++ Changes by Christopher Martin:
+
+  * Add an as-yet-uncommitted patch from upstream that prevents the
+    documentation license from being set as the GFDL, even if the author
+    specified a different license. Bump urgency for RC fix. (Closes: #353814)
+
+  * Add Replaces for krita and digikam, now that kdelibs includes
+    x-raw.desktop.
+
+  * Allow building against libgamin-dev as well as libfam-dev. kdelibs4-dev
+    will also depend on libfam-dev | libgamin-dev.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Thu,  2 Mar 2006 13:26:25 -0500
+
+kdelibs (4:3.5.1-2) unstable; urgency=low
+
+  +++ Changes by Christopher Martin:
+
+  * KDE_3_5_BRANCH update (up to r506549).
+
+  * Add a patch to make the Qt Motif Plus style visible again.
+    (Closes: #350863)
+
+  * Update the avahi patch, fixing kpf crashes, and probably some kded crashes
+    users reported as well. (Closes: #350266, #351598)
+
+  * Remove obsolete netpbm dependency from kdelibs-bin.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Mon,  6 Feb 2006 19:42:06 -0500
+
+kdelibs (4:3.5.1-1) unstable; urgency=low
+
+  * New upstream release.
+
+  +++ Changes by Josh Metzler:
+  
+  * Add kdelibs-data Replaces for libdjvulibre1 and libdjvulibre15 (<< 3.5.1-2)
+    which also include x-djvu.desktop.
+    (Closes: #347218, #347885, #348020, #348365, #348899)
+
+  +++ Changes by Isaac Clerencia:
+
+  * Apply patch 27_kdnssd_avahi.diff to replace dummy kdelibs kdnssd
+    implementation with a working avahi-based one.
+
+  * Add Build-Depends on libavahi-client-dev and libavahi-qt3-dev to get
+    the patch referenced above working.
+
+  +++ Changes by Christopher Martin:
+
+  * Upload to unstable.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Thu, 26 Jan 2006 18:37:01 -0500
+
+kdelibs (4:3.5.0-3) unstable; urgency=low
+
+  +++ Changes by Christopher Martin:
+
+  * No longer build with gcc-3.4 on any architectures, since gcc-4.0 should
+    be fixed. (Closes: #342984)
+
+  * Adjust the Debianization of the Konqueror user agent string. The package
+    version is not exposed by default. Rather, the level of information
+    presented is tied to the level of general operating system the user has
+    configured to be sent.
+    (Addresses: http://lists.debian.org/debian-qt-kde/2005/12/msg00385.html)
+
+  +++ Changes by Adeodato Simó:
+
+  * Upload to unstable.
+
+  * KDE_3_5_BRANCH update (up to r494869).
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Fri,  6 Jan 2006 14:54:24 +0100
+
+kdelibs (4:3.5.0-2) experimental; urgency=low
+
+  * Upload to experimental.
+
+  * KDE_3_5_BRANCH update (up to r488534). Bump kdelibs4c2a shlibs to account
+    for changes.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Wed, 14 Dec 2005 16:16:45 -0500
+
+kdelibs (4:3.5.0-1) alioth; urgency=low
+
+  * New upstream release.
+
+  +++ Changes by Christopher Martin:
+
+  * Remove an old conffile from KDE 3.3, ktexteditor_autobookmarkerrc, on
+    upgrade. (Closes: #339491)
+
+  * Bump DH_COMPAT to 5. No changes, except kdelibs4c2a-dbg is replaced by
+    kdelibs-dbg, which contains debugging symbols for all kdelibs binaries.
+
+  * Make kdelibs4c2a Recommend gamin, since it supports inotify. Continue
+    to build against fam for now, however, to ensure that our users have
+    choice.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Tue, 29 Nov 2005 17:19:36 -0500
+
+kdelibs (4:3.4.3-2) unstable; urgency=low
+
+  * KDE_3_4_BRANCH update (up to r483731).
+
+  +++ Changes by Christopher Martin:
+
+  * In the branch update is included a fix for kopete's compilation issues.
+    (Closes: #337423, #338901)
+
+  +++ Changes by Adeodato Simó:
+
+  * libstdc++ allocator transition: rename kdelibs4c2 to kdelibs4c2a. Bumped
+    build-dependency version on libarts1-dev and libopenexr-dev.
+    (Closes: #339190)
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sun, 27 Nov 2005 23:47:21 +0100
+
+kdelibs (4:3.5.2-0ubuntu18) dapper; urgency=low
+
+  * Use msgcat not cat to join together two .pot files
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 12 May 2006 20:18:48 +0300
+
+kdelibs (4:3.5.2-0ubuntu17) dapper; urgency=low
+
+  * Add kubuntu_50_kdesu_non_root.patch to fix running commands as non-root
+    with kdesu with su instead of sudo (Malone #41184)
+
+ -- Luka Renko <lure.net@gmail.net>  Wed, 10 May 2006 22:45:27 +0200
+
+kdelibs (4:3.5.2-0ubuntu16) dapper; urgency=low
+
+  * Add EXTRACTATTR for .pot generation in kde.mk
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Tue,  9 May 2006 18:28:27 +0300
+
+kdelibs (4:3.5.2-0ubuntu15) dapper; urgency=low
+
+  * Remove highlighting of KJanusWidget sidebar in 
+    17_kdelibs_rubberband.diff it caused a crash in Adept Installer
+    Closes Malone #43472
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Mon,  8 May 2006 15:13:19 +0000
+
+kdelibs (4:3.5.2-0ubuntu14) dapper; urgency=low
+
+  * Edit kubuntu_03_applications_menu_entries_move.diff to 
+    exclude OpenOffice Draw from Graphics (duplicate entry also in Office)
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Thu,  4 May 2006 12:09:54 -0400
+
+kdelibs (4:3.5.2-0ubuntu13) dapper; urgency=low
+
+  * Add kubuntu_49_3DES_EDE_CBC.diff from http://bugs.kde.org/124684 
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Tue,  2 May 2006 15:42:27 +0100
+
+kdelibs (4:3.5.2-0ubuntu12) dapper; urgency=low
+
+  * Alter kde.mk to include kde.pot strings in kdelibs.po 
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Sat, 29 Apr 2006 11:48:19 +0100
+
+kdelibs (4:3.5.2-0ubuntu11) dapper; urgency=low
+
+  * Update kubuntu_19_debianize_useragent.diff for 6.04 -> 6.06 change 
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 27 Apr 2006 17:54:52 +0100
+
+kdelibs (4:3.5.2-0ubuntu10) dapper; urgency=low
+
+  * Patch from Michael Hofmann <mh21@piware.de>
+    - Add kubuntu_47_cups12_list_ignore_warnings.diff quick fix for 
+      Malone #41151
+    - Add kubuntu_48_cups12_cupsdconf.diff fix cupsdconf as much as 
+      possible
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 26 Apr 2006 00:50:37 +0000
+
+kdelibs (4:3.5.2-0ubuntu9) dapper; urgency=low
+
+  * Add kubuntu_45_kcmoduleinfo.diff to fix module name test in
+    KCModuleInfo::KCModuleInfo, thanks to Julien Richard-Foy
+  * Add kubuntu_46_lisa_error.diff to display a custom error message in Lisa
+    module tabs.
+
+ -- Raphaël Pinson <raphink@ubuntu.com>  Mon, 24 Apr 2006 00:15:55 +0200
+
+kdelibs (4:3.5.2-0ubuntu8) dapper; urgency=low
+
+  * Fix kubuntu_42_cups12_addmodify.diff for CUPS 1.2 rc2
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Sun, 23 Apr 2006 18:56:33 +0100
+
+kdelibs (4:3.5.2-0ubuntu7) dapper; urgency=low
+
+  * Edit debian/cdbs/kde.mk to mark .po files as UTF-8
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 21 Apr 2006 19:14:29 +0100
+
+kdelibs (4:3.5.2-0ubuntu6) dapper; urgency=low
+
+  * Add further patches for CUPS 1.2 support from
+    Michael Hofmann <mh21@piware.de>
+    - kubuntu_39_cups12_compile_fixes.diff
+    - kubuntu_40_cups12_remove_async.diff
+    - kubuntu_41_cups12_startstopfix.diff
+    - kubuntu_42_cups12_addmodify.diff
+    - kubuntu_43_empty_printers.diff
+    - kubuntu_44_init_script.diff
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 17 Apr 2006 21:14:35 +0000
+
+kdelibs (4:3.5.2-0ubuntu5) dapper; urgency=low
+
+  * Add kubuntu_37_wm_branch_fixes.diff 
+    Handle X timestamp wrapping correctly even on 64bit platforms.
+  * Add kubuntu_38_no_generate_kdepot.diff, kde.pot wasn't being
+    generated correctly breaking pkgstriptranslations
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 14 Apr 2006 16:19:11 +0000
+
+kdelibs (4:3.5.2-0ubuntu4) dapper; urgency=low
+
+  * Add kubuntu_36_ioslave_filedialogue.diff from 3.5 branch
+    makes file dialogues support system:/ and media:/ ioslaves
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 14 Apr 2006 15:25:15 +0000
+
+kdelibs (4:3.5.2-0ubuntu3) dapper; urgency=low
+
+  * Add kubuntu_35_kdeprint_branch.diff to fix compile error
+    with CUPS 1.2, remove my random hack from kubuntu_34_cups12.diff 
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 13 Apr 2006 18:53:24 +0100
+
+kdelibs (4:3.5.2-0ubuntu2) dapper; urgency=low
+
+  * Add kubuntu_34_cups12.diff, start of a fix for CUPS 1.2 
+    compatibility.  Patch by Michael Hofmann 
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 13 Apr 2006 14:35:20 +0100
+
+kdelibs (4:3.5.2-0ubuntu1) dapper; urgency=low
+
+  * Added kubuntu_30_fix_copy_and_rename.diff to fix copy/paste
+    to same folder
+
+ -- Anthony Mercatante <tonio@ubuntu.com>  Fri, 31 Mar 2006 00:23:17 +0100
+
+kdelibs (4:3.5.2-0ubuntu0) dapper; urgency=low
+
+  * New upstream release
+  * Remove kubuntu_30_kurllabel.diff, now upstream
+  * Remove kubuntu_31_onlyshowin_autostart.diff, now upstream
+  * Remove kubuntu_32_autostart_onlykde.diff, now upstream
+  * Qt dependency now 3.3.6
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 20 Mar 2006 11:08:32 +0000
+
+kdelibs (4:3.5.1-0ubuntu11) dapper; urgency=low
+
+  * Remove stray comma from configure.in.in in 
+    kubuntu_27_kdnssd_avahi.diff that stopped it picking up 
+    -lavahi-common
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 15 Mar 2006 17:35:07 +0000
+
+kdelibs (4:3.5.1-0ubuntu10) dapper; urgency=low
+
+  * Fix include path in kubuntu_27_kdnssd_avahi.diff patch
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 10 Mar 2006 15:34:38 +0000
+
+kdelibs (4:3.5.1-0ubuntu9) dapper; urgency=low
+
+  * Update 27_kdnssd_avahi.diff now called kubuntu_27_kdnssd_avahi.diff to 
+    fix crash when avahi is not installed
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Thu,  9 Mar 2006 09:59:35 +0000
+
+kdelibs (4:3.5.1-0ubuntu8) dapper; urgency=low
+
+  * Add patch kubuntu_33_kabc_fix_save to fix loss of addressbook
+    on exiting kontact (Closes: KDE Bug http://bugs.kde.org/118924). 
+
+ -- Raphaël Pinson <raphink@ubuntu.com>  Mon,  6 Mar 2006 23:59:09 +0100
+
+kdelibs (4:3.5.1-0ubuntu7) dapper; urgency=low
+
+  * Drop build dependency on g++-3.4 [hppa].
+
+ -- Matthias Klose <doko@ubuntu.com>  Fri, 17 Feb 2006 00:18:27 +0000
+
+kdelibs (4:3.5.1-0ubuntu6) dapper; urgency=low
+
+  * Don't use GCC 3.4 on hppa
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 16 Feb 2006 12:02:55 +0000
+
+kdelibs (4:3.5.1-0ubuntu5) dapper; urgency=low
+
+  * Add kubuntu_32_autostart_onlykde.diff
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Thu,  9 Feb 2006 12:55:35 +0000
+
+kdelibs (4:3.5.1-0ubuntu4) dapper; urgency=low
+
+  * Add kubuntu_31_onlyshowin_autostart.diff to respect OnlyShowIn and
+    NotShowIn for autostart files
+  * Change kdelibs4c2a-dbg to kdelibs-dbg (sync with debian)
+  * Change debian/compat to 5 for dapper to fix -dbg package
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Tue,  7 Feb 2006 12:57:52 +0000
+
+kdelibs (4:3.5.1-0ubuntu3) dapper; urgency=low
+
+  * Add back kdelibs4c2.install for backports
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Tue,  7 Feb 2006 00:43:24 +0000
+
+kdelibs (4:3.5.1-0ubuntu2) dapper; urgency=low
+
+  * Add kubuntu_30_kurllabel.diff fix Konqueror status bar icons
+  * Add configure option --with-lua-includes=/usr/include/lua50
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Wed,  1 Feb 2006 14:27:16 +0000
+
+kdelibs (4:3.5.1-0ubuntu1) dapper; urgency=low
+
+  * New upstream release
+  * Sync 27_kdnssd_avahi.diff with Debian
+  * Use control-dapper and control-breezy for to allow for backports
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 23 Jan 2006 15:04:54 +0000
+
+kdelibs (4:3.5.0-0ubuntu11) dapper; urgency=low
+
+  * Remove netpbm from kdelibs-bin depends,
+    it is no longer used by kimgio
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 25 Jan 2006 18:10:28 +0000
+
+kdelibs (4:3.5.0-0ubuntu10) dapper; urgency=low
+
+  * Add kubuntu_28_fix_sudo.diff to set home directory when 
+    run as root via sudo, stops KDE apps settings wrong permissions on 
+    files in users home directory
+  * Add kubuntu_29_quiet_kbuildsycoca.diff stop kbuildsycoca complaining
+    about unknown mimetypes
+  * SECURITY UPDATE: kjs encodeuri/decodeuri heap overflow vulnerability
+  * Add kubuntu_20_post_3.4.3_kdelibs_kjs.diff
+  * An incorrect bounds check in kjs, the Javascript interpreter
+    engine used by Konqueror and other parts of KDE, that allows
+    a heap based buffer overflow when decoding invalid utf8 encoded
+    URI sequences.
+  * References:
+     CVE-2006-0019
+     http://www.kde.org/info/security/advisory-20060119-1.txt
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 20 Jan 2006 14:39:41 +0000
+
+kdelibs (4:3.5.0-0ubuntu9) dapper; urgency=low
+
+  * Make kdelibs4-dev depend on libavahi-client-dev
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 12 Jan 2006 17:25:14 +0000
+
+kdelibs (4:3.5.0-0ubuntu8) dapper; urgency=low
+
+  * Make kdelibs4-dev depend on libavahi-common-dev
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 12 Jan 2006 13:47:03 +0000
+
+kdelibs (4:3.5.0-0ubuntu7) dapper; urgency=low
+
+  * Make kdelibs4-dev depend on libavahi-qt3-dev
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 12 Jan 2006 11:50:47 +0000
+
+kdelibs (4:3.5.0-0ubuntu6) dapper; urgency=low
+
+  * Remove libkdnssd depend from kdelibs4-dev
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 12 Jan 2006 09:09:29 +0000
+
+kdelibs (4:3.5.0-0ubuntu5) dapper; urgency=low
+
+  * Add kubuntu_27_kdnssd_avahi.diff for avahi support directly in
+    kdelibs
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 11 Jan 2006 21:14:20 +0000
+
+kdelibs (4:3.5.0-0ubuntu4) dapper; urgency=low
+
+  * Do not install kdnssd library files, they now come from
+    libkdnssd1-avahi package.  Development files stay in kdelibs4-dev.
+  * Add depends on libkdnssd1-avahi from kdelibs4-dev
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 11 Jan 2006 01:25:52 +0000
+
+kdelibs (4:3.5.0-0ubuntu3) dapper; urgency=low
+
+  * Build-dep on latest qt
+  * Un-apply patch before uploading
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 16 Dec 2005 17:48:30 +0000
+
+kdelibs (4:3.5.0-0ubuntu2) dapper; urgency=low
+
+  * Add back updated kubuntu_06_kwallet_simplify_string.diff
+    and kubuntu_03_applications_menu_entries_move.diff
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 15 Dec 2005 14:34:41 +0000
+
+kdelibs (4:3.5.0-0ubuntu1) dapper; urgency=low
+
+  * New upstream release
+  * Make kdelibs4-dev depend on gamin not fam
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 29 Nov 2005 19:50:37 +0000
+
+kdelibs (4:3.5-rc2-0ubuntu6) dapper; urgency=low
+
+  * Add gettext-kde, kdesdk-scripts, hspell, liblualib50-dev as
+    depends to kdelibs4-dev
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Sat, 26 Nov 2005 00:30:51 +0000
+
+kdelibs (4:3.5-rc2-0ubuntu5) dapper; urgency=low
+
+  * Add libattr1-dev and libacl1-dev as depends to kdelibs4-dev
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Sat, 26 Nov 2005 00:20:02 +0000
+
+kdelibs (4:3.5-rc2-0ubuntu4) dapper; urgency=low
+
+  * Add debian/patches/kubuntu_06_fix_kdeprint_cups12_fix.diff, fix kdeprint compile error properly
+  * Add common/kubuntu_01_kdepot.diff and common/kde.pot, fix .pot generation
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 25 Nov 2005 22:11:51 +0000
+
+kdelibs (4:3.5-rc2-0ubuntu3) dapper; urgency=low
+
+  * Fix broken kubuntu_06_fix_kdeprint_compile_hack.diff
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 25 Nov 2005 18:44:54 +0000
+
+kdelibs (4:3.5-rc2-0ubuntu2) dapper; urgency=low
+
+  * Add kubuntu_06_fix_kdeprint_compile_hack.diff, quick patch until I
+    work out how to fix it properly
+  * Fix kdelibs4-doc.install for correct path of files
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 25 Nov 2005 17:08:31 +0000
+
+kdelibs (4:3.5-rc2-0ubuntu1) dapper; urgency=low
+
+  * New upstream release
+  * libstdc++ transition.  Rename kdelibs4c2 to kdelibs4c2a
+    http://lists.ubuntu.com/archives/ubuntu-devel-announce/2005-November/000016.html
+  * Tighten build-dep on arts, qt and openexr to pick up libstd++ transition
+  * build-dep on libattr1-dev and libacl1-dev
+  * Generate .pot files
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 21 Nov 2005 17:29:53 +0000
+
+kdelibs (4:3.5-rc1-0ubuntu1) dapper; urgency=low
+
+  * New upstream pre-release
+  * Sync with Debian
+  * Remove 16_default_fonts.diff, merged upstream
+  * Remove 22_htmltokenizer_cpp_from_3_5.diff, already upstream
+  * Remove 23_kfiledialog.diff, merged upstream
+  * kdelibs-data replaces old kttsd
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 10 Nov 2005 17:24:33 +0000
+
+kdelibs (4:3.4.3-1) experimental; urgency=low
+
+  * New upstream release.
+
+  +++ Changes by Christopher Martin:
+
+  * Tweak the rounded text selection patch to avoid it causing icon spacing
+    issues in Konqueror. (Closes: #329404)
+
+  * Add a patch to generate a PIC static libkdefakes, libkdefakes_pic.a.
+    This will allow other libraries, such as mimelib, to use libkdefakes,
+    without acquiring non-PIC code or a dependency upon the full kdelibs.
+    (Closes: #326113)
+
+  +++ Changes by Pierre Habouzit:
+
+  * Add /usr/share/bug/$package/presubj for kdelibs{4c2,-bin,} kindly asking
+    our users to restart their KDE if reporting a bug just after an upgrade.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sat, 15 Oct 2005 13:52:25 -0400
+
+kdelibs (4:3.4.2-4) unstable; urgency=low
+
+  * KDE_3_4_BRANCH update (up to r458612).
+
+  +++ Changes by Adeodato Simó:
+
+  * Use khtml/html/htmltokenizer.cpp from 3.5 to fix bogus parsing of
+    whitespace around tags found inside <pre>. This was making konqueror
+    sometimes ignore blank lines in pre mode, which made this friendly
+    maintainer of yours terribly unhappy when visiting bts.turmzimmer.net.
+
+  +++ Changes by Christopher Martin:
+
+  * Add a patch from the "Improving KDE" set that tweaks KDE's default GUI,
+    changing some of the selection and highlight effects. Temporarily bump
+    the Qt build-depends, to ensure we build against a similarly patched
+    package.
+
+  * Add a patch that elimiates the floppy ioslave from the default Open dialog
+    toolbar, since the media ioslave is also present by default and handles
+    floppy drives.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Fri, 16 Sep 2005 12:52:36 -0400
+
+kdelibs (4:3.4.2-3) unstable; urgency=low
+
+  +++ Changes by Adeodato Simó:
+
+  * Build with g++-3.4 on arm, m68k and hppa; kdelibs triggers the same gcc
+    4.0 ICE as arts does.
+
+  * Apply patch by Aurelien Jarno and Robert Millan for GNU/kFreeBSD support
+    (closes: #289599). Details for the interested:
+
+    + don't build-depend on libasound2-dev on !linux.
+    + use HAVE_SYS_PRCTL_H instead of Q_OS_LINUX in kinit.cpp.
+    + define _tcgetattr and _tcsetattr based on the actual availability of
+      functions and constants, instead of by operating system name.
+
+    Haven't included a hunk that added an extra check on MNT_NOWAIT, because
+    it's not still clear that is really needed.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Mon, 29 Aug 2005 20:33:32 +0200
+
+kdelibs (4:3.4.2-2) unstable; urgency=low
+
+  +++ Changes by Christopher Martin and Adeodato Simó:
+
+  * Improve the fix for #311958 to make kdelibs binNMUable again. Instead of
+    having kdelibs4c2 depend on kdelibs-data (= ${Source-Version}), split that
+    in (>> 3.X.Y) plus (<< 3.X+1).
+
+    Since this fix can't be introduced in Sarge's kdelibs4, introduce (sigh) a
+    conflicts in kdelibs-data against kdelibs4, which fortunately needs not be
+    versioned because there is no 3.4.2 version of kdelibs4. This will prevent
+    breakage due to partial upgrades and thus closes: #323747, #323967,
+    #324147.
+
+  +++ Changes by Christopher Martin:
+
+  * Drop the versioning from kdelibs4-dev's too strict dependency on
+    libfam-dev. This should allow libgamin-dev to be installed along with
+    kdelibs4-dev once the fam transition is reversed, or libgamin0 stops
+    providing libfam0c102. (Closes: #324174)
+
+  +++ Changes by Adeodato Simó:
+
+  * Patched some Makefiles.am to not use LIBADD for convenience libraries,
+    since libtool can't prune those; specify the dependencies each time the
+    library is used. This allows to reduce a bit more the number of Depends of
+    the kdelibs4 package; in total, this version drops 11 dependencies with
+    respect to the 3.3.x series.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Wed, 24 Aug 2005 16:05:07 +0200
+
+kdelibs (4:3.4.2-1) unstable; urgency=low
+
+  * New upstream release. Includes a forward declaration of KXMLGUIClient in
+    kactioncollection.h, which makes gcc-4.0 happy and thus closes: #317543,
+    #318017, #319154, #323093 (arson, smb4k, kile and amarok FTBFS).
+
+  * KDE_3_4_BRANCH update.
+
+  +++ Changes by Christopher Martin:
+  
+  * GCC 4.0 transition: kdelibs4 becomes kdelibs4c2. Tighten build depends on
+    libarts1-dev, libqt3-mt-dev, libfam-dev, libtiff4-dev, and libopenexr-dev
+    to ensure that we build against transitioned packages.
+
+    Since kdelibs4 now depends on libopenexr2c2, this upload closes: #320450.
+  
+  * Make kdelibs4 always depend on the identical version of kdelibs-data.
+    (Closes: #311958)
+
+  +++ Changes by Adeodato Simó:
+
+  * Remove obsolete conflicts/replaces relationships against packages/versions
+    not present in Sarge.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Tue, 16 Aug 2005 11:16:00 -0400
+ 
+kdelibs (4:3.4.1-1) experimental; urgency=low
+
+  * New upstream release.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Tue, 31 May 2005 15:43:52 -0400
+
+kdelibs (4:3.4.92-0ubuntu2) breezy; urgency=low
+
+  * New upstream beta release
+  * Build with nostrip
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Sat, 15 Oct 2005 12:19:22 +0000
+
+kdelibs (4:3.4.91-0ubuntu1) breezy; urgency=low
+
+  * New upstream beta release
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 13 Sep 2005 11:21:10 +0000
+
+kdelibs (4:3.4.2-0ubuntu4) breezy; urgency=low
+
+  * Add replaces on old knetworkconf for kdelibs-data
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Wed,  3 Aug 2005 12:44:18 +0000
+
+kdelibs (4:3.4.2-0ubuntu3) breezy; urgency=low
+
+  * Rebuild for new Qt buildkey and tighten build-dep
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 28 Jul 2005 13:37:13 +0000
+
+kdelibs (4:3.4.2-0ubuntu2) breezy; urgency=low
+
+  * Add build-dep on autoconf
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 26 Jul 2005 16:37:24 +0000
+
+kdelibs (4:3.4.2-0ubuntu1) breezy; urgency=low
+
+  * New upstream release
+  * Build using unsermake
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 25 Jul 2005 15:49:02 +0000
+
+kdelibs (4:3.4.1-0ubuntu11) breezy; urgency=low
+
+  * Rebuild for removed libXcursor.la and tighten 
+    dependency on Qt and arts
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Sun, 24 Jul 2005 20:47:00 +0000
+
+kdelibs (4:3.4.1-0ubuntu10) breezy; urgency=low
+
+  * Add depend on iceauth for kdelibs4c2
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 20 Jul 2005 20:47:45 +0000
+
+kdelibs (4:3.4.1-0ubuntu9) breezy; urgency=low
+
+  * Remove xbase-clients depenency from kdelibs.  
+    iceauth will appear again soon in a new package.
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 20 Jul 2005 20:25:29 +0000
+
+kdelibs (4:3.4.1-0ubuntu8) breezy; urgency=low
+
+  * Add kubuntu_06_kwallet_simplify_string.diff to simplify KWallet question
+  * Add kubuntu_07_rubberband.diff for pretty file manager selection
+  * Add versioned build-dep on libxrender-dev and tighten version 
+    build-dep of Qt to ensure libXrender.la changes
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 18 Jul 2005 19:20:50 +0000
+
+kdelibs (4:3.4.1-0ubuntu7) breezy; urgency=low
+
+  * Rebuild for libXrender.la changes
+  * Make versioned build-dep on arts stricter
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Sun, 17 Jul 2005 09:23:49 +0000
+
+kdelibs (4:3.4.1-0ubuntu6) breezy; urgency=low
+
+  * Rebuild for new X dependencies.
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Sat, 16 Jul 2005 22:01:57 +0000
+
+kdelibs (4:3.4.1-0ubuntu5) breezy; urgency=low
+
+  * Add kubuntu_04_add_langpack_path.diff to use path for langpacks
+  * Add Kubuntu system icons in debian/system-icons
+  * Add kubuntu_05_icon_scale.diff fix icon scaling
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Mon,  4 Jul 2005 12:39:22 +0000
+
+kdelibs (4:3.4.1-0ubuntu4) breezy; urgency=low
+
+  * Add build depend on libxi-dev
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 21 Jun 2005 21:28:59 +0000
+
+kdelibs (4:3.4.1-0ubuntu3) breezy; urgency=low
+
+  * Recompile with new Qt
+
+ -- Jonathan Riddell <jr@jriddell.org>  Tue, 21 Jun 2005 17:35:37 +0000
+
+kdelibs (4:3.4.1-0ubuntu2) breezy; urgency=low
+
+  * Build-dep on a good libqt3-mt-dev (xorg dependencies)
+
+ -- LaMont Jones <lamont@ubuntu.com>  Tue, 24 May 2005 21:18:18 -0600
+
+kdelibs (4:3.4.1-0ubuntu1) breezy; urgency=low
+
+  * New upstream release
+  * Sync with Debian
+
+ -- Jonathan Riddell <jr@jriddell.org>  Mon, 23 May 2005 18:09:36 +0100
+
+kdelibs (4:3.4.0-0pre5) alioth; urgency=low
+
+  * New upstream release.
+
+  * KDE_3_4_BRANCH update.
+
+  * Bugs reported in the Debian BTS fixed by this release:
+
+    - no longer FTBFS on amd64/gcc-4.0. (Closes: #288900)
+
+  * Converted packaging to CDBS (initial version by Daniel Schepler, further
+    changes by Christopher Martin and Adeodato Simó).
+
+  +++ Changes by Adeodato Simó:
+
+  * Added new package kdelibs4-dbg, with separate debugging symbols. Added
+    Build-Dependency on binutils (>= 2.14.90.0.7) as per the dh_strip man
+    page. (Closes: #257588).
+
+  * [cdbs/kde.mk] Use escaped variables in the definitions of kde_htmldir and
+    the like instead of absolute paths, so that /usr/bin/kde-config doesn't
+    output them expanded even when --expandvars is not used. (Closes: #287822)
+
+  * Fixed the ability of the build system to find kde.pot, even when it is not
+    located at KDEDIR/include/kde.pot. This allows the use of targets such as
+    "package-messages" without specifying includedir. (Closes: #283858)
+
+  * Now that graphviz is in main, add it to Build-Depends-Indep together with
+    gsfonts-x11 to generate diagrams in the API documentation.
+
+  +++ Changes by Christopher Martin
+
+  * Adjust the placement of the merging of the Debian menu in
+    applications.menu. Oddly enough, this seems to work around some issues
+    with io slaves and remote file access.
+
+  * Rename applications.menu to kde-applications.menu, avoiding a conflict
+    with the new GNOME xdg menu files. (Closes: #307098)
+
+  * Debianize the Konqueror browser's user-agent string. (Closes: #268659)
+
+  * Tighten libart-2.0-dev build dependency. (Closes: #285882)
+
+  * Clean out useless manpages. New or better ones welcome...
+    (Closes: #292084)
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sat, 14 May 2005 13:00:44 -0400
+
+kdelibs (4:3.3.2-7) unstable; urgency=high
+
+  +++ Changes by Adeodato Simó:
+
+  * Do not depend on the disappeared libjack0.80.0-0. Achieve so by updating
+    the libtool used to build to the one currently in sid, so that it prunes
+    unnecessary dependencies.
+
+  * The above libtool update removes the kdelibs4 dependency on libmad0, so
+    closes: #311710 ("does not have a versioned dependency on libmad0").
+
+  * Do not unconditionally remove /etc/kderc and other files in /etc on
+    upgrades. Whatever those bits were there for, can be removed now that
+    Sarge is released and shipped with them... (Closes: #316255) Deleted the
+    now empty preinst scripts for kdelibs4 and kdelibs-bin.
+
+  * Acknowledge NMU by Frank Lichtenheld, thanks! (Closes: #309955)
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sat, 02 Jul 2005 00:14:21 +0200
+
+kdelibs (4:3.4.0-0ubuntu6) breezy; urgency=low
+
+  * removed rm -f /etc/kderc from postinstall
+  * removed old kdelibs4.postinstall file 
+  * changed in rules distribution part for breezy 
+
+ -- Andreas Mueller <amu@ubuntu.com>  Fri, 20 May 2005 11:09:57 +0000
+
+kdelibs (4:3.4.0-0ubuntu5) breezy; urgency=low
+
+  * CXX transition: Rename kdelibs4 to kdelibs4c2.
+
+ -- Matthias Klose <doko@ubuntu.com>  Sat, 14 May 2005 13:49:24 +0000
+
+kdelibs (4:3.4.0-0ubuntu4) breezy; urgency=low
+
+  * Breezy upload
+
+ -- Jonathan Riddell <jr@jriddell.org>  Mon,  9 May 2005 09:52:08 +0100
+
+kdelibs (4:3.4.0-0ubuntu3.1) hoary-security; urgency=low
+
+  * Add kubuntu_04_kimgio_security.diff
+  * SECURITY UPDATE: kimgio input validation errors
+  * kimgio contains a PCX image file format reader that does
+    not properly perform input validation. A source code audit
+    performed by the KDE security team discovered several
+    vulnerabilities in the PCX and other image file format
+    readers, some of them exploitable to execute arbitrary
+    code.
+  * References:
+    http://cve.mitre.org/cgi-bin/cvename.cgi?name=CAN-2005-1046
+    http://bugs.kde.org/102328
+    http://www.kde.org/info/security/advisory-20050421-1.txt
+
+ -- Jonathan Riddell <jr@jriddell.org>  Thu, 21 Apr 2005 04:46:47 +0000
+
+kdelibs (4:3.4.0-0ubuntu3) hoary; urgency=low
+
+  * Move TextEditors from Utilities More to Utilities
+
+ -- Jonathan Riddell <jr@jriddell.org>  Thu, 24 Mar 2005 04:32:44 +0000
+
+kdelibs (4:3.4.0-0ubuntu2) hoary; urgency=low
+
+  * Move kubuntu_03_applications_menu_editors_move.diff to
+    kubuntu_03_applications_menu_entries_move.diff which also moves
+    Settings to Utilities.
+
+ -- Jonathan Riddell <jr@jriddell.org>  Thu, 17 Mar 2005 01:19:23 +0000
+
+kdelibs (4:3.4.0-0ubuntu1) hoary; urgency=low
+
+  * Add aboutkde-kubuntu.png.uu konqi image for about kde dialogue
+  * Add kubuntu_03_applications_menu_editors_move.diff moving Editors menu entries to Utilities
+
+ -- Jonathan Riddell <jr@jriddell.org>  Wed, 16 Mar 2005 01:04:26 +0000
+
+kdelibs (4:3.4.0-0pre1ubuntu2) hoary; urgency=low
+
+  * Add conflicts on old konq-plugins, kdeartwork-style and ksvg.
+
+ -- Jonathan Riddell <jr@jriddell.org>  Tue,  8 Mar 2005 22:37:52 +0000
+
+kdelibs (4:3.4.0-0pre1ubuntu1) hoary; urgency=low
+
+  * Sync with Debian
+
+ -- Jonathan Riddell <jr@jriddell.org>  Sun,  6 Mar 2005 00:57:03 +0000
+
+kdelibs (4:3.4.0~rc1-1ubuntu0.2) hoary; urgency=low
+
+  * Add sudo for kdesu patch kubuntu_01_kdesu_sudo.diff
+  * Add applications.menu move patch to stop collisions with Gnome kubuntu_02_applications_menu_rename.diff
+
+ -- Jonathan Riddell <jr@jriddell.org>  Sat,  5 Mar 2005 21:00:03 +0000
+
+kdelibs (4:3.4.0~rc1-1ubuntu0.1) hoary; urgency=low
+
+  * New upstram release RC1
+
+ -- Andreas Mueller <amu@ubuntu.com>  Tue, 1 Mar 2005 19:12:23 +0000
+
+kdelibs (4:3.3.2-6.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Export modXModeSwitch. Patch by Mattia Dongili (Closes: #309955)
+
+ -- Frank Lichtenheld <djpig@debian.org>  Sat, 21 May 2005 22:02:29 +0200
+
+kdelibs (4:3.3.2-6) unstable; urgency=high
+
+  +++ Changes by Christopher Martin:
+
+  * Includes a corrected fix for CAN-2005-1046. The previous upstream patch
+    broke certain filetypes. This resolves the issue.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sat,  7 May 2005 10:30:05 -0400
+
+kdelibs (4:3.3.2-5) unstable; urgency=medium
+
+  +++ Changes by Christopher Martin:
+
+  * KDE_3_3_BRANCH update. Includes fixes for CAN-2005-1046, a series of
+    vulnerabilities involving improper input validation for image files,
+    potentially resulting in arbitrary code execution. (Closes: #304465)
+
+  * Add GFDL to debian/copyright.
+
+  * Add another kaccel patch that fixes non-English keyboards on
+    SunRay terminals. Thanks to Nikita Youshchenko. (Closes: #301971)
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Fri, 22 Apr 2005 11:21:11 -0400
+
+kdelibs (4:3.3.2-4) unstable; urgency=low
+
+  * Improve the fix for CAN-2005-0365 ("insecure temporary file
+    creation") with a patch provided by Javier Fernández-Sanguino Peña:
+    now mktemp is used, previously the temporary file was still created
+    in an unsafe way, although in a safe directory. (Closes: #298533)
+
+  * KDE_3_3_BRANCH update, with several improvements for the IDN situation:
+    - matches SSL certificates based on the punycode version of the hostname.
+    - some TLDs are whitelisted and IDN domains will be resolved for them.
+      These are, by default: at, ch, cn, de, dk, kr, jp, li, no, se, tw.
+      The KDE_USE_IDN environment variable can be set to a colon-separated
+      list of TLDs to override this default, so if empty IDN will be disabled.
+
+  * Backport small patch from KDE 3.4 to prevent kate from printing lots of
+    assertion failures to stderr when editing a long line. (Closes: #298308)
+
+  * Backport small patch from KDE 3.4 to make KSpell search for dictionaries
+    in /usr/lib/aspell-0.6, which is now used by Aspell. (Closes: #296240)
+
+  * As OpenOffice.org 1.1.3 will enter testing together with this version of
+    kdelibs, re-add to kdelibs-data the template .desktop files removed in
+    3.3.2-1. Replace openoffice.org-mimelnk (<< 1.1.3), but don't conflict.
+
+  * This upload will get built with a non-broken gcc version in mipsel,
+    and thus closes: #298615.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sat, 12 Mar 2005 18:02:54 +0100
+
+kdelibs (4:3.3.2-3) unstable; urgency=high
+
+  * Urgency high as it closes a security RC bug.
+
+  +++ Changes by Isaac Clerencia:
+
+  * Fix syntax error in dcopidlng, closes: #297095 (was causing kdepim an
+    others to FTBFS).
+ 
+  * Apply patch from KDE 3.4 to fix CAN-2005-0237 (spoofing using IDN),
+    closes: #294271, #294204. IDN is now disabled in all KDE apps unless
+    the environment variable KDE_USE_IDN is set.
+ 
+  * Christopher Cheney has kindly relicensed man pages written by him from
+    GDFL to GPL, update the license statement accordingly. Closes: #292085.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Mon, 28 Feb 2005 14:05:30 +0100
+
+kdelibs (4:3.3.2-2) unstable; urgency=high
+
+  +++ Changes by Adeodato Simó:
+
+  * Include patch to fix CAN-2005-0365, "insecure temporary file creation in
+    kdelibs 3.3.2". dcopidlng no longer creates its temporary files in /tmp.
+    (Closes: #294832, #294896) Urgency set to high because of this and other
+    RC bug fixes below.
+
+  * KDE_3_3_BRANCH update.
+
+  * Include patch from CVS to fix XMLHttpRequest POST being broken in KHTML
+    due to a blank line in headers. (Closes: #292765)
+
+  +++ Changes by Christopher Martin:
+
+  * Add patch from upstream that solves the problem wherein programs whose
+    .desktop entry contained their full path, rather than just the binary
+    to be executed (mainly games), confused kdeinit.
+    (Closes: #270592, #290323)
+
+  * debian/control: Add necessary kdelibs-data Replaces for old
+    openoffice.org packages. (Closes: #292569)
+
+  * Add better manpage for lnusertemp. Thanks to Javier Fernández-Sanguino
+    Peña. (Closes: #292081)
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sun, 13 Feb 2005 04:58:29 +0100
+
+kdelibs (4:3.3.2-1) unstable; urgency=medium
+
+  +++ Changes by Adeodato Simó:
+
+  * Uploading to unstable. This new upstream version fixes CAN-2004-1145,
+    "Konqueror Java Vulnerability", and thus closes: #286521. Urgency set
+    to medium for this reason (the package has been in experimental for some
+    time, and has been checked to work properly with the rest of 3.3.1
+    packages).
+
+  * debian/control:
+    - make kdelibs-data replace kjscmd (<< 4:3.3.0), which was missed in the
+      3.3.1-1 upload and completely forgotten since then. (Closes: #288653)
+
+  * debian/kdelibs-data.install: the files added in the previous upload were
+    checked not to exist in oo.o-mimelnk in sid, but sadly they exist in the
+    version in sarge. Reverted them for now, will be re-added when OpenOffice
+    1.1.3 enters sarge (with the proper Conflicts: entry). (Closes: #287097)
+
+    List of files:
+      - usr/share/mimelnk/application/vnd.sun.xml.calc.template.desktop
+      - usr/share/mimelnk/application/vnd.sun.xml.draw.template.desktop
+      - usr/share/mimelnk/application/vnd.sun.xml.impress.template.desktop
+      - usr/share/mimelnk/application/vnd.sun.xml.writer.template.desktop
+
+  +++ Changes by Christopher Martin:
+
+  * KDE_3_3_BRANCH update. Pulls in the fix for CAN-2004-1165, the FTP command
+    injection bug. (Closes: #285128, #287201)
+
+  * Add patch to change the group set by KDE CUPS configurator to Debian's
+    default, lpadmin, rather than sys. (Closes: #263430)
+
+  * Add kaccel hack that works around a Konqueror crash with Russian keyboards.
+    (Closes: #287566)
+
+  * Change debian/copyright file to refer to licenses, instead of copyright,
+    when discussing KDE's licenses. (Closes: #290191, #290190)
+
+  * Change dependency on perl-suid to perl, and add Recommends: perl-suid.
+    The lack of perl-suid should only cause problems for some users using
+    NFS or SMB shares. (Closes: #289164)
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sun, 16 Jan 2005 20:48:01 +0100
+
+kdelibs (4:3.3.2-0pre1) experimental; urgency=low
+
+  * New upstream release.
+
+  * KDE_3_3_BRANCH update. Includes the kdelibs part of the fix
+    for CAN-2004-1158. [CM]
+
+  * Removed patches:
+    - post-3.3.1-kdelibs-khtml.diff and post-3.3.1-kdelibs-kio.diff since
+      these fixes are in KDE_3_3_BRANCH. [CM]
+
+  * New patches:
+    - 06_automake-1.9.diff
+    - 12_cups_docroot.diff: changed the CUPS document path in kdeprint to
+      reflect the Debian default. [CM]
+
+  * Updated dcop.1 manpage with patch by Helge Kreutzman. (Closes: #250631)
+
+  * New entries in debian/kdelibs-data.install:
+    - usr/share/mimelnk/application/java.desktop
+    - usr/share/mimelnk/application/xml.desktop
+    - usr/share/mimelnk/application/vnd.sun.xml.calc.template.desktop
+    - usr/share/mimelnk/application/vnd.sun.xml.draw.template.desktop
+    - usr/share/mimelnk/application/vnd.sun.xml.impress.template.desktop
+    - usr/share/mimelnk/application/vnd.sun.xml.writer.template.desktop
+    - usr/share/apps/ksgmltools2/customization/cs/entities/underLGPL.docbook
+
+  * New entries in debian/kdelibs4-dev.install:
+    - usr/include/kde/kiobuffer.h
+    - usr/include/kde/kwallettypes.h
+
+  * debian/control:
+    - removed unneeded build-dependency on automake1.9. [CM]
+
+  * debian/rules:
+    - call dh_makeshlibs with DH_COMPAT set to 3, so that -V works again for
+      us (works around debhelper bug #280830). (Closes: #280826)
+
+ -- Adeodato Simó <asp16@alu.ua.es>  Fri, 17 Dec 2004 01:30:13 +0100
+
+kdelibs (4:3.3.1-4) unstable; urgency=high
+
+  * The "from kde maintainers to m68k porters with love" release.
+  * Move the Conflicts with (<< 3.3.0) packages from kdelibs (dummy package)
+    to kdelibs4 (real package). They were put in the wrong package due to a
+    wrong assumption on how the testing scripts work.
+
+ -- Riku Voipio <riku.voipio@iki.fi>  Sun, 19 Dec 2004 16:45:39 +0000
+
+kdelibs (4:3.3.1-3) unstable; urgency=high
+
+  * Fix kdeaccessability Conflict. Closes: #285391
+  * Added patch to fix half of Konqueror Window Injection Vulnerability 
+    CAN-2004-1158. kdebase upload will fix the rest.
+
+ -- Riku Voipio <riku.voipio@iki.fi>  Mon, 13 Dec 2004 18:53:21 +0000
+
+kdelibs (4:3.3.1-2) unstable; urgency=medium
+
+  * New upload to aid with transition of KDE 3.3 to sarge and to fix security
+    hole. Urgency set to medium because of these reasons.
+
+  * Add versioned conflicts (<< 4:3.3.0) for all KDE official modules in
+    kdelibs. This will permit the testing transition to happen all at once.
+  
+  * Fixed kdewebdev conflict (was << 4:3.3.0, while kdewebdev in sid
+    is 1:3.3.0 -Riku
+
+  * Include patch to fix CAN-2004-1171 ("plain text password exposure").
+    Closes half of #285126. Notes about the patches:
+
+    - post-3.3.1-kdelibs-khtml.diff: dropped hunks #2 and #3 of patch to
+      khtml_part.cpp, since they were whitespace adjustments and were causing
+      failures to apply.
+
+    - post-3.3.1-kdelibs-kio.diff: the patch as given in the KDE Advisory
+      can't be used, since kdelibs 3.3.1-1 includes a KDE_3_3_BRANCH pull that
+      already modifies kio/kio/job.cpp and makes the supplied patch unusable.
+
+      Regenerated patch from CVS: Diff for /kdelibs/kio/kio/job.cpp between
+      version 1.397.2.7 and 1.397.2.8.
+
+ -- Adeodato Simó <asp16@alu.ua.es>  Sat, 11 Dec 2004 00:23:09 +0100
+
+kdelibs (4:3.3.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * KDE_3_3_BRANCH update.
+
+ -- Christopher L Cheney <ccheney@debian.org>  Sun, 31 Oct 2004 03:30:00 -0600
+
+kdelibs (4:3.3.0-2) unstable; urgency=low
+
+  * KDE_3_3_BRANCH update.
+
+ -- Christopher L Cheney <ccheney@debian.org>  Thu, 23 Sep 2004 17:00:00 -0500
+
+kdelibs (4:3.3.0-1.1) unstable; urgency=low
+
+  * The "Please stop spamming the OpenEXR maintainer (me)" Debian release.
+    - Non Maintainer Upload.
+    - Force rebuild against libopenexr2.
+      (closes: #266504)
+
+ -- Andrew Lau <netsnipe@users.sourceforge.net>  Fri, 27 Aug 2004 14:22:03 +1000
+
+kdelibs (4:3.3.0-1) unstable; urgency=high
+
+  * New upstream release.
+
+ -- Christopher L Cheney <ccheney@debian.org>  Fri, 13 Aug 2004 18:00:00 -0500
+
+kdelibs (4:3.2.3-4) unstable; urgency=high
+
+  * KDE_3_2_BRANCH Update.
+  * Apply patch for mktemp security issue. (Closes: #261386)
+  * Build-Depends: libtiff4-dev. (Closes: #262589, #262832)
+
+ -- Christopher L Cheney <ccheney@debian.org>  Mon,  2 Aug 2004 22:00:00 -0500
+
+kdelibs (4:3.2.3-3) unstable; urgency=low
+
+  * KDE_3_2_BRANCH Update.
+
+ -- Christopher L Cheney <ccheney@debian.org>  Thu, 22 Jul 2004 03:00:00 -0500
+
+kdelibs (4:3.2.3-2) unstable; urgency=low
+
+  * KDE_3_2_BRANCH Update.
+
+ -- Christopher L Cheney <ccheney@debian.org>  Sat, 12 Jun 2004 14:30:00 -0500
+
+kdelibs (4:3.2.3-1) unstable; urgency=high
+
+  * New upstream release.
+  * kdelibs-bin Depends: menu-xdg. (Closes: #248610)
+
+ -- Christopher L Cheney <ccheney@debian.org>  Thu,  3 Jun 2004 19:00:00 -0500
+
+kdelibs (4:3.2.2-2) unstable; urgency=high
+
+  * kdelibs-data Depends: hicolor-icon-theme. (Closes: #238839)
+  * Remove preinst bashism. (Closes: #242946, #242961, #243475)
+  * Do not remove /etc/kde3/system.kdeglobals. (Closes: #245149)
+  * kdelibs-bin Recommends: menu-xdg.
+
+ -- Christopher L Cheney <ccheney@debian.org>  Wed, 21 Apr 2004 18:00:00 -0500
+
+kdelibs (4:3.2.2-1) unstable; urgency=low
+
+  * New upstream release.
+  * Added CUPS usage information to README.Debian. (Closes: #132587)
+  * Update kdelibs-data Replaces: openoffice.org-mimlnk. (Closes: #233700,
+    #236508)
+  * Correct debian menu replacewith usage. (Closes: #237260, #238769,
+    #239260, #241083, #241420, #242266)
+  * debian/Packaging.txt, debian/dh-make/menu.ex: Removed references to
+    the obsolete kderemove menu tag in kdelibs' documentation.
+  * debian/Packaging.txt, debian/dh-make/menu.ex: Added quotes to the menu
+    file examples.
+  * debian/dh-make/rules, debian/Packaging.txt: updated the information to
+    the state that things currently are in sid.
+  * debian/dh-make/rules, debian/Packaging.txt: Added an example icon entry
+    to the example menu file content.
+  * debian/Packaging.txt: Added a paragraph by Nathaniel W. Turner
+    explaining how to use CDBS for packaging a KDE app.
+
+ -- Christopher L Cheney <ccheney@debian.org>  Mon,  5 Apr 2004 23:00:00 -0500
+
+kdelibs (4:3.2.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * Added kdelibs4 Depends xbase-clients. (Closes: #232348)
+
+ -- Christopher L Cheney <ccheney@debian.org>  Thu, 04 Mar 2004 22:00:00 -0600
+
+kdelibs (4:3.2.0-0pre1v1) experimental; urgency=low
+
+  * New upstream release.
+
+ -- Christopher L Cheney <ccheney@debian.org>  Tue, 17 Feb 2004 01:00:00 -0600
+
+kdelibs (4:3.1.95-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Christopher L Cheney <ccheney@debian.org>  Wed, 21 Jan 2004 21:00:00 -0600
+
+kdelibs (4:3.1.5-1) unstable; urgency=low
+
+  * New upstream release.
+  * Added libtool arm patch.
+  * Corrected meinproc manpage. (Closes: #220883)
+  * Added --enable-dnotify to configure (Closes: #206976)
+
+ -- Christopher L Cheney <ccheney@debian.org>  Sat, 10 Jan 2004 14:00:00 -0600
+
+kdelibs (4:3.1.4-3) unstable; urgency=low
+
+  * Added Replaces to kdelibs-data for arson, k3b. (Closes: #214534)
+  * Move meinproc to kdelibs-bin so that khelpcenter glossary works.
+    (Closes: #214815)
+  * Restore generation of system.kdeglobals. (Closes: #216463)
+  * Remove symlink /usr/share/config -> /etc/kde3.
+
+ -- Christopher L Cheney <ccheney@debian.org>  Tue,  4 Nov 2003 22:00:00 -0600
+
+kdelibs (4:3.1.4-2) unstable; urgency=low
+
+  * Added patch to update autotools files.
+  * Added patch to remove pedantic-errors from KDE_CHECK_FUNC_EXT since it
+    causes configure checks to fail due to #line numbers being > 32767.
+  * Added patch to make KStandardDirs::addKDEDefaults look in /usr/local as
+    well.
+
+ -- Christopher L Cheney <ccheney@debian.org>  Sun,  5 Oct 2003 18:00:00 -0500
+
+kdelibs (4:3.1.4-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Christopher L Cheney <ccheney@debian.org>  Sat, 27 Sep 2003 02:00:00 -0500
+
+kdelibs (4:3.1.3-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Christopher L Cheney <ccheney@debian.org>  Tue, 29 Jul 2003 20:00:00 -0500
+
+kdelibs (4:3.1.2-2.1) unstable; urgency=low
+
+  * NMU
+  * kdelibs4-dev Depends: libxml2-utils.
+    Closes: #196222, #196958, #199044, #200483, #200484
+
+ -- LaMont Jones <lamont@debian.org>  Wed,  9 Jul 2003 15:26:11 -0600
+
+kdelibs (4:3.1.2-2) unstable; urgency=low
+
+  * Add xlibs-pic to kdelibs-dev Depends. (Closes: #193863)
+  * Add libssl-dev to kdelibs-dev Depends. (Closes: #180542)
+
+ -- Christopher L Cheney <ccheney@debian.org>  Mon, 19 May 2003 12:00:00 -0500
+
+kdelibs (4:3.1.2-1) unstable; urgency=low
+
+  * New upstream release. (Closes: #185697, #192616, #192931)
+
+ -- Christopher L Cheney <ccheney@debian.org>  Sun, 18 May 2003 01:00:00 -0500
+
+kdelibs (4:3.1.1-1) unstable; urgency=low
+
+  * New upstream release. (Closes: #181547, #181870)
+  * Correct imagetops manpage description. (Closes: #180868)
+
+ -- Christopher L Cheney <ccheney@debian.org>  Tue, 11 Mar 2003 19:00:00 -0600
+
+kdelibs (4:3.1.0-2) unstable; urgency=low
+
+  * Add 'chmod +x configure' to rules.
+
+ -- Christopher L Cheney <ccheney@debian.org>  Wed,  5 Feb 2003 12:00:00 -0600
+
+kdelibs (4:3.1.0-1) unstable; urgency=low
+
+  * New Upstream.
+  * Rebuilt debian dir.
+  * Split arts out of kdelibs source.
+
+ -- Christopher L Cheney <ccheney@debian.org>  Sat, 01 Feb 2003 01:00:00 -0600
+
+kdelibs (4:2.2.2-14) unstable; urgency=low
+
+  * And a quick update to send it to unstable; no changes from -13.woody.3.
+
+ -- Daniel Stone <dstone@trinity.unimelb.edu.au>  Wed, 11 Sep 2002 22:29:31 +1000
+
+kdelibs (4:2.2.2-13.woody.8) stable-security; urgency=high
+
+  * Non-maintainer upload by the Security Team
+  * Apply the following patches from upstream:
+    - post-2.2.2-kdelibs-http.patch (CAN-2003-0459)
+    - post-2.2.2-kdelibs-kio-2.diff (CAN-2003-0370)
+    - post-2.2.2-kdelibs-kssl-2.diff (CAN-2003-0370)
+  * These address the issues described in:
+    - http://www.kde.org/info/security/advisory-20030602-1.txt
+    - An upcoming KDE advisory regarding CAN-2003-0370
+
+ -- Matt Zimmerman <mdz@debian.org>  Thu, 24 Jul 2003 12:57:56 -0400
+
+kdelibs (4:2.2.2-13.woody.7) stable-security; urgency=high
+
+  * Non-maintainer upload by the Security Team
+  * Applied upstream patch so ghostscript won't execute arbitrary commands
+    hidden inside of postscript files.
+
+ -- Martin Schulze <joey@infodrom.org>  Thu, 10 Apr 2003 12:05:36 +0200
+
+kdelibs (4:2.2.2-13.woody.6) stable-security; urgency=high
+
+  * Non-maintainer upload by the Security Team
+  * Applied upstream patches to fix several potential vulnerabilities.
+    http://www.kde.org/info/security/advisory-20021220-1.txt
+
+ -- Martin Schulze <joey@infodrom.org>  Mon,  6 Jan 2003 08:20:04 +0100
+
+kdelibs (4:2.2.2-13.woody.5) stable-security; urgency=high
+
+  * Non-maintainer upload by the Security Team
+  * Second (or third, since the first one burnt together with satie and
+    the entire building around it) injection into the security build
+    network since 8 buildds refuse to upload the binary packages and the
+    maintainer refuses to answer.  *sigh*
+
+ -- Martin Schulze <joey@infodrom.org>  Sat, 30 Nov 2002 18:25:33 +0100
+
+kdelibs (4:2.2.2-13.woody.4) stable-security; urgency=high
+
+  * Non-maintainer upload by the Security Team
+  * Remove rlogin.protocol and telnet.protocol to fix URL KIO
+    vulnerability (as reported by the KDE team)
+  * Add special detection routine for big/little endianess on MIPS since
+    the line "byteorder  : {big|little} endian" from /proc/cpuinfo was
+    removed as of Linux 2.4.20, resulting in the mipsel buildd being
+    unable to build this package.
+
+ -- Martin Schulze <joey@infodrom.org>  Fri, 22 Nov 2002 11:42:59 +0100
+
+kdelibs (4:2.2.2-13.woody.3) stable-security; urgency=high
+
+  * Non-maintainer upload authored by security team (Joey)
+  * Fixes cross-site scripting vulnerability in KHTML.
+    (http://www.kde.org/info/security/advisory-20020908-2.txt)
+
+ -- Daniel Stone <dstone@trinity.unimelb.edu.au>  Wed, 11 Sep 2002 22:24:35 +1000
+
+kdelibs (4:2.2.2-13.woody.2) stable-security; urgency=high
+
+  * Non-maintainer upload by security team
+  * Security upload to fix SSL problems with Konqueror.
+  * Fix local denial of service attack with aRts. This is NOT a local root
+    vulnerability, just a stupid, over-excited skript kiddie wanting propz
+    off SecurityFocus. *sigh*. (closes: #152211)
+  * Adjusted Build-Depends (i.e. added libstdc++2.10-dev/libstdc++3-dev and g++)
+  * Removed setuid bits for artswrapper from lintian overrides
+  * Added sanity checks to artswrapper so open(), fopen() etc. never
+    return file descriptors 1 or 2 (reserved for stdout and stderr)
+  * Applied upstream patch to avoid a local denial of service (hence not
+    raising the nice level)
+  * Don't install artswrap setuid root anymore because of the above
+
+ -- Martin Schulze <joey@infodrom.org>  Fri, 16 Aug 2002 18:46:10 +0200
+
+kdelibs (4:2.2.2-13.woody.1) testing-security; urgency=high
+
+  * Non-maintainer upload by security team
+  * Don't install artswrapper suid, it is a security problem waiting to
+    happen
+
+ -- Wichert Akkerman <wakkerma@debian.org>  Fri, 12 Jul 2002 22:47:26 +0200
+
+kdelibs (4:2.2.2-13) unstable; urgency=high
+
+  * Fixed kdelibs-dev dependency should be libpng2-dev
+
+ -- Christopher L Cheney <ccheney@debian.org>  Fri,  1 Mar 2002 17:00:00 -0600
+
+kdelibs (4:2.2.2-12) unstable; urgency=high
+
+  * New maintainer.
+  * Remove Build-Depends on libglib1.3-dev since it has unstable ABI
+    (Closes: #133171, #134168)
+  * added suggests libjpeg-mmx-progs | libjpeg-progs, netpbm (Closes: #129094)
+
+ -- Christopher L Cheney <ccheney@debian.org>  Thu, 28 Feb 2002 13:00:00 -0600
+
+kdelibs (4:2.2.2-11) unstable; urgency=low
+
+  * Adopting orphaned package, thanks to Ivan for all the great work over the
+    years.
+
+ -- Daniel Stone <daniel@sfarc.net>  Fri,  4 Jan 2002 09:14:46 -0500
+
+kdelibs (4:2.2.2-10) unstable; urgency=low
+
+  * Fix Deps (Closes: #126232)
+  * Change nas-dev suggests to depends
+  * A Couple upstream fixes
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 27 Dec 2001 23:20:00 -0700
+
+kdelibs (4:2.2.2-9) unstable; urgency=low
+
+  * Move all non-module .la files from /usr/lib into -dev package.  We leave 
+    all the .la files out of /usr/lib/kde2 and those that may not be normal
+    libraries out of /usr/lib
+  * Fix spelling error (Closes: #124989)
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 17 Dec 2001 22:00:00 -0700
+
+kdelibs (4:2.2.2-8) unstable; urgency=low
+
+  * Depend on libfam-dev (Closes: #124264)
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 16 Dec 2001 17:21:00 -0700
+
+kdelibs (4:2.2.2-7) unstable; urgency=low
+
+  * Break out bin files from kdelibs3 so that we can interoperate with
+    kdelibs4 easily.
+  * Fix deviceman.cc (Closes: #124132)
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 14 Dec 2001 18:28:00 -0700
+
+kdelibs (4:2.2.2-6) unstable; urgency=low
+
+  * sync with upstream
+  * Add in Build-Depends we normally get through libqt-dev so we can better
+    follow policy
+  * Add libfam-dev to Build-Depends
+  * Version the libjpeg62-dev deps and add libjpeg to the depends for
+    kdelibs-dev since some older versions don't have the .la file
+  * Put bug reporting back to KDE so the users are happy and the developers
+    are not.
+  * Conflict (Closes: #123846)
+  * Update dh-make files
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 13 Dec 2001 00:57:00 -0700
+
+kdelibs (4:2.2.2-5) unstable; urgency=low
+
+  * sync with upstream
+  * Build with nas support by popular demand
+  * Update Build-Depends:  +nas-dev
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 05 Dec 2001 06:04:00 -0700
+
+kdelibs (4:2.2.2-4) unstable; urgency=low
+
+  * sync with upstream
+  * Build cleanup.  export CFLAGS/CXXFLAGS instead of the old method
+  * Build-Depends cleanup
+  * Dep cleanup.  Let's not conflict so much for the final release and lets
+    not Recommend everything for the final release. (Closes: #118952)
+  * Build with Xinerama support for i386 only (Closes: #116765)
+  * Add in bits in debian/rules to make it easier to build optimized binaries
+  * Remove old replaces/conflicts for keystone
+  * Cleanup documentation for freeze
+  * Cleanup dh-make files
+  * Default to Reject for cookie acceptions. (Closes: #121750)
+  * kio_https.* no longer exists and due to diversions we could end up 
+    with the files existing but not tied to any package..so let's make
+    sure to remove them.
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 30 Nov 2001 12:39:00 -0700
+
+kdelibs (4:2.2.2-3) unstable; urgency=low
+
+  * a couple upstream fixes
+  * debianrules cleanup
+  * More lintian cleanup
+  * Remove stupid debug messages (Closes: #120647)
+  * More work on BTS stuff.  Give 2 options for Help/Report Bug, one to
+    check current reports and one to report.
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 25 Nov 2001 20:11:00 -0700
+
+kdelibs (4:2.2.2-2) unstable; urgency=low
+
+  * Remove recommends for libssl as I'm breaking policy by recommending
+    something outside of main.  Will put this back once libssl goes into
+    main.
+  * libkmid | libkmid-alsa to help users out a bit
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 22 Nov 2001 20:14:00 -0700
+
+kdelibs (4:2.2.2-1) unstable; urgency=low
+
+  * New upstream version
+  * Provide replace/etc bits for easier migration to/from kde3
+  * Update python deps (Closes: #118208)
+  * Fix glib inclusion bits for gmcop stuff...however we are still
+    not going to build with it until someone has a need for it.
+  * Remove some other hacks
+  * Update deps for qt as qt 2.3.2 has a fix which breaks a piece of kdelibs
+    so let's make sure we match up across the board.
+  * Update shlibs for the same reason
+  * Use libasound2
+  * Fix printing to files with spaces in the name (Closes: #117962)
+  * Fix build with new libxml2 (Closes: #118638)
+  * Update build-depends
+  * Fix overwrite issues (Closes: #118802)
+  * Updates to take care of changes in Qt 2.3.2 (Closes: #118868)
+  * Do away with /etc/kderc and provide a link from /etc/kde2 to
+    /usr/share/kde2/config.  Hardcode the config dir to /usr/share/kde2/config
+    instead of /usr/share/config.  Can't hardcode it to /etc/kde2 since 
+    the /usr part of it all is pulled from the prefix.  This will work tho
+  * Move certain -dev binaries over to the -dev package
+  * Should fix socks autodetection (Closes: #118925)
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 19 Nov 2001 23:17:00 -0700
+
+kdelibs (4:2.2.1-14) unstable; urgency=low
+
+  * Fix overwrite problem (Closes: #116773)
+  * Hopefully fix arts for bigendian (Closes: #115292)
+  * Sync with upstream
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 25 Oct 2001 09:39:00 -0700
+
+kdelibs (4:2.2.1-13) unstable; urgency=low
+
+  * Fix overwrite problem (Closes: #116568)
+  * Sync with upstream
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 21 Oct 2001 19:27:00 -0700
+
+kdelibs (4:2.2.1-12) unstable; urgency=low
+
+  * more js fixes
+  * more ssl fixes
+  * gernal sync with upstream
+  * Added missing build-conflict
+  * Get rid of automake hacks...hard code build-dep version for new automake
+    thank god kde3 builds with automake1.5...
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 19 Oct 2001 12:43:00 -0700
+
+kdelibs (4:2.2.1-11) unstable; urgency=low
+
+  * Several crash fixes
+  * js fixes
+  * ssl fixes
+  * Update shlibs. This should take care of a few problems
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Tue, 15 Oct 2001 00:15:00 -0700
+
+kdelibs (4:2.2.1-10) unstable; urgency=low
+
+  * Hopefully fix both the AA problem and the kicker crash problem
+  * Clean up lintian overrides
+  * Sync with upstream
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 12 Oct 2001 10:18:00 -0700
+
+kdelibs (4:2.2.1-9) unstable; urgency=low
+
+  * Fix deps (Closes: #115064)
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 08 Sep 2001 09:55:00 -0700
+
+kdelibs (4:2.2.1-8) unstable; urgency=low
+
+  * Remove build-depends for auto* since we are doing that locally to
+    get around the automake 1.5 issues
+  * Remove configure checks for automake/autoheader.  On some archs it seems
+    to track this info down and attempt to run auto* which just hoses things
+  * More upstream fixes
+  * Update standards version
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 08 Sep 2001 09:55:00 -0700
+
+kdelibs (4:2.2.1-7) unstable; urgency=low
+
+  * Not sure what happened but let's chmod 755 configure just to make
+    sure it's got the proper perms before we execute it (Closes: #114552)
+  * Various other upstream fixes
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 05 Sep 2001 09:48:00 -0700
+
+kdelibs (4:2.2.1-6) unstable; urgency=low
+
+  * let this puppy build with automake 1.5
+  * Various other upstream fixes
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Tue, 02 Sep 2001 01:00:00 -0700
+
+kdelibs (4:2.2.1-5) unstable; urgency=low
+
+  * arts updates ... this should fix some of the arts related problems
+  * crash fix for css
+  * Various other upstream fixes
+  * fix shlibs
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 30 Sep 2001 01:00:00 -0700
+
+kdelibs (4:2.2.1-4) unstable; urgency=low
+
+  * Build-Conflict for nas-lib so that we can build properly
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 24 Sep 2001 19:25:00 -0700
+
+kdelibs (4:2.2.1-3) unstable; urgency=low
+
+  * Post 2.2.1 quick fixes from upstream
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 23 Sep 2001 18:42:00 -0700
+
+kdelibs (4:2.2.1-2) unstable; urgency=low
+
+  * Grrrr build on alpha!
+  * Fix replaces (Closes: #112902)
+  * Fix replacement (Closes: #112901)
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 19 Sep 2001 16:27:00 -0700
+
+kdelibs (4:2.2.1-1) unstable; urgency=low
+ 
+  * New upstream version
+  * Move artsc-config into -dev package (Closes: #109973)
+  * Priority set to extra for -alsa packages
+  * Do NOT build with Xinerama support due to the library being static
+    and that whole PIC/non-PIC so thing. 
+  * Fix ctrl+s (Closes: #110694)
+  * Don't need to build with gcc3 for alpha anymore, however we still
+    need to build with -O0
+  * Provide undocumented links (Closes: #94280)
+  * Fixes printing (Closes: #108301, #111388, #109930)
+  * Fix shlibs for alsa packages (Closes: #111640, #110159)
+  * Don't use objprelink anymore
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 07 Sep 2001 12:10:00 -0700
+
+kdelibs (4:2.2.0-final-3) unstable; urgency=low
+ 
+  * Sync with upstream
+  * Fix a couple more deps/build-deps
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 22 Aug 2001 10:59:00 -0700
+
+kdelibs (4:2.2.0-final-2) unstable; urgency=low
+ 
+  * update build-depends for i386
+  * Updated translation bits
+  * sync with upstream
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 19 Aug 2001 00:01:00 -0700
+
+kdelibs (4:2.2.0-final-1) unstable; urgency=low
+ 
+  * New upstream version 2.2
+  * Build with objprelink for i386
+  * update build-depends
+  * do not build with xinerama support for hppa
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 04 Aug 2001 02:30:00 -0700
+
+kdelibs (4:2.2.0-0.1beta1-2) unstable; urgency=low
+ 
+  * synce with upstream
+  * more https related fixes
+  * Fix shlibs
+  * Fix build issues with new libxml2-dev (Closes: #106766)
+  * fix postrm of kdelibs-dev
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 27 Jul 2001 12:18:00 -0700
+
+kdelibs (4:2.2.0-0.1beta1-1) unstable; urgency=low
+ 
+  * synce with upstream
+  * Drop optimization down for cross arch building
+  * Move libkscreensaver.so over to -dev package where it belongs
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 25 Jul 2001 03:35:00 -0700
+
+kdelibs (4:2.2.0-0beta1-6) unstable; urgency=low
+ 
+  * synce with upstream
+  * Update debhelper templates for alpha build bits
+  * Update/Clean/Fix various dependency issues
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 08 Jul 2001 00:53:00 -0700
+
+kdelibs (4:2.2.0-0beta1-5) unstable; urgency=low
+ 
+  * synce with upstream
+  * Add -mieee for Alpha builds
+  * Add Recommends for aspell | ispell
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 07 Jul 2001 00:57:00 -0700
+
+kdelibs (4:2.2.0-0beta1-4) unstable; urgency=low
+ 
+  * synce with upstream
+  * Remove old pam bit (Closes: #103493)
+  * Fix http proxy support
+  * More js fixes
+  * Update standards version
+  * Re-establish shlibs for libarts (Closes: #103655)
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 04 Jul 2001 14:37:00 -0700
+
+kdelibs (4:2.2.0-0beta1-3) unstable; urgency=low
+ 
+  * Fix description (Closes: #103206)
+  * Sync with upstream
+  * Update build-depends
+  * don't compress .bz2 files (Closes: #103262)
+  * Use dpkg-divert instead of alternatives
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 02 Jul 2001 13:18:00 -0700
+
+kdelibs (4:2.2.0-0beta1-2) unstable; urgency=low
+ 
+  * Move over a cups file that didn't get into -cups package
+  * Fix alsa-stamp build location
+  * Change kdelibs3-cups depends on kdebase-libs to a recommends
+  * More upstream fixes
+  * Fix overwrites (Closes: #102857)
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 29 Jun 2001 13:18:00 -0700
+
+kdelibs (4:2.2.0-0beta1-1) unstable; urgency=low
+
+  * Fix mips build (Closes: #102007)
+  * Fix postinst stuff
+  * New upstream CVS pull (post alpha2)
+  * 2.2 beta 1
+  * Remove old .shlibs files
+  * Moving to -cvs{date] format for entering into experimental
+  * This is a post alpha1 snapshot taken from the HEAD cvs branch.  
+    date listed in the version number states when the initial pull was made
+    however updates may and most likely will have taken place since that
+    date.  Look at it as a >= cvs{date}
+  * More arts cleanup
+  * Adding artsbuilder to the suggests for libarts/libarts-alsa
+  * Includes /tmp security fix
+  * Updated Build-Depends/Depends for docbook stuff
+  * More cleanup in debian/rules
+  * move artsmessage into libarts package where it belongs
+  * Update copyright information
+  * more build cleanup...moving to debhelper version 3
+  * Move dh_make files into kdelibs-dev package where they were supposed to be
+  * Move more includes from kdelibs3 to kdelibs-dev ... new stuff I missed
+  * More more cups bits out of kdelibs3 and into kdelibs3-cups
+  * Reseting all lintian overrides
+  * Add flex to build-depends as well as other deps
+  * Add Debian menu items: cupsdconf
+  * New packages: kdelibs3-cups
+  * Moving kdoc and qt-doc into Build-Depends-Indep
+  * Add Provides in for libarts-alsa/libkmid-alsa
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 22 Jun 2001 06:30:00 -0700
+
+kdelibs (4:2.1.1-7) unstable; urgency=low
+ 
+  * Adding in a dh-make template tree under /usr/share/doc/kdelibs-dev/dh-make
+    It is for a single binary package.  
+  * Update README
+  * Remove old undocumented.in bits since it's now pointless
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 09 Apr 2001 03:00:00 -0700
+
+kdelibs (4:2.1.1-6) unstable; urgency=low
+ 
+  * Sync with upstream.
+    Locale updates
+    More http fixes
+  * Update build-depends to include real | virtual
+  * Adding in a Packaging.txt document to kdelibs-dev the goal of which is to
+    answer any question one might have about packaging a KDE app for Debian.
+  * Fixing docs file for libarts
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 09 Apr 2001 03:00:00 -0700
+
+kdelibs (4:2.1.1-5) unstable; urgency=low
+ 
+  * Sync with upstream.
+    Several more http fixes
+  * Removing old AA bits 
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 07 Apr 2001 04:33:00 -0700
+
+kdelibs (4:2.1.1-4) unstable; urgency=low
+ 
+  * Sync with upstream.
+    Proxy Authentication fix...round 2.
+  * Oh..and Happy Birthday to my wife Audra.  :)
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 04 Apr 2001 18:04:00 -0700
+
+kdelibs (4:2.1.1-3) unstable; urgency=low
+ 
+  * Sync with upstream.  
+    Includes several khtml fixes
+    Memory leak fix
+    Proxy Authentication fix
+  * Update pam file for kde, add more documentation in it and modify defaults
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Tue, 03 Apr 2001 10:18:00 -0700
+
+kdelibs (4:2.1.1-2) unstable; urgency=low
+ 
+  * 2 birds with 1 debuild.  
+    Rebuild against older libc6
+    Couple upstream fixes in kjs
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 19 Mar 2001 13:39:00 -0700
+
+kdelibs (4:2.1.1-1) unstable; urgency=low
+ 
+  * New upstream release
+  * Dropping provides for kdelibs3-dev
+  * don't allow POST data to dump to the debug output...
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 19 Mar 2001 10:26:00 -0700
+
+kdelibs (4:2.1.0.1-5) unstable; urgency=low
+ 
+  * Several fixes moving us towards 2.1.1
+  * Several "don't crash when..." fixes
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 15 Mar 2001 10:26:00 -0700
+
+kdelibs (4:2.1.0.1-4) unstable; urgency=low
+ 
+  * More upstream fixes
+  * Add in a pam_env statement to kde pam file.  This *should* fix problems
+    people have had with kde not reading in their environment settings
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Tue, 13 Mar 2001 16:24:00 -0700
+
+kdelibs (4:2.1.0.1-3) unstable; urgency=low
+ 
+  * More upstream fixes
+    location object fixes for JavaScript
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 11 Mar 2001 02:43:00 -0700
+
+kdelibs (4:2.1.0.1-2) unstable; urgency=low
+ 
+  * More upstream fixes
+    several khtml fixes especially with css
+    more font fixes
+    more session fixes..hopefully solving some of the reports
+  * built with new kdoc
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 11 Mar 2001 02:43:00 -0700
+
+kdelibs (4:2.1.0.1-1) unstable; urgency=low
+ 
+  * Fix proxy authentication
+  * Several other upstream fixes
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 08 Mar 2001 15:22:00 -0700
+
+kdelibs (4:2.1.0-3) unstable; urgency=low
+ 
+  * More upstream fixes
+   Fix for URLs like "http://www.kde.org?query=bla" and "http://www.kde.org#ref"
+   Fix for crashes opening http://www.radiocomercial.pt
+   Fix for accessing cookies via javascript
+   Fix for problem with filenames getting cut with umlauts
+   Fix for problem with permission changes in properties dialog
+   Don't unzip if the filename ends with .gz
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 07 Mar 2001 01:54:00 -0700
+
+kdelibs (4:2.1.0-2) unstable; urgency=low
+ 
+  * Adding libbz2-dev and libsasl-dev into Build-Depends so that the ioslaves
+    will be built on other archs.  Other archs probably didn't even notice. 
+  * dcopserver freeze fix
+  * Several other http fixes along with hopefully proper fixes to
+    the url entry problems
+  * Applying patch for Simplified Chinese support
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 04 Mar 2001 09:09:00 -0700
+
+kdelibs (4:2.1.0-1) unstable; urgency=low
+ 
+   * Re-pulling from CVS instead of using the official tarballs.  The
+     official tarballs had problems which made it hard to handle patches
+   * Version changed to 2.1.0 instead of 2.1-final as we are post 2.1-final
+     and pre 2.1.1 which will be released in about a month.  This also allows
+     for the source upload.
+   * Modified ksgmltools configure.in.in to handle new location of sgml files
+   * Updating build-depends
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Tue, 27 Feb 2001 19:00:00 -0700
+
+kdelibs (4:2.1-final-1) unstable; urgency=low
+ 
+   * New upstream version
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 19 Feb 2001 02:31:00 -0700
+
+kdelibs (4:2.1-beta2-0128-2) unstable; urgency=low
+  
+   * Adding in cleanup for kde doc link (Closes: #85653)
+   * Moving from kdelibs3-dev to kdelibs-dev to conform to policy
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 18 Feb 2001 02:31:00 -0700
+
+kdelibs (4:2.1-beta2-0128-1) unstable; urgency=low
+ 
+   * Fixing artsdsp LD_PRELOAD problem (Closes: #83592)
+   * Adding in replaces/conflicts for *ancient* non-existant kdelibs-nossl
+     package. (Closes: #83607)
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 28 Jan 2001 01:30:00 -0700
+
+kdelibs (4:2.1-beta2-3) unstable; urgency=low
+ 
+   * Lots of little fixes
+   * Fixing -dev dependencies...(allowing for -alsa packages)
+   * fix shlibs for libkssl
+   * Adding in a couple more build-depends - autoconf, libtool, gettext
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 25 Jan 2001 02:16:00 -0700
+
+kdelibs (4:2.1-beta2-2) unstable; urgency=low
+ 
+   * Fixes problem with version number not showing
+   * Cleaning up depends for -dev packages
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Tue, 23 Jan 2001 12:36:00 -0700
+
+kdelibs (4:2.1-beta2-1) unstable; urgency=low
+ 
+   * New upstream beta
+   * Fixing shlibs
+   * Fixing confliction problem (Closes: #83083)
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 22 Jan 2001 06:00:00 -0700
+
+kdelibs (4:2.1-20010118-1) unstable; urgency=low
+ 
+   * more upstream bug fixes
+     fix JS and onmouseovers
+   * mimetype fixes (Closes: #76455)
+   * fix build order for libarts-alsa
+   * breaking out libkmid to avoid unnessary depends (Closes: #82901, #82924)
+   * libarts and libkmid are Recommends of kdelibs3 and not dependant now
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 18 Jan 2001 13:00:00 -0700
+
+kdelibs (4:2.1-20010115-1) unstable; urgency=low
+ 
+   * more upstream bug fixes
+   * a ton of documentation updates
+   * move away from suidregister
+   * Fix postinst ldconfig calls.  (Closes: #82246)
+   * Adding a libarts-alsa package
+   * Upstream fixes for libltdl includes (Closes: #82359)
+   * Fixes problem with bug report email address
+   * JavaScript/Java happy again...happy happy joy joy happy happy joy joy...
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 15 Jan 2001 01:00:00 -0700
+
+kdelibs (4:2.1-20010109-1) unstable; urgency=low
+ 
+   * more upstream bug fixes
+   * More dependency/build-depend fixes
+   * This was definatly built with the same dpkg that kdelibs-crypto was so
+     I'm assuming this just squeaked by dinstall...so just to be sure...
+   * Java should work again
+   * Fix kdesud security by
+     a) Not creating the socket under /tmp
+     b) Verifying afterwards that it was our own socket
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Tue, 09 Jan 2001 10:00:00 -0700
+
+kdelibs (4:2.1-20010106-1) unstable; urgency=low
+ 
+   * more upstream bug fixes
+   * Contains both the symlink/sniff attack fix for kdesu
+   * Moving conflicts for task-* packages to kdebase
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 06 Jan 2001 15:00:00 -0700
+
+kdelibs (4:2.1-20010101-1) unstable; urgency=low
+ 
+   * more upstream bug fixes
+   * Applying new i18n patch
+   * Adding in conflicts for old task- packages (Closes: #81003)
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 01 Jan 2001 03:30:00 -0700
+
+kdelibs (4:2.1-20001218-2) unstable; urgency=low
+ 
+  * more upstream bug fixes
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 20 Dec 2000 12:22:00 -0700
+
+kdelibs (4:2.1-20001218-1) unstable; urgency=low
+ 
+  * more upstream bug fixes
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 18 Dec 2000 22:44:00 -0700
+
+kdelibs (4:2.1-20001216-1) unstable; urgency=low
+ 
+  * more upstream bug fixes
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 16 Dec 2000 18:44:00 -0700
+
+kdelibs (4:2.1-20001214-1) unstable; urgency=low
+
+  * new kdelibs-doc rules thanks to Gordon Sadler w/ tweaks to allow building
+    when kdelibs is not already installed... (Closes: #79583)
+  * more upstream bug fixes
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 14 Dec 2000 13:35:00 -0700
+
+kdelibs (4:2.1-20001213-1) unstable; urgency=low
+ 
+  * New upstream beta
+  * Breaking out aRts pieces into their own packages so that others don't
+    need to install kdelibs in it's entirety to use arts.
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 13 Dec 2000 14:22:00 -0700
+
+kdelibs (4:2.0-final-5) unstable; urgency=low
+ 
+  * More upstream fixes
+  * More dependency work
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 12 Nov 2000 18:15:00 -0700
+
+kdelibs (4:2.0-final-4) unstable; urgency=low
+ 
+  * More upstream fixes
+  * Applying new i18n patch
+  * More dependency work
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 08 Nov 2000 17:30:00 -0700
+                                                                                
+kdelibs (4:2.0-final-3.1) unstable; urgency=low
+ 
+  * Applying i18n patch (Closes: #75830)
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 05 Nov 2000 23:00:00 -0700
+
+kdelibs (4:2.0-final-3) unstable; urgency=low
+ 
+  * More upstream fixes
+  * Fixing (again) suid bit on artswrapper
+  * Changing bug reporting to point to bugs.debian.org - hopefully I don't 
+    totally hose the bug reporting pieces...
+  * Building against X4 libs
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 04 Nov 2000 01:30:00 -0700
+                                                                                
+kdelibs (4:2.0-final-2.2) unstable; urgency=low
+ 
+  * Fixing dependency I hosed 
+  * Fixing suid bit on artswrapper
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 03 Nov 2000 00:30:00 -0700
+                                                                                
+kdelibs (4:2.0-final-2.1) unstable; urgency=low
+ 
+  * kdelibs-doc once again contains it's kdoc output
+  * kstyles upstream fixes
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 02 Nov 2000 21:46:00 -0700
+
+kdelibs (4:2.0-final-2) unstable; urgency=low
+
+  * more upstream fixes
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 02 Nov 2000 18:00:00 -0700
+
+kdelibs (4:2.0-final-0) unstable; urgency=low
+ 
+  * KDE 2.0
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 23 Oct 2000 00:00:00 -0700
+                                                                                
+kdelibs (4:2.0-20001016-0) unstable; urgency=low
+
+  * more upstream fixes
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 16 Oct 2000 15:00:00 -0700
+
+kdelibs (4:2.0-20001015-0) unstable; urgency=low
+ 
+  * more upstream fixes
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 15 Oct 2000 20:05:00 -0700
+                                                                                
+kdelibs (4:2.0-20001013-0) unstable; urgency=low
+ 
+  * more upstream fixes
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 13 Oct 2000 23:45:00 -0700
+                                                                                
+kdelibs (4:2.0-20001011-0) unstable; urgency=low
+ 
+  * more upstream fixes
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 11 Oct 2000 03:45:00 -0700
+                                                                                
+kdelibs (4:2.0-20001009-3) unstable; urgency=low
+ 
+  * more upstream fixes
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Tue, 10 Oct 2000 17:00:00 -0700
+                                                                                
+kdelibs (4:2.0-20001009-2) unstable; urgency=low
+ 
+  * more upstream fixes
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Tue, 10 Oct 2000 00:00:00 -0700
+                                                                                
+kdelibs (4:2.0-20001009-0) unstable; urgency=low
+ 
+  * KDE 2.0 RC2
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 09 Oct 2000 08:00:00 -0700
+                                                                                
+kdelibs (4:2.0-20001006-4) unstable; urgency=low
+ 
+  * Fixing startup crashes
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 08 Oct 2000 09:00:00 -0700
+                                                                                
+kdelibs (4:2.0-20001006-3) unstable; urgency=low
+ 
+  * More upstream fixes
+  * Fixing preinst applnk problem (Closes: #74195, #74218)
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 08 Oct 2000 03:00:00 -0700
+                                                                                
+kdelibs (4:2.0-20001006-2) unstable; urgency=low
+ 
+  * More crypto fixes
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 06 Oct 2000 15:30:00 -0700
+                                                                                
+kdelibs (4:2.0-20001006-0) unstable; urgency=low
+   
+  * More upstream fixes
+  * Getting rid of kdelibs-nossl and now providing a kdelibs-crypto package
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 06 Oct 2000 01:30:00 -0700
+                                                                                
+kdelibs-nossl (4:2.0-20001004-2) unstable; urgency=low
+ 
+  * More upstream fixes
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 05 Oct 2000 15:00:00 -0700
+                                                                                
+kdelibs-nossl (4:2.0-20001004-0) unstable; urgency=low
+ 
+  * More upstream fixes
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 04 Oct 2000 23:30:00 -0700
+                                                                                
+kdelibs (4:2.0-20001002-0) unstable; urgency=low
+ 
+  * KDE 2.0 RC1
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 02 Oct 2000 01:30:00 -0700
+                                                                                
+kdelibs (4:2.0-20000927-0) unstable; urgency=low
+ 
+  * More upstream fixes
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 27 Sep 2000 23:30:00 -0700
+
+kdelibs (4:2.0-20000925-0) unstable; urgency=low
+
+  * More upstream fixes
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 25 Sep 2000 15:30:00 -0700
+
+kdelibs (4:2.0-20000923-0) unstable; urgency=low
+ 
+  * More upstream fixes
+  * Fixing build issues
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 23 Sep 2000 23:00:00 -0700
+
+kdelibs (4:2.0-20000920-0) unstable; urgency=low
+ 
+  * More upstream fixes 
+  * Fixing build issues 
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 20 Sep 2000 23:00:00 -0700
+
+kdelibs (4:2.0-20000918-0) unstable; urgency=low
+ 
+  * More upstream fixes (-beta5)
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 18 Sep 2000 17:00:00 -0700
+                                                                                
+kdelibs (4:2.0-20000910-0) unstable; urgency=low
+
+  * More upstream fixes
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 10 Sep 2000 23:00:00 -0700
+
+kdelibs (4:2.0-20000909-0) unstable; urgency=low
+  
+  * More package cleanup
+  * More upstream fixes
+  * All lintian errors are bogus currently.  k*.so files are modules and
+    I can only assume that lintian just doesn't know how to handle them.
+    the extra license's are needed for KDE and specially setup for KDE
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 09 Sep 2000 02:00:00 -0700
+
+kdelibs (4:2.0-20000907-0.1) unstable; urgency=low
+ 
+  * Fixing issue with requiring -dev package
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 07 Sep 2000 21:00:00 -0700
+
+kdelibs-nossl (4:2.0-20000907-0) unstable; urgency=low
+
+  * More Upstream fixes
+  * Initial Debian upload
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 07 Sep 2000 01:00:00 -0700
+
+kdelibs (4:2.0-20000905-0.1) unstable; urgency=low
+
+  * More Upstream fixes
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Tue, 05 Sep 2000 18:30:00 -0700
+
+kdelibs (4:2.0-20000905-0) unstable; urgency=low
+
+  * More Upstream fixes
+  * Adding in a version number for libqt2.2 dependency
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Tue, 05 Sep 2000 00:30:00 -0700
+
+kdelibs (4:2.0-20000901-0) unstable; urgency=low
+
+  * More Upstream fixes
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 01 Sep 2000 00:02:00 -0700
+
+kdelibs (4:2.0-20000829-0) unstable; urgency=low
+ 
+  * More Upstream fixes
+  * Committing most package updates to CVS tree
+  * No GPL/QT conflictions
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Tue, 29 Aug 2000 21:15:00 -0700
+
+kdelibs (4:2.0-20000825-0) experimental; urgency=low
+ 
+  * Upstream fixes
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 25 Aug 2000 20:00:00 -0700
+                                                                                
+kdelibs (4:2.0-20000824-1.0) experimental; urgency=low
+ 
+  * KDE 2.0 beta 4
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 24 Aug 2000 18:30:00 -0700
+                                                                                
+kdelibs (4:2.0-20000821-1.0) experimental; urgency=low
+
+  * New upstream fixes
+  * Adding config link check into postinst script
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 21 Aug 2000 22:45:00 -0700
+
+kdelibs (4:2.0-20000820-1.0) experimental; urgency=low
+ 
+  * New upstream fixes
+  * No requirement for -dev package now
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 20 Aug 2000 07:45:00 -0700
+                                                                                
+kdelibs (4:2.0-20000816-1.0) experimental; urgency=low
+
+  * Major hacking to fix tons of issues
+  * New upstream beta version
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 16 Aug 2000 22:30:00 -0700
+
+kdelibs (4:2.0-20000814-1.0) experimental; urgency=low
+
+  * More CVS updates
+  * Tweaks to applnk items
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 14 Aug 2000 02:30:00 -0700
+
+kdelibs (4:2.0-20000810-1.0) experimental; urgency=low
+ 
+  * More CVS updates
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 10 Aug 2000 02:30:00 -0700
+
+kdelibs-cvs (4:2.0-20000517-1.0) experimental; urgency=low
+ 
+  * More CVS updates
+  * Turning on debugging
+  * Fixes to preinst script
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 17 May 2000 22:30:00 -0700
+
+kdelibs-cvs (4:2.0-20000512-1.2) experimental; urgency=low
+
+  * New upstream beta version
+  * Turning on debugging
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 12 May 2000 20:30:00 -0700
+
+kdelibs-cvs (4:2.0-20000403-1.0) experimental; urgency=low
+ 
+  * More upstream CVS updates
+  * Adding in depends for kde-qt-addon
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 03 Apr 2000 06:30:00 -0700
+
+kdelibs-cvs (4:2.0-20000306-1.1) experimental; urgency=low
+ 
+  * More upstream CVS updates
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 06 Mar 2000 22:45:00 -0700
+
+kdelibs-cvs (4:2.0-20000302-1.0) experimental; urgency=low
+ 
+  * More upstream CVS updates
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 02 Mar 2000 22:00:00 -0700
+                                                                
+kdelibs-cvs (4:2.0-20000229-1.0) experimental; urgency=low
+
+  * More upstream CVS updates
+  * Adding in build-depends
+  * Making changes to ust libqt2.1
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Tue, 29 Feb 2000 22:00:00 -0700
+
+kdelibs-cvs (4:2.0-20000221-1.1) experimental; urgency=low
+
+  * Rebuild with updated CVS files and new cleanups
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Tue, 22 Feb 2000 18:00:00 -0700
+
+kdelibs-cvs (4:2.0-20000221-1.0) experimental; urgency=low
+
+  * More upstream changes
+  * Adding in a shlibs.local file to clear up self-dependency
+  * Adding in missing man pages
+  * Seperating out doc files again
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 21 Feb 2000 22:00:00 -0700
+
+kdelibs-cvs (4:2.0-19991117-1.0) experimental; urgency=low
+
+  * More upstream changes
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 17 Nov 1999 05:30:00 -0400
+
+kdelibs-cvs (4:2.0-19991020-1.0) experimental; urgency=low
+
+  * More upstream changes
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 20 Oct 1999 06:30:00 -0400
+
+kdelibs-cvs (4:2.0-19991013-1.0) experimental; urgency=low
+
+  * More upstream changes
+  * More cleanup
+  * Removing conffiles for compile time creaction of it
+  * Adding in pre* scripts
+  * Commenting out dh_link piece to see if we still need it
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 13 Oct 1999 23:30:00 -0400
+
+kdelibs-cvs (4:2.0-19991001-0.1) experimental; urgency=low
+
+  * new upstream CVS version
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 01 Oct 1999 14:30:00 -0400
+
+kdelibs-cvs (4:2.0-19990921-0.1) experimental; urgency=low
+
+  * new upstream CVS version
+  * Fixing postinst script and one minor issue with rules to bring everything
+    up to Debian policy.
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Tue, 21 Sep 1999 11:15:00 -0400
+
+kdelibs-cvs (4:2.0-19990912-0.1) experimental; urgency=low
+
+  * new upstream CVS version
+  * Using 0.x numbers for my updates which is mainly to keep up with CVS
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 13 Sep 1999 14:30:39 -0400
+
+kdelibs-cvs (4:2.0-19990903-1.0) experimental; urgency=low
+
+  * new upstream version
+
+ -- Stephan Kulow <coolo@kde.org>  Fri,  3 Sep 1999 21:01:39 +0200
+
+kdelibs-cvs (4:2.0-19990823-1.0) experimental; urgency=low
+
+  * More CVS updates
+  * Adding in a process to the postinst to verify that /usr/doc/kde/HTML/default
+    is a link and not a directory
+  * Removing ldconfig from postrm
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 23 Aug 1999 07:30:28 -0400
+
+kdelibs-cvs (4:2.0-19990822-1.0) experimental; urgency=low
+
+  * Adding a link from /etc/kde2 to /usr/share/config until the proper
+    solution is made.
+  * More CVS updates
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 22 Aug 1999 05:00:28 -0400
+
+kdelibs-cvs (4:2.0-19990820-1.1) experimental; urgency=low
+
+  * New upstream CVS version
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 21 Aug 1999 00:30:28 -0400
+
+kdelibs-cvs (4:2.0-19990820-1) experimental; urgency=low
+
+  * New upstream CVS version
+  * Moving into /usr from /opt
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 20 Aug 1999 11:00:28 -0400
+
+kdelibs-cvs (4:2.0-19990720-1) experimental; urgency=low
+
+  * New upstream CVS version
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Tue, 20 Jul 1999 07:45:28 -0400
+
+kdelibs-cvs (4:2.0-19990626-2) experimental; urgency=low
+
+  * back to using the paths out of debianrules with some dependency trick
+    in rules. No more hardcoded paths there
+  * don't use kderc file, but add the paths that are known to be 
+    nonstandard in rules. And install into $kde_confdir/system.kdeglobals
+    /etc/kderc may be used for the noncvs version later. For now it asks
+    for trouble in my eyes :)
+  * some changes in debianrules to make it more flexible too
+  * don't compile with --enable-debug, but with --disable-debug - this does
+    more than removing -g, don't know who made this policy within debian
+  * use --enable-final as it makes thinks smaller, faster and better anyway ;)
+  
+ -- Stephan Kulow <coolo@kde.org>  Sat, 26 Jun 1999 14:33:05 +0200
+
+kdelibs-cvs (4:2.0-19990626-1) experimental; urgency=low
+
+  * New upstream CVS version
+  * Fixing the /etc/kderc file (had it there, just didn't install it)
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 26 Jun 1999 07:00:28 -0400
+
+kdelibs-cvs (4:2.0-19990624-1) experimental; urgency=low
+
+  * New upstream CVS version
+  * Adding in a /etc/kderc file
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 25 Jun 1999 23:50:28 -0400
+
+kdelibs-cvs (4:2.0-19990620-1) experimental; urgency=low
+
+  * New upstream CVS version
+  * Migrating to /etc/kde from /etc/kde2
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 20 Jun 1999 11:00:28 -0400
+
+kdelibs-cvs (4:2.0-19990601-1) experimental; urgency=low
+
+  * New upstream CVS version
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Tue, 01 Jun 1999 01:00:28 -0400
+
+kdelibs-cvs (4:2.0-19990524-1) experimental; urgency=low
+
+  * migrating back to / from /opt
+  * migrating in new build fixes from -stable bringing package more in
+    line with current Debian dist
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 24 May 1999 07:00:28 -0400
+
+kdelibs-cvs (4:2.0-19990314-1) experimental; urgency=low
+
+  * moving the -cvs from version to package name
+
+ -- Stephan Kulow <coolo@kde.org>  Sun, 14 Mar 1999 21:12:28 +0100
+
+kdelibs (4:2.0-19990312-cvs-3) experimental; urgency=low
+
+  * use INSTALL_DATA with -p
+
+ -- Stephan Kulow <coolo@kde.org>  Sat, 13 Mar 1999 23:13:09 +0100
+
+kdelibs (4:2.0-19990312-cvs-2) experimental; urgency=low
+
+  * use DESTDIR
+
+ -- Stephan Kulow <coolo@kde.org>  Sat, 13 Mar 1999 23:11:16 +0100
+
+kdelibs (4:2.0-19990312-cvs-1) experimental; urgency=low
+
+  * new upstream version with corba support libraries integrated
+
+ -- Stephan Kulow <coolo@kde.org>  Fri, 12 Mar 1999 23:31:27 +0100
+
+kdelibs (4:2.0-19990309-1) experimental; urgency=low
+
+  * new upstream version out of CVS (many translation updates and some
+    security fixes
+  * install it into /opt/kde2pre for now (unstripped)
+
+ -- Stephan Kulow <coolo@kde.org>  Sat,  6 Mar 1999 18:03:04 +0100
+
+kdelibs (4:1.1-19990217-1) unstable; urgency=low
+
+  * new upstream version
+
+ -- Stephan Kulow <coolo@kde.org>  Wed, 17 Feb 1999 19:09:42 +0100
+
+kdelibs (4:1.1-19990207-2) unstable; urgency=low
+
+  * fixed a bug with the jpeglib version
+
+ -- Stephan Kulow <coolo@kde.org>  Tue,  9 Feb 1999 09:31:40 +0100
+
+kdelibs (4:1.1-19990207-1) unstable; urgency=low
+
+  * new upstream version 1.1 and new epoche
+
+ -- Stephan Kulow <coolo@kde.org>  Sun,  7 Feb 1999 12:12:58 +0100
+
+kdelibs (2:980710-1.0-1) unstable; urgency=low
+
+  * new upstream version 1.0
+
+ -- Stephan Kulow <coolo@kde.org>  Sun, 12 Jul 1998 10:12:19 +0200
+
+kdelibs (2:980419-b4-1) unstable; urgency=low
+
+  * new upstream version Beta4
+
+ -- Stephan Kulow <coolo@kde.org>  Sun, 19 Apr 1998 13:58:13 +0200
+
+kdelibs (2:980312-4) frozen; urgency=low
+
+  * touch the .so.0 files to satisfy lintian
+  * moved all unnecessary files out of -dev
+  * moved the symbolic link default->en to kdelibs, where it belongs
+  * fixed the shlibs format
+  * new qt1g release (1.33)
+
+ -- Stephan Kulow <coolo@kde.org>  Tue, 31 Mar 1998 13:00:00 +0100   
+
+kdelibs (2:980312-3) frozen; urgency=low
+
+  * new g++ and libstdc++ release (egcs-2.90.26-1)
+
+ -- Stephan Kulow <coolo@kde.org>  Tue, 24 Mar 1998 14:45:16 +0100
+
+kdelibs (2:980312-2) unstable; urgency=low
+
+  * use debhelper now
+
+ -- Stephan Kulow <coolo@kde.org>  Sun, 15 Mar 1998 21:28:42 +0100
+
+kdelibs (2:980312-1) experimental; urgency=low
+
+  * changed the files file
+  * New upstream release
+
+ -- Stephan Kulow <coolo@kde.org>  Thu, 12 Mar 1998 22:15:37 +0100
+
+kdelibs (2:980310-3) experimental; urgency=low
+
+  * removed the preinst script
+  * use absolute paths instead of the one with 
+  * changed directory for libraries
+
+ -- Stephan Kulow <coolo@kde.org>  Wed, 11 Mar 1998 20:11:50 +0100
+
+kdelibs (2:980310-2) experimental; urgency=low
+
+  * removed the file correction part from kderules
+
+ -- Stephan Kulow <coolo@kde.org>  Mon,  9 Mar 1998 23:29:50 +0100
+
+kdelibs (2:980310-1) experimental; urgency=low
+
+  * New upstream release
+
+ -- Stephan Kulow <coolo@kde.org>  Mon,  9 Mar 1998 22:47:16 +0100
+
+kdelibs (980303-1) experimental; urgency=low
+
+  * New upstream release
+
+ -- Stephan Kulow <coolo@kde.org>  Wed, 4 Mar 1998 10:43:42 +0100
+
+kdelibs (980228-1) experimental; urgency=low
+
+  * added *.moc to the clean target
+  * New upstream release
+
+ -- Stephan Kulow <coolo@kde.org>  Sat, 28 Feb 1998 21:05:58 +0100
+
+kdelibs (980227-2) experimental; urgency=low
+
+  * removed the REENTRANT flag. KDE don't uses threds
+  * updated libmediatool
+
+ -- Stephan Kulow <coolo@kde.org>  Sat, 28 Feb 1998 01:22:56 +0100
+
+kdelibs (980227-1) experimental; urgency=low
+
+  * changed the name of libjpeg-dev
+  * renamed preint to preinst (typo while moving last time)
+  * added fields in control file (most taken from AJ's versions)
+  * New upstream release
+
+ -- Stephan Kulow <coolo@kde.org>  Fri, 27 Feb 1998 20:20:24 +0100
+
+kdelibs (980225-1) experimental; urgency=low
+
+  * New upstream release
+
+ -- Stephan Kulow <coolo@kde.org>  Wed, 25 Dec 1998 19:23:12 +0100
+
+kdelibs (980224-1) experimental; urgency=low
+
+  * New upstream release
+
+ -- Stephan Kulow <coolo@kde.org>  Wed, 25 Dec 1998 11:25:23 +0100
+
+kdelibs (1:Beta2-2.1) experimental; urgency=low
+
+  * New upstream release
+
+ -- Andreas Jellinghaus <aj@debian.org>  Fri,  5 Dec 1997 21:15:52 +0100
+
+kdelibs (1:Beta2-2) unstable; urgency=low
+
+  * removed virtual package names.
+
+ -- Andreas Jellinghaus <aj@debian.org>  Sun, 30 Nov 1997 16:59:27 +0100
+
+kdelibs (1:Beta2-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Andreas Jellinghaus <aj@debian.org>  Sun, 23 Nov 1997 14:04:20 +0100
+
+kdelibs (1:Beta1.2-2) unstable; urgency=low
+
+  * new compile cycle with bugfixes.
+
+ -- Andreas Jellinghaus <aj@debian.org>  Sun,  9 Nov 1997 19:43:46 +0100
+
+kdelibs (1:Beta1.2-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Andreas Jellinghaus <aj@debian.org>  Mon, 27 Oct 1997 11:16:24 +0100
+
+kdelibs (1:Beta1.1-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Andreas Jellinghaus <aj@debian.org>  Mon, 20 Oct 1997 12:33:52 +0200
+
+kdelibs (971019-1) unstable; urgency=low
+
+  * New upstream release
+  * Fixed all paths to match debian setup
+  * Fixed locale path
+
+ -- Andreas Jellinghaus <aj@debian.org>  Sun, 19 Oct 1997 12:05:32 +0200
+
+kdelibs (971013-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Andreas Jellinghaus <aj@debian.org>  Mon, 13 Oct 1997 08:18:16 +0200
+
+kdelibs (971011-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Andreas Jellinghaus <aj@debian.org>  Sun, 12 Oct 1997 12:08:40 +0200
+
+kdelibs (971009-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Andreas Jellinghaus <aj@debian.org>  Thu,  9 Oct 1997 10:47:00 +0200
+
+kdelibs (971008-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Andreas Jellinghaus <aj@debian.org>  Wed,  8 Oct 1997 10:03:09 +0200
+
+kdelibs (971006-2) unstable; urgency=low
+
+  * daily recompile of everything.
+
+ -- Andreas Jellinghaus <aj@debian.org>  Tue,  7 Oct 1997 10:36:58 +0200
+
+kdelibs (971006-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Andreas Jellinghaus <aj@debian.org>  Mon,  6 Oct 1997 09:19:17 +0200
+
+kdelibs (971005-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Andreas Jellinghaus <aj@debian.org>  Sun,  5 Oct 1997 17:27:13 +0200
+
+kdelibs (971003-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Andreas Jellinghaus <aj@debian.org>  Fri,  3 Oct 1997 08:16:14 +0200
+
+kdelibs (971002-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Andreas Jellinghaus <aj@debian.org>  Thu,  2 Oct 1997 08:47:49 +0200
+
+kdelibs (970930-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Andreas Jellinghaus <aj@debian.org>  Tue, 30 Sep 1997 11:39:38 +0200
+
+kdelibs (970929-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Andreas Jellinghaus <aj@debian.org>  Mon, 29 Sep 1997 09:36:11 +0200
+
+kdelibs (970925-2) unstable; urgency=low
+
+  * daily recompile of everything.
+
+ -- Andreas Jellinghaus <aj@debian.org>  Fri, 26 Sep 1997 08:42:24 +0200
+
+kdelibs (970925-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Andreas Jellinghaus <aj@debian.org>  Thu, 25 Sep 1997 08:04:45 +0200
+
+kdelibs (970924-2) unstable; urgency=low
+
+  * new use kderules.
+  * daily recompile of everything.
+
+ -- Andreas Jellinghaus <aj@debian.org>  Wed, 24 Sep 1997 10:21:17 +0200
+
+kdelibs (970924-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Andreas Jellinghaus <aj@debian.org>  Wed, 24 Sep 1997 08:28:48 +0200
+
+kdelibs (970923-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Andreas Jellinghaus <aj@debian.org>  Tue, 23 Sep 1997 08:36:52 +0200
+
+kdelibs (970922-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Andreas Jellinghaus <aj@debian.org>  Mon, 22 Sep 1997 09:48:41 +0200
+
+kdelibs (970921-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Andreas Jellinghaus <aj@debian.org>  Sun, 21 Sep 1997 13:45:48 +0200
+
+kdelibs (970920-1) unstable; urgency=low
+
+  * Initial Release.
+
+ -- Andreas Jellinghaus <aj@debian.org>  Sat, 20 Sep 1997 09:59:48 +0200
+
--- kdelibs-3.5.7.orig/debian/control
+++ kdelibs-3.5.7/debian/control
@@ -0,0 +1,129 @@
+Source: kdelibs
+Section: libs
+Priority: optional
+Maintainer: Jonathan Riddell <jriddell@ubuntu.com>
+XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
+Uploaders: Isaac Clerencia <isaac@debian.org>, Christopher Martin <chrsmrtn@debian.org>,
+ Adeodato Simó <dato@net.com.org.es>, Josh Metzler <joshdeb@metzlers.org>,
+ Modestas Vainius <geromanas@mailas.com>, Ana Beatriz Guerrero Lopez <ana@debian.org>
+Build-Depends: cdbs (>= 0.4.41ubuntu2), debhelper (>= 5.0.31), autotools-dev,
+ binutils (>= 2.14.90.0.7), docbook-to-man, gawk, gettext,
+ libart-2.0-dev (>= 2.3.17), libarts1-dev (>= 1.5.7), libacl1-dev,
+ libattr1-dev, libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
+ libaspell-dev, hspell, libbz2-dev, libcupsys2-dev,
+ libidn11-dev, libjasper-1.701-dev, libkrb5-dev, libldap2-dev,
+ liblualib50-dev, libopenexr-dev (>= 1.2.2-4.1), libpcre3-dev,
+ libqt3-mt-dev (>= 3:3.3.7), libsasl2-dev, libssl-dev,
+ libtiff4-dev (>= 3.7.3-1), libavahi-client-dev (>= 0.4),
+ libavahi-qt3-dev (>= 0.4), libxml2-dev, libxml2-utils, libxslt1-dev,
+ sharutils, texinfo,
+ gettext-kde, kdesdk-scripts, lsb-release, base-files, sudo
+Build-Depends-Indep: doxygen, qt3-doc, graphviz, gsfonts-x11
+Standards-Version: 3.7.2
+
+Package: kdelibs
+Section: libs
+Architecture: all
+Depends: kdelibs4c2a (>= ${Source-Version}),
+ kdelibs-data (>= ${Source-Version})
+Description: core libraries from the official KDE release
+ KDE (the K Desktop Environment) is a powerful Open Source graphical
+ desktop environment for Unix workstations. It combines ease of use,
+ contemporary functionality, and outstanding graphical design with the
+ technological superiority of the Unix operating system.
+ .
+ This metapackage includes the core KDE libraries, binaries, and data,
+ needed by virtually all KDE applications. It does not include
+ development files.
+
+Package: kdelibs-data
+Section: libs
+Architecture: all
+Depends: hicolor-icon-theme
+Conflicts: kdelibs4
+Replaces: kdeartwork-style (<< 4:3.4.0), konq-plugins (<< 4:3.4.0),
+ ksvg (<< 4:3.4.0), kpackage (<< 4:3.4.2), kicker (<< 4:3.5-rc1),
+ kttsd (<< 4:3.5-rc1), kdevelop3-data (<< 4:3.3.0), libdjvulibre1,
+ libdjvulibre15 (<< 3.5.16-2), krita (= 1:1.4.90.1-1), digikam (<< 0.8.1-3),
+ kaffeine (<< 0.8.1-3)
+Description: core shared data for all KDE applications
+ This package contains all the architecture independent data files
+ commonly used by KDE applications. You need these data files to run
+ KDE applications.
+ .
+ This package is part of KDE, and a component of the KDE libraries module.
+ See the 'kde' and 'kdelibs' packages for more information.
+
+Package: kdelibs4c2a
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}, kdelibs-data (>> ${KDE-Version3}),
+ kdelibs-data (<< ${KDE-Next-Version3}), perl, xbase-clients, launchpad-integration, sudo
+Recommends: perl-suid
+Suggests: fam
+Conflicts: kdelibs4, kdelibs4c2, kdelibs-bin
+Replaces: kdelibs4, kdelibs4c2, kdeartwork-style (<< 4:3.4.0),
+ kcontrol (<< 4:3.4.0), kdelibs-bin (<< 4:3.5.3-1)
+Provides: kdelibs-bin
+Description: core libraries and binaries for all KDE applications
+ This package contains all the shared libraries and common core binaries
+ used by all KDE applications. You need these libraries and binaries to
+ run KDE applications.
+ .
+ Several scripts included in kdebase-bin, related to the handling of SMB
+ and NFS shares, require the perl-suid package to work properly.
+ .
+ If you are working with remote filesystems, you may find that fam
+ is helpful in tracking filesystem updates. If you work only with local
+ filesystems, then avoid fam (and gamin), since if they are not installed,
+ KDE will use its own more efficient inotify (or else dnotify) system
+ directly.
+ .
+ This package is part of KDE, and a component of the KDE libraries module.
+ See the 'kde' and 'kdelibs' packages for more information.
+
+Package: kdelibs4-dev
+Section: libdevel
+Architecture: any
+Depends: kdelibs4c2a (= ${Source-Version}), libart-2.0-dev (>= 2.3.17),
+ libarts1-dev (>= 1.5.0), ${libasound2-dev}, libacl1-dev, libattr1-dev,
+ libaspell-dev, hspell, libbz2-dev, libcupsys2-dev, libfam-dev | libgamin-dev,
+ libidn11-dev, libjasper-dev (>= 1.900.1), libkrb5-dev,
+ libopenexr-dev (>= 1.2.2-3), libpcre3-dev, liblualib50-dev,
+ libqt3-mt-dev (>= 3:3.3.5), libsasl2-dev, libssl-dev,
+ libtiff4-dev (>= 3.7.3-1), libxml2-dev, libxml2-utils, libxslt1-dev,
+ libavahi-client-dev (>= 0.4), libavahi-qt3-dev (>= 0.4),
+ gettext-kde, kdesdk-scripts
+Provides: kdelibs-dev
+Replaces: kdebase-dev (<< 4:3.4.0)
+Description: development files for the KDE core libraries
+ This package contains all the headers and other related files needed
+ to compile KDE applications, or develop applications which use the
+ core KDE libraries.
+ .
+ This package is part of KDE, and a component of the KDE libraries module.
+ See the 'kde' and 'kdelibs' packages for more information.
+
+Package: kdelibs4-doc
+Section: doc
+Architecture: all
+Provides: kdelibs-doc
+Description: developer documentation for the KDE core libraries
+ This package contains documentation for the core KDE libraries, of
+ use more for developers creating applications which use the core
+ KDE libraries, than regular users.
+ .
+ This package is part of KDE, and a component of the KDE libraries module.
+ See the 'kde' and 'kdelibs' packages for more information.
+
+Package: kdelibs-dbg
+Section: libdevel
+Architecture: any
+Priority: extra
+Conflicts: kdelibs4-dbg, kdelibs4c2-dbg, kdelibs4c2a-dbg
+Replaces: kdelibs4-dbg, kdelibs4c2-dbg, kdelibs4c2a-dbg
+Depends: kdelibs4c2a (= ${Source-Version}), qt-x11-free-dbg, libc6-dbg [amd64]
+Description: debugging symbols for kdelibs
+ This package contains the debugging symbols associated with kdelibs.
+ They will automatically be used by gdb for debugging kdelibs-related
+ issues.
--- kdelibs-3.5.7.orig/debian/kdelibs4c2a.manpages
+++ kdelibs-3.5.7/debian/kdelibs4c2a.manpages
@@ -0,0 +1,51 @@
+debian/man/out/artsmessage.1
+debian/man/out/cupsdconf.1
+debian/man/out/dcop.1
+debian/man/out/dcopfind.1
+debian/man/out/dcopserver.1
+debian/man/out/dcopstart.1
+debian/man/out/kaddprinterwizard.1
+debian/man/out/kbuildsycoca.1
+debian/man/out/kconf_update.1
+debian/man/out/kcookiejar.1
+debian/man/out/kde-config.1
+debian/man/out/kded.1
+debian/man/out/kdontchangethehostname.1
+debian/man/out/kfile.1
+debian/man/out/kinstalltheme.1
+debian/man/out/kio_http_cache_cleaner.1
+debian/man/out/kio_uiserver.1
+debian/man/out/kmailservice.1
+debian/man/out/ksendbugmail.1
+debian/man/out/ktelnetservice.1
+debian/man/out/lnusertemp.1
+debian/man/out/meinproc.1
+./debian/man/kdeinit.1
+./debian/man/cupsdoprint.1
+./debian/man/dcopclient.1
+./debian/man/dcopobject.1
+./debian/man/dcopquit.1
+./debian/man/dcopref.1
+./debian/man/dcopserver_shutdown.1
+./debian/man/fileshareset.1
+./debian/man/imagetops.1
+./debian/man/kab2kabc.1
+./debian/man/kcmshell.1
+./debian/man/kconfig_compiler.1
+./debian/man/kdeinit_shutdown.1
+./debian/man/kde-menu.1
+./debian/man/kdesu_stub.1
+./debian/man/kgrantpty.1
+./debian/man/khotnewstuff.1
+./debian/man/kioexec.1
+./debian/man/klauncher.1
+./debian/man/kpac_dhcp_helper.1
+./debian/man/kshell.1
+./debian/man/kstartupconfig.1
+./debian/man/ksvgtopng.1
+./debian/man/ktradertest.1
+./debian/man/kunittestmodrunner.1
+./debian/man/make_driver_db_cups.1
+./debian/man/make_driver_db_lpr.1
+./debian/man/makekdewidgets.1
+./debian/man/preparetips.1
--- kdelibs-3.5.7.orig/debian/kdelibs4-dev.install
+++ kdelibs-3.5.7/debian/kdelibs4-dev.install
@@ -0,0 +1,789 @@
+debian/tmp/usr/bin/checkXML
+debian/tmp/usr/bin/dcopidl
+debian/tmp/usr/bin/dcopidl2cpp
+debian/tmp/usr/bin/dcopidlng
+debian/tmp/usr/include/kde/arts/artskde.h
+debian/tmp/usr/include/kde/arts/kartsdispatcher.h
+debian/tmp/usr/include/kde/arts/kartsfloatwatch.h
+debian/tmp/usr/include/kde/arts/kartsserver.h
+debian/tmp/usr/include/kde/arts/kaudiomanagerplay.h
+debian/tmp/usr/include/kde/arts/kaudioplaystream.h
+debian/tmp/usr/include/kde/arts/kaudiorecordstream.h
+debian/tmp/usr/include/kde/arts/kplayobjectfactory.h
+debian/tmp/usr/include/kde/arts/kplayobject.h
+debian/tmp/usr/include/kde/arts/kvideowidget.h
+debian/tmp/usr/include/kde/dcopclient.h
+debian/tmp/usr/include/kde/dcopobject.h
+debian/tmp/usr/include/kde/dcopref.h
+debian/tmp/usr/include/kde/dcopstub.h
+debian/tmp/usr/include/kde/dcoptypes.h
+debian/tmp/usr/include/kde/dnssd/domainbrowser.h
+debian/tmp/usr/include/kde/dnssd/publicservice.h
+debian/tmp/usr/include/kde/dnssd/query.h
+debian/tmp/usr/include/kde/dnssd/remoteservice.h
+debian/tmp/usr/include/kde/dnssd/servicebase.h
+debian/tmp/usr/include/kde/dnssd/servicebrowser.h
+debian/tmp/usr/include/kde/dnssd/settings.h
+debian/tmp/usr/include/kde/dom/css_rule.h
+debian/tmp/usr/include/kde/dom/css_stylesheet.h
+debian/tmp/usr/include/kde/dom/css_value.h
+debian/tmp/usr/include/kde/dom/dom2_events.h
+debian/tmp/usr/include/kde/dom/dom2_range.h
+debian/tmp/usr/include/kde/dom/dom2_traversal.h
+debian/tmp/usr/include/kde/dom/dom2_views.h
+debian/tmp/usr/include/kde/dom/dom_core.h
+debian/tmp/usr/include/kde/dom/dom_doc.h
+debian/tmp/usr/include/kde/dom/dom_element.h
+debian/tmp/usr/include/kde/dom/dom_exception.h
+debian/tmp/usr/include/kde/dom/dom_html.h
+debian/tmp/usr/include/kde/dom/dom_misc.h
+debian/tmp/usr/include/kde/dom/dom_node.h
+debian/tmp/usr/include/kde/dom/dom_string.h
+debian/tmp/usr/include/kde/dom/dom_text.h
+debian/tmp/usr/include/kde/dom/dom_xml.h
+debian/tmp/usr/include/kde/dom/html_base.h
+debian/tmp/usr/include/kde/dom/html_block.h
+debian/tmp/usr/include/kde/dom/html_document.h
+debian/tmp/usr/include/kde/dom/html_element.h
+debian/tmp/usr/include/kde/dom/html_form.h
+debian/tmp/usr/include/kde/dom/html_head.h
+debian/tmp/usr/include/kde/dom/html_image.h
+debian/tmp/usr/include/kde/dom/html_inline.h
+debian/tmp/usr/include/kde/dom/html_list.h
+debian/tmp/usr/include/kde/dom/html_misc.h
+debian/tmp/usr/include/kde/dom/html_object.h
+debian/tmp/usr/include/kde/dom/html_table.h
+debian/tmp/usr/include/kde/fixx11h.h
+debian/tmp/usr/include/kde/kabc/addressbook.h
+debian/tmp/usr/include/kde/kabc/addresseedialog.h
+debian/tmp/usr/include/kde/kabc/addressee.h
+debian/tmp/usr/include/kde/kabc/addresseelist.h
+debian/tmp/usr/include/kde/kabc/address.h
+debian/tmp/usr/include/kde/kabc/addresslineedit.h
+debian/tmp/usr/include/kde/kabc/agent.h
+debian/tmp/usr/include/kde/kabc/distributionlistdialog.h
+debian/tmp/usr/include/kde/kabc/distributionlisteditor.h
+debian/tmp/usr/include/kde/kabc/distributionlist.h
+debian/tmp/usr/include/kde/kabc/errorhandler.h
+debian/tmp/usr/include/kde/kabc/field.h
+debian/tmp/usr/include/kde/kabc/formatfactory.h
+debian/tmp/usr/include/kde/kabc/format.h
+debian/tmp/usr/include/kde/kabc/formatplugin.h
+debian/tmp/usr/include/kde/kabc/geo.h
+debian/tmp/usr/include/kde/kabc/key.h
+debian/tmp/usr/include/kde/kabc/ldapclient.h
+debian/tmp/usr/include/kde/kabc/ldapconfigwidget.h
+debian/tmp/usr/include/kde/kabc/ldapurl.h
+debian/tmp/usr/include/kde/kabc/ldifconverter.h
+debian/tmp/usr/include/kde/kabc/ldif.h
+debian/tmp/usr/include/kde/kabc/lock.h
+debian/tmp/usr/include/kde/kabc/locknull.h
+debian/tmp/usr/include/kde/kabc/phonenumber.h
+debian/tmp/usr/include/kde/kabc/picture.h
+debian/tmp/usr/include/kde/kabc/plugin.h
+debian/tmp/usr/include/kde/kabc/resourcedir.h
+debian/tmp/usr/include/kde/kabc/resourcefile.h
+debian/tmp/usr/include/kde/kabc/resource.h
+debian/tmp/usr/include/kde/kabc/resourceldapkio.h
+debian/tmp/usr/include/kde/kabc/resourceselectdialog.h
+debian/tmp/usr/include/kde/kabc/secrecy.h
+debian/tmp/usr/include/kde/kabc/sortmode.h
+debian/tmp/usr/include/kde/kabc/sound.h
+debian/tmp/usr/include/kde/kabc/stdaddressbook.h
+debian/tmp/usr/include/kde/kabc/timezone.h
+debian/tmp/usr/include/kde/kabc/vcardconverter.h
+debian/tmp/usr/include/kde/kabc/vcardformat.h
+debian/tmp/usr/include/kde/kabc/vcardformatplugin.h
+debian/tmp/usr/include/kde/kabc/vcard.h
+debian/tmp/usr/include/kde/kabc/vcardline.h
+debian/tmp/usr/include/kde/kabc/vcardparser.h
+debian/tmp/usr/include/kde/kaboutapplication.h
+debian/tmp/usr/include/kde/kaboutdata.h
+debian/tmp/usr/include/kde/kaboutdialog.h
+debian/tmp/usr/include/kde/kaboutkde.h
+debian/tmp/usr/include/kde/kaccelgen.h
+debian/tmp/usr/include/kde/kaccel.h
+debian/tmp/usr/include/kde/kaccelmanager.h
+debian/tmp/usr/include/kde/kacl.h
+debian/tmp/usr/include/kde/kactionclasses.h
+debian/tmp/usr/include/kde/kactioncollection.h
+debian/tmp/usr/include/kde/kaction.h
+debian/tmp/usr/include/kde/kactionselector.h
+debian/tmp/usr/include/kde/kactionshortcutlist.h
+debian/tmp/usr/include/kde/kactivelabel.h
+debian/tmp/usr/include/kde/kallocator.h
+debian/tmp/usr/include/kde/kanimwidget.h
+debian/tmp/usr/include/kde/kapp.h
+debian/tmp/usr/include/kde/kapplication.h
+debian/tmp/usr/include/kde/karchive.h
+debian/tmp/usr/include/kde/kar.h
+debian/tmp/usr/include/kde/karrowbutton.h
+debian/tmp/usr/include/kde/kasyncio.h
+debian/tmp/usr/include/kde/kate/document.h
+debian/tmp/usr/include/kde/kate/view.h
+debian/tmp/usr/include/kde/kaudioplayer.h
+debian/tmp/usr/include/kde/kauthicon.h
+debian/tmp/usr/include/kde/kautomount.h
+debian/tmp/usr/include/kde/kbookmarkbar.h
+debian/tmp/usr/include/kde/kbookmarkdombuilder.h
+debian/tmp/usr/include/kde/kbookmarkdrag.h
+debian/tmp/usr/include/kde/kbookmarkexporter.h
+debian/tmp/usr/include/kde/kbookmark.h
+debian/tmp/usr/include/kde/kbookmarkimporter_crash.h
+debian/tmp/usr/include/kde/kbookmarkimporter.h
+debian/tmp/usr/include/kde/kbookmarkimporter_ie.h
+debian/tmp/usr/include/kde/kbookmarkimporter_kde1.h
+debian/tmp/usr/include/kde/kbookmarkimporter_ns.h
+debian/tmp/usr/include/kde/kbookmarkimporter_opera.h
+debian/tmp/usr/include/kde/kbookmarkmanager.h
+debian/tmp/usr/include/kde/kbookmarkmenu.h
+debian/tmp/usr/include/kde/kbookmarknotifier.h
+debian/tmp/usr/include/kde/kbufferedio.h
+debian/tmp/usr/include/kde/kbufferedsocket.h
+debian/tmp/usr/include/kde/kbugreport.h
+debian/tmp/usr/include/kde/kbuttonbox.h
+debian/tmp/usr/include/kde/kcalendarsystemfactory.h
+debian/tmp/usr/include/kde/kcalendarsystem.h
+debian/tmp/usr/include/kde/kcatalogue.h
+debian/tmp/usr/include/kde/kcharselect.h
+debian/tmp/usr/include/kde/kcharsets.h
+debian/tmp/usr/include/kde/kclientsocketbase.h
+debian/tmp/usr/include/kde/kclipboard.h
+debian/tmp/usr/include/kde/kcmdlineargs.h
+debian/tmp/usr/include/kde/kcmenumngr.h
+debian/tmp/usr/include/kde/kcmodulecontainer.h
+debian/tmp/usr/include/kde/kcmodule.h
+debian/tmp/usr/include/kde/kcmoduleinfo.h
+debian/tmp/usr/include/kde/kcmoduleloader.h
+debian/tmp/usr/include/kde/kcmoduleproxy.h
+debian/tmp/usr/include/kde/kcmultidialog.h
+debian/tmp/usr/include/kde/kcolorbtn.h
+debian/tmp/usr/include/kde/kcolorbutton.h
+debian/tmp/usr/include/kde/kcolorcombo.h
+debian/tmp/usr/include/kde/kcolordialog.h
+debian/tmp/usr/include/kde/kcolordlg.h
+debian/tmp/usr/include/kde/kcolordrag.h
+debian/tmp/usr/include/kde/kcombiview.h
+debian/tmp/usr/include/kde/kcombobox.h
+debian/tmp/usr/include/kde/kcommand.h
+debian/tmp/usr/include/kde/kcompletionbox.h
+debian/tmp/usr/include/kde/kcompletion.h
+debian/tmp/usr/include/kde/kconfigbackend.h
+debian/tmp/usr/include/kde/kconfigbase.h
+debian/tmp/usr/include/kde/kconfigdata.h
+debian/tmp/usr/include/kde/kconfigdialog.h
+debian/tmp/usr/include/kde/kconfigdialogmanager.h
+debian/tmp/usr/include/kde/kconfig.h
+debian/tmp/usr/include/kde/kconfigskeleton.h
+debian/tmp/usr/include/kde/kcpuinfo.h
+debian/tmp/usr/include/kde/kcrash.h
+debian/tmp/usr/include/kde/kcursor.h
+debian/tmp/usr/include/kde/kcustommenueditor.h
+debian/tmp/usr/include/kde/kdatagramsocket.h
+debian/tmp/usr/include/kde/kdatastream.h
+debian/tmp/usr/include/kde/kdatatool.h
+debian/tmp/usr/include/kde/kdatepicker.h
+debian/tmp/usr/include/kde/kdatepik.h
+debian/tmp/usr/include/kde/kdatetbl.h
+debian/tmp/usr/include/kde/kdatetimewidget.h
+debian/tmp/usr/include/kde/kdatewidget.h
+debian/tmp/usr/include/kde/kdcopactionproxy.h
+debian/tmp/usr/include/kde/kdcoppropertyproxy.h
+debian/tmp/usr/include/kde/kdcopservicestarter.h
+debian/tmp/usr/include/kde/kdebugclasses.h
+debian/tmp/usr/include/kde/kdebug.h
+debian/tmp/usr/include/kde/kdedmodule.h
+debian/tmp/usr/include/kde/kde_file.h
+debian/tmp/usr/include/kde/kdelibs_export.h
+debian/tmp/usr/include/kde/kdemacros.h
+debian/tmp/usr/include/kde/kde.pot
+debian/tmp/usr/include/kde/kdeprint/driver.h
+debian/tmp/usr/include/kde/kdeprint/kiconselectaction.h
+debian/tmp/usr/include/kde/kdeprint/kmjob.h
+debian/tmp/usr/include/kde/kdeprint/kmjobmanager.h
+debian/tmp/usr/include/kde/kdeprint/kmjobviewer.h
+debian/tmp/usr/include/kde/kdeprint/kmmainview.h
+debian/tmp/usr/include/kde/kdeprint/kmmanager.h
+debian/tmp/usr/include/kde/kdeprint/kmobject.h
+debian/tmp/usr/include/kde/kdeprint/kmprinter.h
+debian/tmp/usr/include/kde/kdeprint/kmprinterpage.h
+debian/tmp/usr/include/kde/kdeprint/kmtimer.h
+debian/tmp/usr/include/kde/kdeprint/kpreloadobject.h
+debian/tmp/usr/include/kde/kdeprint/kprintdialog.h
+debian/tmp/usr/include/kde/kdeprint/kprintdialogpage.h
+debian/tmp/usr/include/kde/kdeprint/lpr/lprhandler.h
+debian/tmp/usr/include/kde/kdeprint/lpr/lprsettings.h
+debian/tmp/usr/include/kde/kdeprint/lpr/printcapentry.h
+debian/tmp/usr/include/kde/kdesktopfile.h
+debian/tmp/usr/include/kde/kdesu/client.h
+debian/tmp/usr/include/kde/kdesu/defaults.h
+debian/tmp/usr/include/kde/kdesu/kcookie.h
+debian/tmp/usr/include/kde/kdesu/kdesu_pty.h
+debian/tmp/usr/include/kde/kdesu/process.h
+debian/tmp/usr/include/kde/kdesu/pty.h
+debian/tmp/usr/include/kde/kdesu/ssh.h
+debian/tmp/usr/include/kde/kdesu/stub.h
+debian/tmp/usr/include/kde/kdesu/su.h
+debian/tmp/usr/include/kde/kde_terminal_interface.h
+debian/tmp/usr/include/kde/kdeversion.h
+debian/tmp/usr/include/kde/kdialogbase.h
+debian/tmp/usr/include/kde/kdialog.h
+debian/tmp/usr/include/kde/kdirlister.h
+debian/tmp/usr/include/kde/kdirnotify.h
+debian/tmp/usr/include/kde/kdirnotify_stub.h
+debian/tmp/usr/include/kde/kdiroperator.h
+debian/tmp/usr/include/kde/kdirselectdialog.h
+debian/tmp/usr/include/kde/kdirsize.h
+debian/tmp/usr/include/kde/kdirwatch.h
+debian/tmp/usr/include/kde/kdiskfreesp.h
+debian/tmp/usr/include/kde/kdockwidget.h
+debian/tmp/usr/include/kde/kdockwindow.h
+debian/tmp/usr/include/kde/kdrawutil.h
+debian/tmp/usr/include/kde/kdualcolorbtn.h
+debian/tmp/usr/include/kde/kdualcolorbutton.h
+debian/tmp/usr/include/kde/keditcl.h
+debian/tmp/usr/include/kde/keditlistbox.h
+debian/tmp/usr/include/kde/kedittoolbar.h
+debian/tmp/usr/include/kde/kemailsettings.h
+debian/tmp/usr/include/kde/kencodingfiledialog.h
+debian/tmp/usr/include/kde/kextendedsocket.h
+debian/tmp/usr/include/kde/kextsock.h
+debian/tmp/usr/include/kde/kfiledetailview.h
+debian/tmp/usr/include/kde/kfiledialog.h
+debian/tmp/usr/include/kde/kfilefiltercombo.h
+debian/tmp/usr/include/kde/kfilefilter.h
+debian/tmp/usr/include/kde/kfile.h
+debian/tmp/usr/include/kde/kfileiconview.h
+debian/tmp/usr/include/kde/kfileitem.h
+debian/tmp/usr/include/kde/kfilemetainfo.h
+debian/tmp/usr/include/kde/kfilepreview.h
+debian/tmp/usr/include/kde/kfilesharedlg.h
+debian/tmp/usr/include/kde/kfileshare.h
+debian/tmp/usr/include/kde/kfiletreebranch.h
+debian/tmp/usr/include/kde/kfiletreeview.h
+debian/tmp/usr/include/kde/kfiletreeviewitem.h
+debian/tmp/usr/include/kde/kfileview.h
+debian/tmp/usr/include/kde/kfilterbase.h
+debian/tmp/usr/include/kde/kfilterdev.h
+debian/tmp/usr/include/kde/kfinddialog.h
+debian/tmp/usr/include/kde/kfind.h
+debian/tmp/usr/include/kde/kfontcombo.h
+debian/tmp/usr/include/kde/kfontdialog.h
+debian/tmp/usr/include/kde/kfontrequester.h
+debian/tmp/usr/include/kde/kgenericfactory.h
+debian/tmp/usr/include/kde/kgenericfactory.tcc
+debian/tmp/usr/include/kde/kglobalaccel.h
+debian/tmp/usr/include/kde/kglobal.h
+debian/tmp/usr/include/kde/kglobalsettings.h
+debian/tmp/usr/include/kde/kguiitem.h
+debian/tmp/usr/include/kde/khelpmenu.h
+debian/tmp/usr/include/kde/khexedit/byteseditinterface.h
+debian/tmp/usr/include/kde/khexedit/charcolumninterface.h
+debian/tmp/usr/include/kde/khexedit/clipboardinterface.h
+debian/tmp/usr/include/kde/khexedit/valuecolumninterface.h
+debian/tmp/usr/include/kde/khexedit/zoominterface.h
+debian/tmp/usr/include/kde/khtmldefaults.h
+debian/tmp/usr/include/kde/khtml_events.h
+debian/tmp/usr/include/kde/khtml_part.h
+debian/tmp/usr/include/kde/khtml_settings.h
+debian/tmp/usr/include/kde/khtmlview.h
+debian/tmp/usr/include/kde/khttpproxysocketdevice.h
+debian/tmp/usr/include/kde/kicondialog.h
+debian/tmp/usr/include/kde/kiconeffect.h
+debian/tmp/usr/include/kde/kiconloader.h
+debian/tmp/usr/include/kde/kicontheme.h
+debian/tmp/usr/include/kde/kiconview.h
+debian/tmp/usr/include/kde/kiconviewsearchline.h
+debian/tmp/usr/include/kde/kidna.h
+debian/tmp/usr/include/kde/kimageeffect.h
+debian/tmp/usr/include/kde/kimagefilepreview.h
+debian/tmp/usr/include/kde/kimageio.h
+debian/tmp/usr/include/kde/kimiface.h
+debian/tmp/usr/include/kde/kimproxy.h
+debian/tmp/usr/include/kde/kimproxyiface.h
+debian/tmp/usr/include/kde/kinputdialog.h
+debian/tmp/usr/include/kde/kinstance.h
+debian/tmp/usr/include/kde/kio/authinfo.h
+debian/tmp/usr/include/kde/kiobuffer.h
+debian/tmp/usr/include/kde/kio/chmodjob.h
+debian/tmp/usr/include/kde/kio/connection.h
+debian/tmp/usr/include/kde/kio/davjob.h
+debian/tmp/usr/include/kde/kio/defaultprogress.h
+debian/tmp/usr/include/kde/kio/file.h
+debian/tmp/usr/include/kde/kio/forwardingslavebase.h
+debian/tmp/usr/include/kde/kio/global.h
+debian/tmp/usr/include/kde/kio/http.h
+debian/tmp/usr/include/kde/kio/http_slave_defaults.h
+debian/tmp/usr/include/kde/kio/ioslave_defaults.h
+debian/tmp/usr/include/kde/kio/jobclasses.h
+debian/tmp/usr/include/kde/kio/job.h
+debian/tmp/usr/include/kde/kio/kdesasl.h
+debian/tmp/usr/include/kde/kio/kmdbase.h
+debian/tmp/usr/include/kde/kio/kmdcodec.h
+debian/tmp/usr/include/kde/kio/kntlm.h
+debian/tmp/usr/include/kde/kio/metainfojob.h
+debian/tmp/usr/include/kde/kio/netaccess.h
+debian/tmp/usr/include/kde/kio/observer.h
+debian/tmp/usr/include/kde/kio/passdlg.h
+debian/tmp/usr/include/kde/kio/paste.h
+debian/tmp/usr/include/kde/kio/previewjob.h
+debian/tmp/usr/include/kde/kio/progressbase.h
+debian/tmp/usr/include/kde/kio/renamedlg.h
+debian/tmp/usr/include/kde/kio/scheduler.h
+debian/tmp/usr/include/kde/kio/sessiondata.h
+debian/tmp/usr/include/kde/kio/skipdlg.h
+debian/tmp/usr/include/kde/kio/slavebase.h
+debian/tmp/usr/include/kde/kio/slaveconfig.h
+debian/tmp/usr/include/kde/kio/slave.h
+debian/tmp/usr/include/kde/kio/slaveinterface.h
+debian/tmp/usr/include/kde/kio/statusbarprogress.h
+debian/tmp/usr/include/kde/kio/tcpslavebase.h
+debian/tmp/usr/include/kde/kio/thumbcreator.h
+debian/tmp/usr/include/kde/kio/uiserver.h
+debian/tmp/usr/include/kde/kio/uiserver_stub.h
+debian/tmp/usr/include/kde/kipc.h
+debian/tmp/usr/include/kde/kjanuswidget.h
+debian/tmp/usr/include/kde/kjs/completion.h
+debian/tmp/usr/include/kde/kjs/function.h
+debian/tmp/usr/include/kde/kjs/global.h
+debian/tmp/usr/include/kde/kjs/identifier.h
+debian/tmp/usr/include/kde/kjs/interpreter.h
+debian/tmp/usr/include/kde/kjs/list.h
+debian/tmp/usr/include/kde/kjs/lookup.h
+debian/tmp/usr/include/kde/kjs/object.h
+debian/tmp/usr/include/kde/kjs/operations.h
+debian/tmp/usr/include/kde/kjs/property_map.h
+debian/tmp/usr/include/kde/kjs/reference.h
+debian/tmp/usr/include/kde/kjs/reference_list.h
+debian/tmp/usr/include/kde/kjs/scope_chain.h
+debian/tmp/usr/include/kde/kjs/simple_number.h
+debian/tmp/usr/include/kde/kjs/types.h
+debian/tmp/usr/include/kde/kjs/ustring.h
+debian/tmp/usr/include/kde/kjs/value.h
+debian/tmp/usr/include/kde/kkeybutton.h
+debian/tmp/usr/include/kde/kkeydialog.h
+debian/tmp/usr/include/kde/kkeynative.h
+debian/tmp/usr/include/kde/klanguagebutton.h
+debian/tmp/usr/include/kde/klargefile.h
+debian/tmp/usr/include/kde/kled.h
+debian/tmp/usr/include/kde/klibloader.h
+debian/tmp/usr/include/kde/klineeditdlg.h
+debian/tmp/usr/include/kde/klineedit.h
+debian/tmp/usr/include/kde/klistbox.h
+debian/tmp/usr/include/kde/klistview.h
+debian/tmp/usr/include/kde/klistviewsearchline.h
+debian/tmp/usr/include/kde/klocale.h
+debian/tmp/usr/include/kde/klockfile.h
+debian/tmp/usr/include/kde/kmacroexpander.h
+debian/tmp/usr/include/kde/kmainwindow.h
+debian/tmp/usr/include/kde/kmainwindowiface.h
+debian/tmp/usr/include/kde/kmanagerselection.h
+debian/tmp/usr/include/kde/kmdcodec.h
+debian/tmp/usr/include/kde/kmdichildarea.h
+debian/tmp/usr/include/kde/kmdichildfrmcaption.h
+debian/tmp/usr/include/kde/kmdichildfrm.h
+debian/tmp/usr/include/kde/kmdichildview.h
+debian/tmp/usr/include/kde/kmdidefines.h
+debian/tmp/usr/include/kde/kmdi/global.h
+debian/tmp/usr/include/kde/kmdiiterator.h
+debian/tmp/usr/include/kde/kmdilistiterator.h
+debian/tmp/usr/include/kde/kmdimainfrm.h
+debian/tmp/usr/include/kde/kmdi/mainwindow.h
+debian/tmp/usr/include/kde/kmdinulliterator.h
+debian/tmp/usr/include/kde/kmdi/tabwidget.h
+debian/tmp/usr/include/kde/kmditaskbar.h
+debian/tmp/usr/include/kde/kmdi/toolviewaccessor.h
+debian/tmp/usr/include/kde/kmditoolviewaccessor.h
+debian/tmp/usr/include/kde/kmediaplayer/playerdcopobject.h
+debian/tmp/usr/include/kde/kmediaplayer/player.h
+debian/tmp/usr/include/kde/kmediaplayer/view.h
+debian/tmp/usr/include/kde/kmenubar.h
+debian/tmp/usr/include/kde/kmessagebox.h
+debian/tmp/usr/include/kde/kmimemagic.h
+debian/tmp/usr/include/kde/kmimesourcefactory.h
+debian/tmp/usr/include/kde/kmimetypechooser.h
+debian/tmp/usr/include/kde/kmimetype.h
+debian/tmp/usr/include/kde/kmimetyperesolver.h
+debian/tmp/usr/include/kde/kmountpoint.h
+debian/tmp/usr/include/kde/kmulticastsocketdevice.h
+debian/tmp/usr/include/kde/kmulticastsocket.h
+debian/tmp/usr/include/kde/kmultipledrag.h
+debian/tmp/usr/include/kde/kmultitabbar.h
+debian/tmp/usr/include/kde/knetworkinterface.h
+debian/tmp/usr/include/kde/knewstuff/downloaddialog.h
+debian/tmp/usr/include/kde/knewstuff/engine.h
+debian/tmp/usr/include/kde/knewstuff/entry.h
+debian/tmp/usr/include/kde/knewstuff/knewstuffbutton.h
+debian/tmp/usr/include/kde/knewstuff/knewstuffgeneric.h
+debian/tmp/usr/include/kde/knewstuff/knewstuff.h
+debian/tmp/usr/include/kde/knewstuff/knewstuffsecure.h
+debian/tmp/usr/include/kde/knewstuff/providerdialog.h
+debian/tmp/usr/include/kde/knewstuff/provider.h
+debian/tmp/usr/include/kde/knewstuff/uploaddialog.h
+debian/tmp/usr/include/kde/knfsshare.h
+debian/tmp/usr/include/kde/knotifyclient.h
+debian/tmp/usr/include/kde/knotifydialog.h
+debian/tmp/usr/include/kde/knotifywidgetbase.h
+debian/tmp/usr/include/kde/knuminput.h
+debian/tmp/usr/include/kde/knumvalidator.h
+debian/tmp/usr/include/kde/kopenssl.h
+debian/tmp/usr/include/kde/kopenwith.h
+debian/tmp/usr/include/kde/kpalette.h
+debian/tmp/usr/include/kde/kpanelapplet.h
+debian/tmp/usr/include/kde/kpanelappmenu.h
+debian/tmp/usr/include/kde/kpanelextension.h
+debian/tmp/usr/include/kde/kpanelmenu.h
+debian/tmp/usr/include/kde/kparts/browserextension.h
+debian/tmp/usr/include/kde/kparts/browserinterface.h
+debian/tmp/usr/include/kde/kparts/browserrun.h
+debian/tmp/usr/include/kde/kparts/componentfactory.h
+debian/tmp/usr/include/kde/kparts/dockmainwindow.h
+debian/tmp/usr/include/kde/kparts/event.h
+debian/tmp/usr/include/kde/kparts/factory.h
+debian/tmp/usr/include/kde/kparts/genericfactory.h
+debian/tmp/usr/include/kde/kparts/historyprovider.h
+debian/tmp/usr/include/kde/kparts/mainwindow.h
+debian/tmp/usr/include/kde/kparts/part.h
+debian/tmp/usr/include/kde/kparts/partmanager.h
+debian/tmp/usr/include/kde/kparts/plugin.h
+debian/tmp/usr/include/kde/kparts/statusbarextension.h
+debian/tmp/usr/include/kde/kpassdlg.h
+debian/tmp/usr/include/kde/kpassivepopup.h
+debian/tmp/usr/include/kde/kpixmapeffect.h
+debian/tmp/usr/include/kde/kpixmap.h
+debian/tmp/usr/include/kde/kpixmapio.h
+debian/tmp/usr/include/kde/kpixmapprovider.h
+debian/tmp/usr/include/kde/kpixmapregionselectordialog.h
+debian/tmp/usr/include/kde/kpixmapregionselectorwidget.h
+debian/tmp/usr/include/kde/kpixmapsplitter.h
+debian/tmp/usr/include/kde/kplugininfo.h
+debian/tmp/usr/include/kde/kpluginselector.h
+debian/tmp/usr/include/kde/kpopupmenu.h
+debian/tmp/usr/include/kde/kpreviewwidgetbase.h
+debian/tmp/usr/include/kde/kprintaction.h
+debian/tmp/usr/include/kde/kprinter.h
+debian/tmp/usr/include/kde/kprocctrl.h
+debian/tmp/usr/include/kde/kprocess.h
+debian/tmp/usr/include/kde/kprocio.h
+debian/tmp/usr/include/kde/kprogress.h
+debian/tmp/usr/include/kde/kpropertiesdialog.h
+debian/tmp/usr/include/kde/kpropsdlg.h
+debian/tmp/usr/include/kde/kprotocolinfo.h
+debian/tmp/usr/include/kde/kprotocolmanager.h
+debian/tmp/usr/include/kde/kpty.h
+debian/tmp/usr/include/kde/kpushbutton.h
+debian/tmp/usr/include/kde/krandomsequence.h
+debian/tmp/usr/include/kde/krecentdocument.h
+debian/tmp/usr/include/kde/kregexpeditorinterface.h
+debian/tmp/usr/include/kde/kregexp.h
+debian/tmp/usr/include/kde/kremoteencoding.h
+debian/tmp/usr/include/kde/kreplacedialog.h
+debian/tmp/usr/include/kde/kreplace.h
+debian/tmp/usr/include/kde/kresolver.h
+debian/tmp/usr/include/kde/kresources/configdialog.h
+debian/tmp/usr/include/kde/kresources/configpage.h
+debian/tmp/usr/include/kde/kresources/configwidget.h
+debian/tmp/usr/include/kde/kresources/factory.h
+debian/tmp/usr/include/kde/kresources/manager.h
+debian/tmp/usr/include/kde/kresources/manageriface.h
+debian/tmp/usr/include/kde/kresources/managerimpl.h
+debian/tmp/usr/include/kde/kresources/resource.h
+debian/tmp/usr/include/kde/kresources/selectdialog.h
+debian/tmp/usr/include/kde/krestrictedline.h
+debian/tmp/usr/include/kde/kreverseresolver.h
+debian/tmp/usr/include/kde/krfcdate.h
+debian/tmp/usr/include/kde/krootpixmap.h
+debian/tmp/usr/include/kde/krootprop.h
+debian/tmp/usr/include/kde/kruler.h
+debian/tmp/usr/include/kde/krun.h
+debian/tmp/usr/include/kde/ksambashare.h
+debian/tmp/usr/include/kde/ksavefile.h
+debian/tmp/usr/include/kde/kscan.h
+debian/tmp/usr/include/kde/ksconfig.h
+debian/tmp/usr/include/kde/kscreensaver.h
+debian/tmp/usr/include/kde/kscreensaver_vroot.h
+debian/tmp/usr/include/kde/kscrollview.h
+debian/tmp/usr/include/kde/kselect.h
+debian/tmp/usr/include/kde/kseparator.h
+debian/tmp/usr/include/kde/kserversocket.h
+debian/tmp/usr/include/kde/kservicegroup.h
+debian/tmp/usr/include/kde/kservice.h
+debian/tmp/usr/include/kde/kservicetype.h
+debian/tmp/usr/include/kde/ksettings/componentsdialog.h
+debian/tmp/usr/include/kde/ksettings/dialog.h
+debian/tmp/usr/include/kde/ksettings/dispatcher.h
+debian/tmp/usr/include/kde/ksettings/pluginpage.h
+debian/tmp/usr/include/kde/ksharedpixmap.h
+debian/tmp/usr/include/kde/ksharedptr.h
+debian/tmp/usr/include/kde/kshellcompletion.h
+debian/tmp/usr/include/kde/kshell.h
+debian/tmp/usr/include/kde/kshortcutdialog.h
+debian/tmp/usr/include/kde/kshortcut.h
+debian/tmp/usr/include/kde/kshortcutlist.h
+debian/tmp/usr/include/kde/kshred.h
+debian/tmp/usr/include/kde/ksimpleconfig.h
+debian/tmp/usr/include/kde/ksmimecrypto.h
+debian/tmp/usr/include/kde/ksockaddr.h
+debian/tmp/usr/include/kde/ksocketaddress.h
+debian/tmp/usr/include/kde/ksocketbase.h
+debian/tmp/usr/include/kde/ksocketdevice.h
+debian/tmp/usr/include/kde/ksock.h
+debian/tmp/usr/include/kde/ksocks.h
+debian/tmp/usr/include/kde/ksockssocketdevice.h
+debian/tmp/usr/include/kde/ksortablevaluelist.h
+debian/tmp/usr/include/kde/kspeech.h
+debian/tmp/usr/include/kde/kspeechsink.h
+debian/tmp/usr/include/kde/kspell2/backgroundchecker.h
+debian/tmp/usr/include/kde/kspell2/broker.h
+debian/tmp/usr/include/kde/kspell2/configdialog.h
+debian/tmp/usr/include/kde/kspell2/configwidget.h
+debian/tmp/usr/include/kde/kspell2/defaultdictionary.h
+debian/tmp/usr/include/kde/kspell2/dialog.h
+debian/tmp/usr/include/kde/kspell2/dictionary.h
+debian/tmp/usr/include/kde/kspell2/filter.h
+debian/tmp/usr/include/kde/kspell2/highlighter.h
+debian/tmp/usr/include/kde/kspell2/settings.h
+debian/tmp/usr/include/kde/kspelldlg.h
+debian/tmp/usr/include/kde/kspell.h
+debian/tmp/usr/include/kde/ksplashscreen.h
+debian/tmp/usr/include/kde/ksqueezedtextlabel.h
+debian/tmp/usr/include/kde/ksslall.h
+debian/tmp/usr/include/kde/ksslcertchain.h
+debian/tmp/usr/include/kde/ksslcertdlg.h
+debian/tmp/usr/include/kde/ksslcertificatecache.h
+debian/tmp/usr/include/kde/ksslcertificatefactory.h
+debian/tmp/usr/include/kde/ksslcertificate.h
+debian/tmp/usr/include/kde/ksslcertificatehome.h
+debian/tmp/usr/include/kde/ksslconfig.h
+debian/tmp/usr/include/kde/ksslconnectioninfo.h
+debian/tmp/usr/include/kde/kssl.h
+debian/tmp/usr/include/kde/ksslinfodlg.h
+debian/tmp/usr/include/kde/ksslkeygen.h
+debian/tmp/usr/include/kde/ksslpeerinfo.h
+debian/tmp/usr/include/kde/ksslpemcallback.h
+debian/tmp/usr/include/kde/ksslpkcs12.h
+debian/tmp/usr/include/kde/ksslpkcs7.h
+debian/tmp/usr/include/kde/ksslsession.h
+debian/tmp/usr/include/kde/ksslsettings.h
+debian/tmp/usr/include/kde/ksslsigners.h
+debian/tmp/usr/include/kde/ksslutils.h
+debian/tmp/usr/include/kde/ksslx509map.h
+debian/tmp/usr/include/kde/ksslx509v3.h
+debian/tmp/usr/include/kde/kstandarddirs.h
+debian/tmp/usr/include/kde/kstartupinfo.h
+debian/tmp/usr/include/kde/kstaticdeleter.h
+debian/tmp/usr/include/kde/kstatusbar.h
+debian/tmp/usr/include/kde/kstdaccel.h
+debian/tmp/usr/include/kde/kstdaction.h
+debian/tmp/usr/include/kde/kstddirs.h
+debian/tmp/usr/include/kde/kstdguiitem.h
+debian/tmp/usr/include/kde/kstreamsocket.h
+debian/tmp/usr/include/kde/kstringhandler.h
+debian/tmp/usr/include/kde/kstringvalidator.h
+debian/tmp/usr/include/kde/kstyle.h
+debian/tmp/usr/include/kde/ksvgiconengine.h
+debian/tmp/usr/include/kde/ksycocaentry.h
+debian/tmp/usr/include/kde/ksycoca.h
+debian/tmp/usr/include/kde/ksycocatype.h
+debian/tmp/usr/include/kde/ksyntaxhighlighter.h
+debian/tmp/usr/include/kde/ksystemtray.h
+debian/tmp/usr/include/kde/ktabbar.h
+debian/tmp/usr/include/kde/ktabctl.h
+debian/tmp/usr/include/kde/ktabwidget.h
+debian/tmp/usr/include/kde/ktar.h
+debian/tmp/usr/include/kde/ktempdir.h
+debian/tmp/usr/include/kde/ktempfile.h
+debian/tmp/usr/include/kde/ktextbrowser.h
+debian/tmp/usr/include/kde/ktextedit.h
+debian/tmp/usr/include/kde/ktexteditor/blockselectioninterface.h
+debian/tmp/usr/include/kde/ktexteditor/clipboardinterface.h
+debian/tmp/usr/include/kde/ktexteditor/codecompletioninterface.h
+debian/tmp/usr/include/kde/ktexteditor/configinterfaceextension.h
+debian/tmp/usr/include/kde/ktexteditor/configinterface.h
+debian/tmp/usr/include/kde/ktexteditor/cursorinterface.h
+debian/tmp/usr/include/kde/ktexteditor/document.h
+debian/tmp/usr/include/kde/ktexteditor/documentinfo.h
+debian/tmp/usr/include/kde/ktexteditor/dynwordwrapinterface.h
+debian/tmp/usr/include/kde/ktexteditor/editinterfaceext.h
+debian/tmp/usr/include/kde/ktexteditor/editinterface.h
+debian/tmp/usr/include/kde/ktexteditor/editorchooser.h
+debian/tmp/usr/include/kde/ktexteditor/editor.h
+debian/tmp/usr/include/kde/ktexteditor/encodinginterface.h
+debian/tmp/usr/include/kde/ktexteditor/highlightinginterface.h
+debian/tmp/usr/include/kde/ktexteditor/markinterfaceextension.h
+debian/tmp/usr/include/kde/ktexteditor/markinterface.h
+debian/tmp/usr/include/kde/ktexteditor/plugin.h
+debian/tmp/usr/include/kde/ktexteditor/popupmenuinterface.h
+debian/tmp/usr/include/kde/ktexteditor/printinterface.h
+debian/tmp/usr/include/kde/ktexteditor/searchinterface.h
+debian/tmp/usr/include/kde/ktexteditor/selectionextdcopinterface.h
+debian/tmp/usr/include/kde/ktexteditor/selectioninterfaceext.h
+debian/tmp/usr/include/kde/ktexteditor/selectioninterface.h
+debian/tmp/usr/include/kde/ktexteditor/sessionconfiginterface.h
+debian/tmp/usr/include/kde/ktexteditor/templateinterface.h
+debian/tmp/usr/include/kde/ktexteditor/texthintinterface.h
+debian/tmp/usr/include/kde/ktexteditor/undointerface.h
+debian/tmp/usr/include/kde/ktexteditor/variableinterface.h
+debian/tmp/usr/include/kde/ktexteditor/viewcursorinterface.h
+debian/tmp/usr/include/kde/ktexteditor/view.h
+debian/tmp/usr/include/kde/ktexteditor/viewstatusmsginterface.h
+debian/tmp/usr/include/kde/ktexteditor/wordwrapinterface.h
+debian/tmp/usr/include/kde/ktimewidget.h
+debian/tmp/usr/include/kde/ktimezones.h
+debian/tmp/usr/include/kde/ktimezonewidget.h
+debian/tmp/usr/include/kde/ktip.h
+debian/tmp/usr/include/kde/ktoolbarbutton.h
+debian/tmp/usr/include/kde/ktoolbar.h
+debian/tmp/usr/include/kde/ktoolbarlabelaction.h
+debian/tmp/usr/include/kde/ktoolbarradiogroup.h
+debian/tmp/usr/include/kde/ktrader.h
+debian/tmp/usr/include/kde/ktypelist.h
+debian/tmp/usr/include/kde/kuniqueapp.h
+debian/tmp/usr/include/kde/kuniqueapplication.h
+debian/tmp/usr/include/kde/kunittest/module.h
+debian/tmp/usr/include/kde/kunittest/runner.h
+debian/tmp/usr/include/kde/kunittest/tester.h
+debian/tmp/usr/include/kde/kunload.h
+debian/tmp/usr/include/kde/kurifilter.h
+debian/tmp/usr/include/kde/kurlbar.h
+debian/tmp/usr/include/kde/kurlcombobox.h
+debian/tmp/usr/include/kde/kurlcompletion.h
+debian/tmp/usr/include/kde/kurldrag.h
+debian/tmp/usr/include/kde/kurl.h
+debian/tmp/usr/include/kde/kurllabel.h
+debian/tmp/usr/include/kde/kurlpixmapprovider.h
+debian/tmp/usr/include/kde/kurlrequesterdlg.h
+debian/tmp/usr/include/kde/kurlrequester.h
+debian/tmp/usr/include/kde/kuser.h
+debian/tmp/usr/include/kde/kuserprofile.h
+debian/tmp/usr/include/kde/kvmallocator.h
+debian/tmp/usr/include/kde/kwallet.h
+debian/tmp/usr/include/kde/kwallettypes.h
+debian/tmp/usr/include/kde/kwindowinfo.h
+debian/tmp/usr/include/kde/kwindowlistmenu.h
+debian/tmp/usr/include/kde/kwin.h
+debian/tmp/usr/include/kde/kwinmodule.h
+debian/tmp/usr/include/kde/kwizard.h
+debian/tmp/usr/include/kde/kwordwrap.h
+debian/tmp/usr/include/kde/kxerrorhandler.h
+debian/tmp/usr/include/kde/kxmessages.h
+debian/tmp/usr/include/kde/kxmlguibuilder.h
+debian/tmp/usr/include/kde/kxmlguiclient.h
+debian/tmp/usr/include/kde/kxmlguifactory.h
+debian/tmp/usr/include/kde/kxmlgui.h
+debian/tmp/usr/include/kde/kzip.h
+debian/tmp/usr/include/kde/libkmid/alsaout.h
+debian/tmp/usr/include/kde/libkmid/dattypes.h
+debian/tmp/usr/include/kde/libkmid/deviceman.h
+debian/tmp/usr/include/kde/libkmid/fmout.h
+debian/tmp/usr/include/kde/libkmid/gusout.h
+debian/tmp/usr/include/kde/libkmid/libkmid.h
+debian/tmp/usr/include/kde/libkmid/midfile.h
+debian/tmp/usr/include/kde/libkmid/midimapper.h
+debian/tmp/usr/include/kde/libkmid/midiout.h
+debian/tmp/usr/include/kde/libkmid/midispec.h
+debian/tmp/usr/include/kde/libkmid/midistat.h
+debian/tmp/usr/include/kde/libkmid/mt32togm.h
+debian/tmp/usr/include/kde/libkmid/notearray.h
+debian/tmp/usr/include/kde/libkmid/player.h
+debian/tmp/usr/include/kde/libkmid/synthout.h
+debian/tmp/usr/include/kde/libkmid/track.h
+debian/tmp/usr/include/kde/libkmid/voiceman.h
+debian/tmp/usr/include/kde/netwm_def.h
+debian/tmp/usr/include/kde/netwm.h
+debian/tmp/usr/include/kde/qxembed.h
+debian/tmp/usr/include/kde/renamedlgplugin.h
+debian/tmp/usr/include/kde/scriptclientinterface.h
+debian/tmp/usr/include/kde/scriptinterface.h
+debian/tmp/usr/include/kde/scriptmanager.h
+debian/tmp/usr/lib/libartskde.la
+debian/tmp/usr/lib/libartskde.so
+debian/tmp/usr/lib/libDCOP.la
+debian/tmp/usr/lib/libDCOP.so
+debian/tmp/usr/lib/libkabc_dir.la
+debian/tmp/usr/lib/libkabc_dir.so
+debian/tmp/usr/lib/libkabc_file.la
+debian/tmp/usr/lib/libkabc_file.so
+debian/tmp/usr/lib/libkabc.la
+debian/tmp/usr/lib/libkabc_ldapkio.la
+debian/tmp/usr/lib/libkabc_ldapkio.so
+debian/tmp/usr/lib/libkabc.so
+debian/tmp/usr/lib/libkatepartinterfaces.la
+debian/tmp/usr/lib/libkatepartinterfaces.so
+debian/tmp/usr/lib/libkdecore.la
+debian/tmp/usr/lib/libkdecore.so
+debian/tmp/usr/lib/libkdefakes.la
+debian/tmp/usr/lib/libkdefakes_nonpic.a
+debian/tmp/usr/lib/libkdefakes_pic.a
+debian/tmp/usr/lib/libkdefakes.so
+debian/tmp/usr/lib/libkdefx.la
+debian/tmp/usr/lib/libkdefx.so
+debian/tmp/usr/lib/libkdeinit_cupsdconf.la
+debian/tmp/usr/lib/libkdeinit_dcopserver.la
+debian/tmp/usr/lib/libkdeinit_kaddprinterwizard.la
+debian/tmp/usr/lib/libkdeinit_kbuildsycoca.la
+debian/tmp/usr/lib/libkdeinit_kcmshell.la
+debian/tmp/usr/lib/libkdeinit_kconf_update.la
+debian/tmp/usr/lib/libkdeinit_kcookiejar.la
+debian/tmp/usr/lib/libkdeinit_kded.la
+debian/tmp/usr/lib/libkdeinit_kio_http_cache_cleaner.la
+debian/tmp/usr/lib/libkdeinit_kio_uiserver.la
+debian/tmp/usr/lib/libkdeinit_klauncher.la
+debian/tmp/usr/lib/libkdeprint.la
+debian/tmp/usr/lib/libkdeprint_management.la
+debian/tmp/usr/lib/libkdeprint_management.so
+debian/tmp/usr/lib/libkdeprint.so
+debian/tmp/usr/lib/libkdesasl.la
+debian/tmp/usr/lib/libkdesasl.so
+debian/tmp/usr/lib/libkdesu.la
+debian/tmp/usr/lib/libkdesu.so
+debian/tmp/usr/lib/libkdeui.la
+debian/tmp/usr/lib/libkdeui.so
+debian/tmp/usr/lib/libkdnssd.la
+debian/tmp/usr/lib/libkdnssd.so
+debian/tmp/usr/lib/libkhtml.la
+debian/tmp/usr/lib/libkhtml.so
+debian/tmp/usr/lib/libkimproxy.la
+debian/tmp/usr/lib/libkimproxy.so
+debian/tmp/usr/lib/libkio.la
+debian/tmp/usr/lib/libkio.so
+debian/tmp/usr/lib/libkjava.la
+debian/tmp/usr/lib/libkjava.so
+debian/tmp/usr/lib/libkjs.la
+debian/tmp/usr/lib/libkjs.so
+debian/tmp/usr/lib/libkmdi2.la
+debian/tmp/usr/lib/libkmdi2.so
+debian/tmp/usr/lib/libkmdi.la
+debian/tmp/usr/lib/libkmdi.so
+debian/tmp/usr/lib/libkmediaplayer.la
+debian/tmp/usr/lib/libkmediaplayer.so
+debian/tmp/usr/lib/libkmid.la
+debian/tmp/usr/lib/libkmid.so
+debian/tmp/usr/lib/libknewstuff.la
+debian/tmp/usr/lib/libknewstuff.so
+debian/tmp/usr/lib/libkntlm.la
+debian/tmp/usr/lib/libkntlm.so
+debian/tmp/usr/lib/libkparts.la
+debian/tmp/usr/lib/libkparts.so
+debian/tmp/usr/lib/libkresources.la
+debian/tmp/usr/lib/libkresources.so
+debian/tmp/usr/lib/libkscreensaver.la
+debian/tmp/usr/lib/libkscreensaver.so
+debian/tmp/usr/lib/libkscript.la
+debian/tmp/usr/lib/libkscript.so
+debian/tmp/usr/lib/libkspell2.la
+debian/tmp/usr/lib/libkspell2.so
+debian/tmp/usr/lib/libkspell.la
+debian/tmp/usr/lib/libkspell.so
+debian/tmp/usr/lib/libktexteditor.la
+debian/tmp/usr/lib/libktexteditor.so
+debian/tmp/usr/lib/libkunittest.la
+debian/tmp/usr/lib/libkunittest.so
+debian/tmp/usr/lib/libkutils.la
+debian/tmp/usr/lib/libkutils.so
+debian/tmp/usr/lib/libkwalletbackend.la
+debian/tmp/usr/lib/libkwalletbackend.so
+debian/tmp/usr/lib/libkwalletclient.la
+debian/tmp/usr/lib/libkwalletclient.so
+debian/tmp/usr/lib/libvcard.la
+debian/tmp/usr/lib/libvcard.so
--- kdelibs-3.5.7.orig/debian/compat
+++ kdelibs-3.5.7/debian/compat
@@ -0,0 +1 @@
+5
--- kdelibs-3.5.7.orig/debian/prune-nonfree
+++ kdelibs-3.5.7/debian/prune-nonfree
@@ -0,0 +1,15 @@
+#!/bin/sh -e
+
+# Removes non-free files from the source tree. Must be done before
+# creating the orig.tar.gz.
+
+TOPLEVEL="$1"
+
+if [ "$TOPLEVEL" = "" ]; then
+	echo "Please provide the toplevel directory as the argument."
+	exit 1
+else
+	rm -f $TOPLEVEL/kioslave/http/kcookiejar/rfc*
+fi
+
+exit 0
--- kdelibs-3.5.7.orig/debian/kdelibs4c2a.lintian
+++ kdelibs-3.5.7/debian/kdelibs4c2a.lintian
@@ -0,0 +1,15 @@
+kdelibs4c2a binary: no-shlibs-control-file usr/lib/libkdeinit_kaddprinterwizard.so
+kdelibs4c2a binary: no-shlibs-control-file usr/lib/libkdeinit_cupsdconf.so
+kdelibs4c2a binary: no-shlibs-control-file usr/lib/libkdeinit_dcopserver.so
+kdelibs4c2a binary: no-shlibs-control-file usr/lib/libkdeinit_kcmshell.so
+kdelibs4c2a binary: no-shlibs-control-file usr/lib/libkdeinit_kio_http_cache_cleaner.so
+kdelibs4c2a binary: no-shlibs-control-file usr/lib/libkdeinit_kbuildsycoca.so
+kdelibs4c2a binary: no-shlibs-control-file usr/lib/libkdeinit_kded.so
+kdelibs4c2a binary: no-shlibs-control-file usr/lib/libkdeinit_kcookiejar.so
+kdelibs4c2a binary: no-shlibs-control-file usr/lib/libkdeinit_klauncher.so
+kdelibs4c2a binary: no-shlibs-control-file usr/lib/libkdeinit_kconf_update.so
+kdelibs4c2a binary: no-shlibs-control-file usr/lib/libkdeinit_kio_uiserver.so
+kdelibs4c2a binary: setuid-binary usr/bin/fileshareset 4755 root/root
+kdelibs4c2a binary: setuid-binary usr/bin/kgrantpty 4755 root/root
+kdelibs4c2a binary: setuid-binary usr/bin/kpac_dhcp_helper 4755 root/root
+kdelibs4c2a binary: setuid-binary usr/bin/start_kdeinit 4755 root/root
--- kdelibs-3.5.7.orig/debian/kdelibs.presubj
+++ kdelibs-3.5.7/debian/kdelibs.presubj
@@ -0,0 +1,16 @@
+Reporting bugs for KDE packages
+-------------------------------
+
+KDE does not support beeing upgraded while running. If you do so, you may
+encounter weird bugs (empty menus or configuration dialogs e.g.), and even
+crashes.
+
+If you recently upgraded kdelibs and/or kdebase packages, please consider:
+ * exiting your current KDE session.
+ * ensuring that no more KDE process is still running, especially the processes
+   named (list beeing non-limitative): dcopserver, kded, ksmserver...
+ * log in KDE again.
+
+Then try to reproduce you bug. If it's not reproducible, then please do not
+report it.
+
--- kdelibs-3.5.7.orig/debian/not-installed.list
+++ kdelibs-3.5.7/debian/not-installed.list
@@ -0,0 +1,11 @@
+The following files are not installed in any binary package.
+This is deliberate.
+
+/etc/xdg/menus/applications.menu
+ - we install a renamed copy of this file (kde-applications.menu)
+   to avoid conflicts with GNOME. See debian/rules.
+
+/usr/share/icons/hicolor/index.theme
+ - This is shipped as part of the hicolor-icon-theme package,
+   which GNOME and KDE depend on. Shipping this ourselves would
+   result in file conflicts.
--- kdelibs-3.5.7.orig/debian/rules
+++ kdelibs-3.5.7/debian/rules
@@ -0,0 +1,80 @@
+#! /usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include debian/cdbs/debian-qt-kde.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/utils.mk
+
+DEB_KDE_APIDOX := yes
+
+version=Debian Package $(DEB_VERSION)
+DEB_OPT_FLAG += -DDEBIAN_VERSION=$(DEB_VERSION)
+
+DEB_CONFIGURE_EXTRA_FLAGS := \
+	--enable-mitshm --with-alsa --enable-dnotify --enable-inotify \
+	--with-lua-includes=/usr/include/lua50 \
+	--with-distribution="Kubuntu (`lsb_release --codename --short`) $(DEB_VERSION)" --with-sudo-kdesu-backend
+
+DEB_FIXPERMS_EXCLUDE := \
+	usr/bin/fileshareset	\
+	usr/bin/kgrantpty	\
+	usr/bin/kpac_dhcp_helper \
+	usr/bin/start_kdeinit
+
+DEB_DH_STRIP_ARGS  := --dbg-package=kdelibs-dbg
+
+PACKAGES_WITH_LIBS := kdelibs4c2a
+
+DEB_DH_MAKESHLIBS_ARGS_kdelibs4c2a := -V'kdelibs4c2a (>= 4:3.5.7-1)'
+
+#shlibs_ver = 4:3.5.0-1
+#$(foreach p,$(PACKAGES_WITH_LIBS),$(eval DEB_DH_MAKESHLIBS_ARGS_$(p) := -V'$(p) (>= $(shlibs_ver))'))
+
+binary-install/kdelibs-data::
+	install -p -D -m644 kded/applications.menu debian/kdelibs-data/etc/xdg/menus/kde-applications.menu
+	uudecode debian/aboutkde-kubuntu.png.uu -o debian/kdelibs-data/usr/share/apps/kdeui/pics/aboutkde.png
+	uudecode debian/system-icons/cr16-device-system.png.uu -o debian/kdelibs-data/usr/share/icons/crystalsvg/16x16/devices/system.png
+	uudecode debian/system-icons/cr22-device-system.png.uu -o debian/kdelibs-data/usr/share/icons/crystalsvg/22x22/devices/system.png
+	uudecode debian/system-icons/cr32-device-system.png.uu -o debian/kdelibs-data/usr/share/icons/crystalsvg/32x32/devices/system.png
+	uudecode debian/system-icons/cr48-device-system.png.uu -o debian/kdelibs-data/usr/share/icons/crystalsvg/48x48/devices/system.png
+	uudecode debian/system-icons/cr64-device-system.png.uu -o debian/kdelibs-data/usr/share/icons/crystalsvg/64x64/devices/system.png
+	uudecode debian/system-icons/cr128-device-system.png.uu -o debian/kdelibs-data/usr/share/icons/crystalsvg/128x128/devices/system.png
+#	uudecode debian/system-icons/crsc-device-system.svgz.uu -o debian/kdelibs-data/usr/share/icons/crystalsvg/scalable/devices/system.svgz
+	mkdir -p debian/kdelibs-data/usr/share/icons/hicolor/16x16/apps/
+	uudecode debian/launchpad.png.uu -o debian/kdelibs-data/usr/share/icons/hicolor/16x16/apps/launchpad.png
+
+### 
+
+DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
+
+binary-predeb/kdelibs4-dev::
+ifeq (linux,$(DEB_HOST_ARCH_OS))
+	echo "libasound2-dev=libasound2-dev" >> debian/kdelibs4-dev.substvars
+endif
+
+common-install-prehook-impl::
+	mkdir -p po
+	-XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/usr/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages	
+	-for file in po/*pot; do \
+		sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
+	done
+
+	# generate .po files for .desktop etc files
+	if [ -f debian/kubuntu-desktop-i18n/createdesktop.pl ]; then \
+	  sh debian/kubuntu-desktop-i18n/findfiles LIST; \
+	  cat LIST; \
+	  perl debian/kubuntu-desktop-i18n/createdesktop.pl --file-list=LIST --base-dir=. > desktop.$(DEB_SOURCE_PACKAGE).tmp; \
+	  msguniq --to-code=UTF-8 --no-wrap -o desktop.$(DEB_SOURCE_PACKAGE) desktop.$(DEB_SOURCE_PACKAGE).tmp 2>/dev/null; \
+	  python debian/kubuntu-desktop-i18n/msgsplit desktop.$(DEB_SOURCE_PACKAGE); \
+	  mv desktop.$(DEB_SOURCE_PACKAGE) po/desktop_$(DEB_SOURCE_PACKAGE).pot; \
+	  rm -f desktop.$(DEB_SOURCE_PACKAGE) desktop.$(DEB_SOURCE_PACKAGE).tmp; \
+	  # add translation domain to files \
+	  for file in `cat LIST`; do \
+	    echo X-Ubuntu-Gettext-Domain=desktop_$(DEB_SOURCE_PACKAGE) >> $${file}; \
+	  done; \
+	  rm -f LIST; \
+	fi
+
+common-post-build-arch::
+	msgcat kde.pot po/kdelibs.pot > kdelibs.pot-merged
+	mv kdelibs.pot-merged po/kdelibs.pot
--- kdelibs-3.5.7.orig/debian/kdelibs4c2a.install
+++ kdelibs-3.5.7/debian/kdelibs4c2a.install
@@ -0,0 +1,300 @@
+debian/tmp/etc/kde3/khotnewstuffrc
+debian/tmp/usr/bin/artsmessage
+debian/tmp/usr/bin/cupsdconf
+debian/tmp/usr/bin/cupsdoprint
+debian/tmp/usr/bin/dcop
+debian/tmp/usr/bin/dcopclient
+debian/tmp/usr/bin/dcopfind
+debian/tmp/usr/bin/dcopobject
+debian/tmp/usr/bin/dcopquit
+debian/tmp/usr/bin/dcopref
+debian/tmp/usr/bin/dcopserver
+debian/tmp/usr/bin/dcopserver_shutdown
+debian/tmp/usr/bin/dcopstart
+debian/tmp/usr/bin/filesharelist
+debian/tmp/usr/bin/fileshareset
+debian/tmp/usr/bin/imagetops
+debian/tmp/usr/bin/kab2kabc
+debian/tmp/usr/bin/kaddprinterwizard
+debian/tmp/usr/bin/kbuildsycoca
+debian/tmp/usr/bin/kcmshell
+debian/tmp/usr/bin/kconfig_compiler
+debian/tmp/usr/bin/kconf_update
+debian/tmp/usr/bin/kcookiejar
+debian/tmp/usr/bin/kde-config
+debian/tmp/usr/bin/kded
+debian/tmp/usr/bin/kdeinit
+debian/tmp/usr/bin/kdeinit_shutdown
+debian/tmp/usr/bin/kdeinit_wrapper
+debian/tmp/usr/bin/kde-menu
+debian/tmp/usr/bin/kdesu_stub
+debian/tmp/usr/bin/kdontchangethehostname
+debian/tmp/usr/bin/kdostartupconfig
+debian/tmp/usr/bin/kfile
+debian/tmp/usr/bin/kfmexec
+debian/tmp/usr/bin/kgrantpty
+debian/tmp/usr/bin/khotnewstuff
+debian/tmp/usr/bin/kinstalltheme
+debian/tmp/usr/bin/kioexec
+debian/tmp/usr/bin/kio_http_cache_cleaner
+debian/tmp/usr/bin/kioslave
+debian/tmp/usr/bin/kio_uiserver
+debian/tmp/usr/bin/klauncher
+debian/tmp/usr/bin/kmailservice
+debian/tmp/usr/bin/kpac_dhcp_helper
+debian/tmp/usr/bin/ksendbugmail
+debian/tmp/usr/bin/kshell
+debian/tmp/usr/bin/kstartupconfig
+debian/tmp/usr/bin/ksvgtopng
+debian/tmp/usr/bin/ktelnetservice
+debian/tmp/usr/bin/ktradertest
+debian/tmp/usr/bin/kunittestmodrunner
+debian/tmp/usr/bin/kwrapper
+debian/tmp/usr/bin/lnusertemp
+debian/tmp/usr/bin/make_driver_db_cups
+debian/tmp/usr/bin/make_driver_db_lpr
+debian/tmp/usr/bin/makekdewidgets
+debian/tmp/usr/bin/meinproc
+debian/tmp/usr/bin/start_kdeinit
+debian/tmp/usr/bin/preparetips
+debian/tmp/usr/lib/kde3/cupsdconf.la
+debian/tmp/usr/lib/kde3/cupsdconf.so
+debian/tmp/usr/lib/kde3/dcopserver.la
+debian/tmp/usr/lib/kde3/dcopserver.so
+debian/tmp/usr/lib/kde3/kabc_dir.la
+debian/tmp/usr/lib/kde3/kabc_dir.so
+debian/tmp/usr/lib/kde3/kabc_file.la
+debian/tmp/usr/lib/kde3/kabc_file.so
+debian/tmp/usr/lib/kde3/kabcformat_binary.la
+debian/tmp/usr/lib/kde3/kabcformat_binary.so
+debian/tmp/usr/lib/kde3/kabc_ldapkio.la
+debian/tmp/usr/lib/kde3/kabc_ldapkio.so
+debian/tmp/usr/lib/kde3/kaddprinterwizard.la
+debian/tmp/usr/lib/kde3/kaddprinterwizard.so
+debian/tmp/usr/lib/kde3/kbuildsycoca.la
+debian/tmp/usr/lib/kde3/kbuildsycoca.so
+debian/tmp/usr/lib/kde3/kbzip2filter.la
+debian/tmp/usr/lib/kde3/kbzip2filter.so
+debian/tmp/usr/lib/kde3/kcm_kresources.la
+debian/tmp/usr/lib/kde3/kcm_kresources.so
+debian/tmp/usr/lib/kde3/kcmshell.la
+debian/tmp/usr/lib/kde3/kcmshell.so
+debian/tmp/usr/lib/kde3/kconf_update.la
+debian/tmp/usr/lib/kde3/kconf_update.so
+debian/tmp/usr/lib/kde3/kcookiejar.la
+debian/tmp/usr/lib/kde3/kcookiejar.so
+debian/tmp/usr/lib/kde3/kded_kcookiejar.la
+debian/tmp/usr/lib/kde3/kded_kcookiejar.so
+debian/tmp/usr/lib/kde3/kded_kdeprintd.la
+debian/tmp/usr/lib/kde3/kded_kdeprintd.so
+debian/tmp/usr/lib/kde3/kded_kdetrayproxy.la
+debian/tmp/usr/lib/kde3/kded_kdetrayproxy.so
+debian/tmp/usr/lib/kde3/kded_kpasswdserver.la
+debian/tmp/usr/lib/kde3/kded_kpasswdserver.so
+debian/tmp/usr/lib/kde3/kded_kssld.la
+debian/tmp/usr/lib/kde3/kded_kssld.so
+debian/tmp/usr/lib/kde3/kded_kwalletd.la
+debian/tmp/usr/lib/kde3/kded_kwalletd.so
+debian/tmp/usr/lib/kde3/kded.la
+debian/tmp/usr/lib/kde3/kded_proxyscout.la
+debian/tmp/usr/lib/kde3/kded_proxyscout.so
+debian/tmp/usr/lib/kde3/kded.so
+debian/tmp/usr/lib/kde3/kdeprint_cups.la
+debian/tmp/usr/lib/kde3/kdeprint_cups.so
+debian/tmp/usr/lib/kde3/kdeprint_ext.la
+debian/tmp/usr/lib/kde3/kdeprint_ext.so
+debian/tmp/usr/lib/kde3/kdeprint_lpdunix.la
+debian/tmp/usr/lib/kde3/kdeprint_lpdunix.so
+debian/tmp/usr/lib/kde3/kdeprint_lpr.la
+debian/tmp/usr/lib/kde3/kdeprint_lpr.so
+debian/tmp/usr/lib/kde3/kdeprint_rlpr.la
+debian/tmp/usr/lib/kde3/kdeprint_rlpr.so
+debian/tmp/usr/lib/kde3/kdeprint_tool_escputil.la
+debian/tmp/usr/lib/kde3/kdeprint_tool_escputil.so
+debian/tmp/usr/lib/kde3/kfileaudiopreview.la
+debian/tmp/usr/lib/kde3/kfileaudiopreview.so
+debian/tmp/usr/lib/kde3/kgzipfilter.la
+debian/tmp/usr/lib/kde3/kgzipfilter.so
+debian/tmp/usr/lib/kde3/khtmlimagepart.la
+debian/tmp/usr/lib/kde3/khtmlimagepart.so
+debian/tmp/usr/lib/kde3/kimg_dds.la
+debian/tmp/usr/lib/kde3/kimg_dds.so
+debian/tmp/usr/lib/kde3/kimg_eps.la
+debian/tmp/usr/lib/kde3/kimg_eps.so
+debian/tmp/usr/lib/kde3/kimg_exr.la
+debian/tmp/usr/lib/kde3/kimg_exr.so
+debian/tmp/usr/lib/kde3/kimg_hdr.la
+debian/tmp/usr/lib/kde3/kimg_hdr.so
+debian/tmp/usr/lib/kde3/kimg_ico.la
+debian/tmp/usr/lib/kde3/kimg_ico.so
+debian/tmp/usr/lib/kde3/kimg_jp2.la
+debian/tmp/usr/lib/kde3/kimg_jp2.so
+debian/tmp/usr/lib/kde3/kimg_pcx.la
+debian/tmp/usr/lib/kde3/kimg_pcx.so
+debian/tmp/usr/lib/kde3/kimg_psd.la
+debian/tmp/usr/lib/kde3/kimg_psd.so
+debian/tmp/usr/lib/kde3/kimg_rgb.la
+debian/tmp/usr/lib/kde3/kimg_rgb.so
+debian/tmp/usr/lib/kde3/kimg_tga.la
+debian/tmp/usr/lib/kde3/kimg_tga.so
+debian/tmp/usr/lib/kde3/kimg_tiff.la
+debian/tmp/usr/lib/kde3/kimg_tiff.so
+debian/tmp/usr/lib/kde3/kimg_xcf.la
+debian/tmp/usr/lib/kde3/kimg_xcf.so
+debian/tmp/usr/lib/kde3/kimg_xview.la
+debian/tmp/usr/lib/kde3/kimg_xview.so
+debian/tmp/usr/lib/kde3/kio_file.la
+debian/tmp/usr/lib/kde3/kio_file.so
+debian/tmp/usr/lib/kde3/kio_ftp.la
+debian/tmp/usr/lib/kde3/kio_ftp.so
+debian/tmp/usr/lib/kde3/kio_ghelp.la
+debian/tmp/usr/lib/kde3/kio_ghelp.so
+debian/tmp/usr/lib/kde3/kio_help.la
+debian/tmp/usr/lib/kde3/kio_help.so
+debian/tmp/usr/lib/kde3/kio_http_cache_cleaner.la
+debian/tmp/usr/lib/kde3/kio_http_cache_cleaner.so
+debian/tmp/usr/lib/kde3/kio_http.la
+debian/tmp/usr/lib/kde3/kio_http.so
+debian/tmp/usr/lib/kde3/kio_metainfo.la
+debian/tmp/usr/lib/kde3/kio_metainfo.so
+debian/tmp/usr/lib/kde3/kio_uiserver.la
+debian/tmp/usr/lib/kde3/kio_uiserver.so
+debian/tmp/usr/lib/kde3/kjavaappletviewer.la
+debian/tmp/usr/lib/kde3/kjavaappletviewer.so
+debian/tmp/usr/lib/kde3/klauncher.la
+debian/tmp/usr/lib/kde3/klauncher.so
+debian/tmp/usr/lib/kde3/knotify.la
+debian/tmp/usr/lib/kde3/knotify.so
+debian/tmp/usr/lib/kde3/kspell_aspell.la
+debian/tmp/usr/lib/kde3/kspell_aspell.so
+debian/tmp/usr/lib/kde3/kspell_hspell.la
+debian/tmp/usr/lib/kde3/kspell_hspell.so
+debian/tmp/usr/lib/kde3/kspell_ispell.la
+debian/tmp/usr/lib/kde3/kspell_ispell.so
+debian/tmp/usr/lib/kde3/kstyle_highcontrast_config.la
+debian/tmp/usr/lib/kde3/kstyle_highcontrast_config.so
+debian/tmp/usr/lib/kde3/kstyle_plastik_config.la
+debian/tmp/usr/lib/kde3/kstyle_plastik_config.so
+debian/tmp/usr/lib/kde3/ktexteditor_docwordcompletion.la
+debian/tmp/usr/lib/kde3/ktexteditor_docwordcompletion.so
+debian/tmp/usr/lib/kde3/ktexteditor_insertfile.la
+debian/tmp/usr/lib/kde3/ktexteditor_insertfile.so
+debian/tmp/usr/lib/kde3/ktexteditor_isearch.la
+debian/tmp/usr/lib/kde3/ktexteditor_isearch.so
+debian/tmp/usr/lib/kde3/ktexteditor_kdatatool.la
+debian/tmp/usr/lib/kde3/ktexteditor_kdatatool.so
+debian/tmp/usr/lib/kde3/libkatepart.la
+debian/tmp/usr/lib/kde3/libkatepart.so
+debian/tmp/usr/lib/kde3/libkcertpart.la
+debian/tmp/usr/lib/kde3/libkcertpart.so
+debian/tmp/usr/lib/kde3/libkdeprint_management_module.la
+debian/tmp/usr/lib/kde3/libkdeprint_management_module.so
+debian/tmp/usr/lib/kde3/libkhtmlpart.la
+debian/tmp/usr/lib/kde3/libkhtmlpart.so
+debian/tmp/usr/lib/kde3/libkmultipart.la
+debian/tmp/usr/lib/kde3/libkmultipart.so
+debian/tmp/usr/lib/kde3/libshellscript.la
+debian/tmp/usr/lib/kde3/libshellscript.so
+debian/tmp/usr/lib/kde3/plugins/designer/kdewidgets.la
+debian/tmp/usr/lib/kde3/plugins/designer/kdewidgets.so
+debian/tmp/usr/lib/kde3/plugins/styles/highcolor.la
+debian/tmp/usr/lib/kde3/plugins/styles/highcolor.so
+debian/tmp/usr/lib/kde3/plugins/styles/highcontrast.la
+debian/tmp/usr/lib/kde3/plugins/styles/highcontrast.so
+debian/tmp/usr/lib/kde3/plugins/styles/keramik.la
+debian/tmp/usr/lib/kde3/plugins/styles/keramik.so
+debian/tmp/usr/lib/kde3/plugins/styles/kthemestyle.la
+debian/tmp/usr/lib/kde3/plugins/styles/kthemestyle.so
+debian/tmp/usr/lib/kde3/plugins/styles/light.la
+debian/tmp/usr/lib/kde3/plugins/styles/light.so
+debian/tmp/usr/lib/kde3/plugins/styles/plastik.la
+debian/tmp/usr/lib/kde3/plugins/styles/plastik.so
+debian/tmp/usr/lib/libartskde.so.1
+debian/tmp/usr/lib/libartskde.so.1.2.0
+debian/tmp/usr/lib/libDCOP.so.4
+debian/tmp/usr/lib/libDCOP.so.4.2.0
+debian/tmp/usr/lib/libkabc_dir.so.1
+debian/tmp/usr/lib/libkabc_dir.so.1.0.0
+debian/tmp/usr/lib/libkabc_file.so.1
+debian/tmp/usr/lib/libkabc_file.so.1.0.0
+debian/tmp/usr/lib/libkabc_ldapkio.so.1
+debian/tmp/usr/lib/libkabc_ldapkio.so.1.0.0
+debian/tmp/usr/lib/libkabc.so.1
+debian/tmp/usr/lib/libkabc.so.1.2.0
+debian/tmp/usr/lib/libkatepartinterfaces.so.0
+debian/tmp/usr/lib/libkatepartinterfaces.so.0.0.0
+debian/tmp/usr/lib/libkdecore.so.4
+debian/tmp/usr/lib/libkdecore.so.4.2.0
+debian/tmp/usr/lib/libkdefakes.so.4
+debian/tmp/usr/lib/libkdefakes.so.4.2.0
+debian/tmp/usr/lib/libkdefx.so.4
+debian/tmp/usr/lib/libkdefx.so.4.2.0
+debian/tmp/usr/lib/libkdeinit_cupsdconf.so
+debian/tmp/usr/lib/libkdeinit_dcopserver.so
+debian/tmp/usr/lib/libkdeinit_kaddprinterwizard.so
+debian/tmp/usr/lib/libkdeinit_kbuildsycoca.so
+debian/tmp/usr/lib/libkdeinit_kcmshell.so
+debian/tmp/usr/lib/libkdeinit_kconf_update.so
+debian/tmp/usr/lib/libkdeinit_kcookiejar.so
+debian/tmp/usr/lib/libkdeinit_kded.so
+debian/tmp/usr/lib/libkdeinit_kio_http_cache_cleaner.so
+debian/tmp/usr/lib/libkdeinit_kio_uiserver.so
+debian/tmp/usr/lib/libkdeinit_klauncher.so
+debian/tmp/usr/lib/libkdeprint_management.so.4
+debian/tmp/usr/lib/libkdeprint_management.so.4.2.0
+debian/tmp/usr/lib/libkdeprint.so.4
+debian/tmp/usr/lib/libkdeprint.so.4.2.0
+debian/tmp/usr/lib/libkdesasl.so.1
+debian/tmp/usr/lib/libkdesasl.so.1.2.0
+debian/tmp/usr/lib/libkdesu.so.4
+debian/tmp/usr/lib/libkdesu.so.4.2.0
+debian/tmp/usr/lib/libkdeui.so.4
+debian/tmp/usr/lib/libkdeui.so.4.2.0
+debian/tmp/usr/lib/libkdnssd.so.1
+debian/tmp/usr/lib/libkdnssd.so.1.0.0
+debian/tmp/usr/lib/libkhtml.so.4
+debian/tmp/usr/lib/libkhtml.so.4.2.0
+debian/tmp/usr/lib/libkimproxy.so.0
+debian/tmp/usr/lib/libkimproxy.so.0.0.0
+debian/tmp/usr/lib/libkio.so.4
+debian/tmp/usr/lib/libkio.so.4.2.0
+debian/tmp/usr/lib/libkjava.so.1
+debian/tmp/usr/lib/libkjava.so.1.0.0
+debian/tmp/usr/lib/libkjs.so.1
+debian/tmp/usr/lib/libkjs.so.1.2.0
+debian/tmp/usr/lib/libkmdi2.so.1
+debian/tmp/usr/lib/libkmdi2.so.1.0.0
+debian/tmp/usr/lib/libkmdi.so.1
+debian/tmp/usr/lib/libkmdi.so.1.0.0
+debian/tmp/usr/lib/libkmediaplayer.so.0
+debian/tmp/usr/lib/libkmediaplayer.so.0.0.0
+debian/tmp/usr/lib/libkmid.so.0
+debian/tmp/usr/lib/libkmid.so.0.0.95
+debian/tmp/usr/lib/libknewstuff.so.1
+debian/tmp/usr/lib/libknewstuff.so.1.0.0
+debian/tmp/usr/lib/libkntlm.so.0
+debian/tmp/usr/lib/libkntlm.so.0.0.0
+debian/tmp/usr/lib/libkparts.so.2
+debian/tmp/usr/lib/libkparts.so.2.1.0
+debian/tmp/usr/lib/libkresources.so.1
+debian/tmp/usr/lib/libkresources.so.1.2.0
+debian/tmp/usr/lib/libkscreensaver.so.4
+debian/tmp/usr/lib/libkscreensaver.so.4.2.0
+debian/tmp/usr/lib/libkscript.so.0
+debian/tmp/usr/lib/libkscript.so.0.0.0
+debian/tmp/usr/lib/libkspell2.so.1
+debian/tmp/usr/lib/libkspell2.so.1.0.0
+debian/tmp/usr/lib/libkspell.so.4
+debian/tmp/usr/lib/libkspell.so.4.2.0
+debian/tmp/usr/lib/libktexteditor.so.0
+debian/tmp/usr/lib/libktexteditor.so.0.0.0
+debian/tmp/usr/lib/libkunittest.so.1
+debian/tmp/usr/lib/libkunittest.so.1.0.0
+debian/tmp/usr/lib/libkutils.so.1
+debian/tmp/usr/lib/libkutils.so.1.2.0
+debian/tmp/usr/lib/libkwalletbackend.so.1
+debian/tmp/usr/lib/libkwalletbackend.so.1.0.0
+debian/tmp/usr/lib/libkwalletclient.so.1
+debian/tmp/usr/lib/libkwalletclient.so.1.0.1
+debian/tmp/usr/lib/libvcard.so.0
+debian/tmp/usr/lib/libvcard.so.0.0.0
--- kdelibs-3.5.7.orig/debian/kdelibs4c2a.presubj
+++ kdelibs-3.5.7/debian/kdelibs4c2a.presubj
@@ -0,0 +1,16 @@
+Reporting bugs for KDE packages
+-------------------------------
+
+KDE does not support beeing upgraded while running. If you do so, you may
+encounter weird bugs (empty menus or configuration dialogs e.g.), and even
+crashes.
+
+If you recently upgraded kdelibs and/or kdebase packages, please consider:
+ * exiting your current KDE session.
+ * ensuring that no more KDE process is still running, especially the processes
+   named (list beeing non-limitative): dcopserver, kded, ksmserver...
+ * log in KDE again.
+
+Then try to reproduce you bug. If it's not reproducible, then please do not
+report it.
+
--- kdelibs-3.5.7.orig/debian/kdelibs4-dev.docs
+++ kdelibs-3.5.7/debian/kdelibs4-dev.docs
@@ -0,0 +1,3 @@
+DEBUG
+NAMING
+README
--- kdelibs-3.5.7.orig/debian/kdelibs4c2a.links
+++ kdelibs-3.5.7/debian/kdelibs4c2a.links
@@ -0,0 +1,5 @@
+usr/share/man/man1/fileshareset.1.gz usr/share/man/man1/filesharelist.1.gz
+usr/share/man/man1/kshell.1.gz usr/share/man/man1/kdeinit_wrapper.1.gz
+usr/share/man/man1/kstartupconfig.1.gz usr/share/man/man1/kdostartupconfig.1.gz
+usr/share/man/man1/kioexec.1.gz usr/share/man/man1/kfmexec.1.gz
+usr/share/man/man1/kshell.1.gz usr/share/man/man1/kwrapper.1.gz
--- kdelibs-3.5.7.orig/debian/kdelibs-data.preinst
+++ kdelibs-3.5.7/debian/kdelibs-data.preinst
@@ -0,0 +1,35 @@
+#!/bin/sh -e
+
+FILE="/etc/xdg/menus/applications.menu"
+MD5SUM332="3750f06e08cfd048952f4cd82b97652c"
+MD5SUM340="ea26be9e934fb23c04b0b1409706bace"
+
+case "$1" in
+
+	upgrade)
+	rm -f /etc/kde3/colors/40\ Colors
+	rm -f /etc/kde3/colors/Royal
+	rm -f /etc/kde3/colors/Web
+	rm -f /etc/kde3/ktexteditor_autobookmarkerrc
+	[ -f "$FILE" ] || exit 0
+	MD5SUMOLD=`md5sum $FILE | awk '{print $1}'`
+	if dpkg --compare-versions "$2" lt "4:3.4.0-0pre5"; then
+		if [ "$MD5SUM332" = "$MD5SUMOLD" ] || [ "$MD5SUM340" = "$MD5SUMOLD" ]; then
+			rm -f "$FILE"
+		fi
+	fi
+	;;
+
+	install|abort-upgrade)
+	;;
+
+	*)
+	echo "preinst called with unknown argument \`$1'" >&2
+	exit 1
+	;;
+
+esac
+
+#DEBHELPER#
+
+exit 0
--- kdelibs-3.5.7.orig/debian/copyright
+++ kdelibs-3.5.7/debian/copyright
@@ -0,0 +1,439 @@
+This package was debianized by Christopher L Cheney <ccheney@debian.org> on
+Tue, 16 Apr 2002 22:00:00 -0500.
+
+It was downloaded from: http://www.kde.org/download
+
+Upstream Authors: Kalle Dalheimer <kalle@kde.org> and many others.
+
+License:
+
+All programs are either under the BSD, GPL or LGPL licenses. On Debian
+systems, the complete text of the BSD, GPL and LGPL licenses can be found
+in the /usr/share/common-licenses/BSD, /usr/share/common-licenses/GPL and
+/usr/share/common-licenses/LGPL files.
+
+libartskde, interfaces, kabc, kate, kcert, kconf_update, kdecore, kded, kdefx,
+kdeprint, kdesu, kdeui, kdewidgets, khtml, kimgio, kinit, kio, kioslave, kjs,
+kparts, ksmartcard, kspell, kstyles, libkmid, libkscreensaver
+------------------------------------------------------------------------------
+LGPL
+
+knotify, artsmessage, kab
+-------------------------
+GPL
+
+dcop
+----
+BSD
+
+--------------------
+
+DocBook Documentation:
+
+  Permission is granted to copy, distribute and/or modify this
+  document under the terms of the GNU Free Documentation License,
+  Version 1.1 or any later version published by the Free Software
+  Foundation; with no Invariant Sections, with no Front-Cover Texts,
+  and with no Back-Cover Texts.
+
+  A copy of the GNU Free Documentation License (Version 1.2) is
+  included below.
+
+
+                  GNU Free Documentation License
+                    Version 1.2, November 2002
+
+
+   Copyright (C) 2000,2001,2002  Free Software Foundation, Inc.
+     51 Franklin St, Fifth Floor, Boston, MA, 02110-1301, USA.
+   Everyone is permitted to copy and distribute verbatim copies
+   of this license document, but changing it is not allowed.
+
+
+  0. PREAMBLE
+
+  The purpose of this License is to make a manual, textbook, or other
+  functional and useful document "free" in the sense of freedom: to
+  assure everyone the effective freedom to copy and redistribute it,
+  with or without modifying it, either commercially or noncommercially.
+  Secondarily, this License preserves for the author and publisher a way
+  to get credit for their work, while not being considered responsible
+  for modifications made by others.
+
+  This License is a kind of "copyleft", which means that derivative
+  works of the document must themselves be free in the same sense.  It
+  complements the GNU General Public License, which is a copyleft
+  license designed for free software.
+
+  We have designed this License in order to use it for manuals for free
+  software, because free software needs free documentation: a free
+  program should come with manuals providing the same freedoms that the
+  software does.  But this License is not limited to software manuals;
+  it can be used for any textual work, regardless of subject matter or
+  whether it is published as a printed book.  We recommend this License
+  principally for works whose purpose is instruction or reference.
+
+
+  1. APPLICABILITY AND DEFINITIONS
+
+  This License applies to any manual or other work, in any medium, that
+  contains a notice placed by the copyright holder saying it can be
+  distributed under the terms of this License.  Such a notice grants a
+  world-wide, royalty-free license, unlimited in duration, to use that
+  work under the conditions stated herein.  The "Document", below,
+  refers to any such manual or work.  Any member of the public is a
+  licensee, and is addressed as "you".  You accept the license if you
+  copy, modify or distribute the work in a way requiring permission
+  under copyright law.
+
+  A "Modified Version" of the Document means any work containing the
+  Document or a portion of it, either copied verbatim, or with
+  modifications and/or translated into another language.
+
+  A "Secondary Section" is a named appendix or a front-matter section of
+  the Document that deals exclusively with the relationship of the
+  publishers or authors of the Document to the Document's overall subject
+  (or to related matters) and contains nothing that could fall directly
+  within that overall subject.  (Thus, if the Document is in part a
+  textbook of mathematics, a Secondary Section may not explain any
+  mathematics.)  The relationship could be a matter of historical
+  connection with the subject or with related matters, or of legal,
+  commercial, philosophical, ethical or political position regarding
+  them.
+
+  The "Invariant Sections" are certain Secondary Sections whose titles
+  are designated, as being those of Invariant Sections, in the notice
+  that says that the Document is released under this License.  If a
+  section does not fit the above definition of Secondary then it is not
+  allowed to be designated as Invariant.  The Document may contain zero
+  Invariant Sections.  If the Document does not identify any Invariant
+  Sections then there are none.
+
+  The "Cover Texts" are certain short passages of text that are listed,
+  as Front-Cover Texts or Back-Cover Texts, in the notice that says that
+  the Document is released under this License.  A Front-Cover Text may
+  be at most 5 words, and a Back-Cover Text may be at most 25 words.
+
+  A "Transparent" copy of the Document means a machine-readable copy,
+  represented in a format whose specification is available to the
+  general public, that is suitable for revising the document
+  straightforwardly with generic text editors or (for images composed of
+  pixels) generic paint programs or (for drawings) some widely available
+  drawing editor, and that is suitable for input to text formatters or
+  for automatic translation to a variety of formats suitable for input
+  to text formatters.  A copy made in an otherwise Transparent file
+  format whose markup, or absence of markup, has been arranged to thwart
+  or discourage subsequent modification by readers is not Transparent.
+  An image format is not Transparent if used for any substantial amount
+  of text.  A copy that is not "Transparent" is called "Opaque".
+
+  Examples of suitable formats for Transparent copies include plain
+  ASCII without markup, Texinfo input format, LaTeX input format, SGML
+  or XML using a publicly available DTD, and standard-conforming simple
+  HTML, PostScript or PDF designed for human modification.  Examples of
+  transparent image formats include PNG, XCF and JPG.  Opaque formats
+  include proprietary formats that can be read and edited only by
+  proprietary word processors, SGML or XML for which the DTD and/or
+  processing tools are not generally available, and the
+  machine-generated HTML, PostScript or PDF produced by some word
+  processors for output purposes only.
+
+  The "Title Page" means, for a printed book, the title page itself,
+  plus such following pages as are needed to hold, legibly, the material
+  this License requires to appear in the title page.  For works in
+  formats which do not have any title page as such, "Title Page" means
+  the text near the most prominent appearance of the work's title,
+  preceding the beginning of the body of the text.
+
+  A section "Entitled XYZ" means a named subunit of the Document whose
+  title either is precisely XYZ or contains XYZ in parentheses following
+  text that translates XYZ in another language.  (Here XYZ stands for a
+  specific section name mentioned below, such as "Acknowledgements",
+  "Dedications", "Endorsements", or "History".)  To "Preserve the Title"
+  of such a section when you modify the Document means that it remains a
+  section "Entitled XYZ" according to this definition.
+
+  The Document may include Warranty Disclaimers next to the notice which
+  states that this License applies to the Document.  These Warranty
+  Disclaimers are considered to be included by reference in this
+  License, but only as regards disclaiming warranties: any other
+  implication that these Warranty Disclaimers may have is void and has
+  no effect on the meaning of this License.
+
+
+  2. VERBATIM COPYING
+
+  You may copy and distribute the Document in any medium, either
+  commercially or noncommercially, provided that this License, the
+  copyright notices, and the license notice saying this License applies
+  to the Document are reproduced in all copies, and that you add no other
+  conditions whatsoever to those of this License.  You may not use
+  technical measures to obstruct or control the reading or further
+  copying of the copies you make or distribute.  However, you may accept
+  compensation in exchange for copies.  If you distribute a large enough
+  number of copies you must also follow the conditions in section 3.
+
+  You may also lend copies, under the same conditions stated above, and
+  you may publicly display copies.
+
+
+  3. COPYING IN QUANTITY
+
+  If you publish printed copies (or copies in media that commonly have
+  printed covers) of the Document, numbering more than 100, and the
+  Document's license notice requires Cover Texts, you must enclose the
+  copies in covers that carry, clearly and legibly, all these Cover
+  Texts: Front-Cover Texts on the front cover, and Back-Cover Texts on
+  the back cover.  Both covers must also clearly and legibly identify
+  you as the publisher of these copies.  The front cover must present
+  the full title with all words of the title equally prominent and
+  visible.  You may add other material on the covers in addition.
+  Copying with changes limited to the covers, as long as they preserve
+  the title of the Document and satisfy these conditions, can be treated
+  as verbatim copying in other respects.
+
+  If the required texts for either cover are too voluminous to fit
+  legibly, you should put the first ones listed (as many as fit
+  reasonably) on the actual cover, and continue the rest onto adjacent
+  pages.
+
+  If you publish or distribute Opaque copies of the Document numbering
+  more than 100, you must either include a machine-readable Transparent
+  copy along with each Opaque copy, or state in or with each Opaque copy
+  a computer-network location from which the general network-using
+  public has access to download using public-standard network protocols
+  a complete Transparent copy of the Document, free of added material.
+  If you use the latter option, you must take reasonably prudent steps,
+  when you begin distribution of Opaque copies in quantity, to ensure
+  that this Transparent copy will remain thus accessible at the stated
+  location until at least one year after the last time you distribute an
+  Opaque copy (directly or through your agents or retailers) of that
+  edition to the public.
+
+  It is requested, but not required, that you contact the authors of the
+  Document well before redistributing any large number of copies, to give
+  them a chance to provide you with an updated version of the Document.
+
+
+  4. MODIFICATIONS
+
+  You may copy and distribute a Modified Version of the Document under
+  the conditions of sections 2 and 3 above, provided that you release
+  the Modified Version under precisely this License, with the Modified
+  Version filling the role of the Document, thus licensing distribution
+  and modification of the Modified Version to whoever possesses a copy
+  of it.  In addition, you must do these things in the Modified Version:
+
+  A. Use in the Title Page (and on the covers, if any) a title distinct
+     from that of the Document, and from those of previous versions
+     (which should, if there were any, be listed in the History section
+     of the Document).  You may use the same title as a previous version
+     if the original publisher of that version gives permission.
+  B. List on the Title Page, as authors, one or more persons or entities
+     responsible for authorship of the modifications in the Modified
+     Version, together with at least five of the principal authors of the
+     Document (all of its principal authors, if it has fewer than five),
+     unless they release you from this requirement.
+  C. State on the Title page the name of the publisher of the
+     Modified Version, as the publisher.
+  D. Preserve all the copyright notices of the Document.
+  E. Add an appropriate copyright notice for your modifications
+     adjacent to the other copyright notices.
+  F. Include, immediately after the copyright notices, a license notice
+     giving the public permission to use the Modified Version under the
+     terms of this License, in the form shown in the Addendum below.
+  G. Preserve in that license notice the full lists of Invariant Sections
+     and required Cover Texts given in the Document's license notice.
+  H. Include an unaltered copy of this License.
+  I. Preserve the section Entitled "History", Preserve its Title, and add
+     to it an item stating at least the title, year, new authors, and
+     publisher of the Modified Version as given on the Title Page.  If
+     there is no section Entitled "History" in the Document, create one
+     stating the title, year, authors, and publisher of the Document as
+     given on its Title Page, then add an item describing the Modified
+     Version as stated in the previous sentence.
+  J. Preserve the network location, if any, given in the Document for
+     public access to a Transparent copy of the Document, and likewise
+     the network locations given in the Document for previous versions
+     it was based on.  These may be placed in the "History" section.
+     You may omit a network location for a work that was published at
+     least four years before the Document itself, or if the original
+     publisher of the version it refers to gives permission.
+  K. For any section Entitled "Acknowledgements" or "Dedications",
+     Preserve the Title of the section, and preserve in the section all
+     the substance and tone of each of the contributor acknowledgements
+     and/or dedications given therein.
+  L. Preserve all the Invariant Sections of the Document,
+     unaltered in their text and in their titles.  Section numbers
+     or the equivalent are not considered part of the section titles.
+  M. Delete any section Entitled "Endorsements".  Such a section
+     may not be included in the Modified Version.
+  N. Do not retitle any existing section to be Entitled "Endorsements"
+     or to conflict in title with any Invariant Section.
+  O. Preserve any Warranty Disclaimers.
+
+  If the Modified Version includes new front-matter sections or
+  appendices that qualify as Secondary Sections and contain no material
+  copied from the Document, you may at your option designate some or all
+  of these sections as invariant.  To do this, add their titles to the
+  list of Invariant Sections in the Modified Version's license notice.
+  These titles must be distinct from any other section titles.
+
+  You may add a section Entitled "Endorsements", provided it contains
+  nothing but endorsements of your Modified Version by various
+  parties--for example, statements of peer review or that the text has
+  been approved by an organization as the authoritative definition of a
+  standard.
+
+  You may add a passage of up to five words as a Front-Cover Text, and a
+  passage of up to 25 words as a Back-Cover Text, to the end of the list
+  of Cover Texts in the Modified Version.  Only one passage of
+  Front-Cover Text and one of Back-Cover Text may be added by (or
+  through arrangements made by) any one entity.  If the Document already
+  includes a cover text for the same cover, previously added by you or
+  by arrangement made by the same entity you are acting on behalf of,
+  you may not add another; but you may replace the old one, on explicit
+  permission from the previous publisher that added the old one.
+
+  The author(s) and publisher(s) of the Document do not by this License
+  give permission to use their names for publicity for or to assert or
+  imply endorsement of any Modified Version.
+
+
+  5. COMBINING DOCUMENTS
+
+  You may combine the Document with other documents released under this
+  License, under the terms defined in section 4 above for modified
+  versions, provided that you include in the combination all of the
+  Invariant Sections of all of the original documents, unmodified, and
+  list them all as Invariant Sections of your combined work in its
+  license notice, and that you preserve all their Warranty Disclaimers.
+
+  The combined work need only contain one copy of this License, and
+  multiple identical Invariant Sections may be replaced with a single
+  copy.  If there are multiple Invariant Sections with the same name but
+  different contents, make the title of each such section unique by
+  adding at the end of it, in parentheses, the name of the original
+  author or publisher of that section if known, or else a unique number.
+  Make the same adjustment to the section titles in the list of
+  Invariant Sections in the license notice of the combined work.
+
+  In the combination, you must combine any sections Entitled "History"
+  in the various original documents, forming one section Entitled
+  "History"; likewise combine any sections Entitled "Acknowledgements",
+  and any sections Entitled "Dedications".  You must delete all sections
+  Entitled "Endorsements".
+
+
+  6. COLLECTIONS OF DOCUMENTS
+
+  You may make a collection consisting of the Document and other documents
+  released under this License, and replace the individual copies of this
+  License in the various documents with a single copy that is included in
+  the collection, provided that you follow the rules of this License for
+  verbatim copying of each of the documents in all other respects.
+
+  You may extract a single document from such a collection, and distribute
+  it individually under this License, provided you insert a copy of this
+  License into the extracted document, and follow this License in all
+  other respects regarding verbatim copying of that document.
+
+
+  7. AGGREGATION WITH INDEPENDENT WORKS
+
+  A compilation of the Document or its derivatives with other separate
+  and independent documents or works, in or on a volume of a storage or
+  distribution medium, is called an "aggregate" if the copyright
+  resulting from the compilation is not used to limit the legal rights
+  of the compilation's users beyond what the individual works permit.
+  When the Document is included in an aggregate, this License does not
+  apply to the other works in the aggregate which are not themselves
+  derivative works of the Document.
+
+  If the Cover Text requirement of section 3 is applicable to these
+  copies of the Document, then if the Document is less than one half of
+  the entire aggregate, the Document's Cover Texts may be placed on
+  covers that bracket the Document within the aggregate, or the
+  electronic equivalent of covers if the Document is in electronic form.
+  Otherwise they must appear on printed covers that bracket the whole
+  aggregate.
+
+
+  8. TRANSLATION
+
+  Translation is considered a kind of modification, so you may
+  distribute translations of the Document under the terms of section 4.
+  Replacing Invariant Sections with translations requires special
+  permission from their copyright holders, but you may include
+  translations of some or all Invariant Sections in addition to the
+  original versions of these Invariant Sections.  You may include a
+  translation of this License, and all the license notices in the
+  Document, and any Warranty Disclaimers, provided that you also include
+  the original English version of this License and the original versions
+  of those notices and disclaimers.  In case of a disagreement between
+  the translation and the original version of this License or a notice
+  or disclaimer, the original version will prevail.
+
+  If a section in the Document is Entitled "Acknowledgements",
+  "Dedications", or "History", the requirement (section 4) to Preserve
+  its Title (section 1) will typically require changing the actual
+  title.
+
+
+  9. TERMINATION
+
+  You may not copy, modify, sublicense, or distribute the Document except
+  as expressly provided for under this License.  Any other attempt to
+  copy, modify, sublicense or distribute the Document is void, and will
+  automatically terminate your rights under this License.  However,
+  parties who have received copies, or rights, from you under this
+  License will not have their licenses terminated so long as such
+  parties remain in full compliance.
+
+
+  10. FUTURE REVISIONS OF THIS LICENSE
+
+  The Free Software Foundation may publish new, revised versions
+  of the GNU Free Documentation License from time to time.  Such new
+  versions will be similar in spirit to the present version, but may
+  differ in detail to address new problems or concerns.  See
+  http://www.gnu.org/copyleft/.
+
+  Each version of the License is given a distinguishing version number.
+  If the Document specifies that a particular numbered version of this
+  License "or any later version" applies to it, you have the option of
+  following the terms and conditions either of that specified version or
+  of any later version that has been published (not as a draft) by the
+  Free Software Foundation.  If the Document does not specify a version
+  number of this License, you may choose any version ever published (not
+  as a draft) by the Free Software Foundation.
+
+
+  ADDENDUM: How to use this License for your documents
+
+  To use this License in a document you have written, include a copy of
+  the License in the document and put the following copyright and
+  license notices just after the title page:
+
+      Copyright (c)  YEAR  YOUR NAME.
+      Permission is granted to copy, distribute and/or modify this document
+      under the terms of the GNU Free Documentation License, Version 1.2
+      or any later version published by the Free Software Foundation;
+      with no Invariant Sections, no Front-Cover Texts, and no Back-Cover
+      Texts.  A copy of the license is included in the section entitled
+      "GNU Free Documentation License".
+
+  If you have Invariant Sections, Front-Cover Texts and Back-Cover Texts,
+  replace the "with...Texts." line with this:
+
+      with the Invariant Sections being LIST THEIR TITLES, with the
+      Front-Cover Texts being LIST, and with the Back-Cover Texts being LIST.
+
+  If you have Invariant Sections without Cover Texts, or some other
+  combination of the three, merge those two alternatives to suit the
+  situation.
+
+  If your document contains nontrivial examples of program code, we
+  recommend releasing these examples in parallel under your choice of
+  free software license, such as the GNU General Public License,
+  to permit their use in free software.
--- kdelibs-3.5.7.orig/debian/kdelibs4-doc.install
+++ kdelibs-3.5.7/debian/kdelibs4-doc.install
@@ -0,0 +1 @@
+debian/tmp/usr/share/doc/kde/HTML/en/kdelibs*-apidocs/*	/usr/share/doc/kde/HTML/en/kdelibs-apidocs
--- kdelibs-3.5.7.orig/debian/kdelibs4c2a.docs
+++ kdelibs-3.5.7/debian/kdelibs4c2a.docs
@@ -0,0 +1 @@
+README
--- kdelibs-3.5.7.orig/debian/KUBUNTU-DEBIAN-CHANGES
+++ kdelibs-3.5.7/debian/KUBUNTU-DEBIAN-CHANGES
@@ -0,0 +1,19 @@
+--with-distribution="Kubuntu (`lsb_release --codename --short`) $(DEB_VERSION)"
+binary-install/kdelibs-data installs aboutkde-kubuntu.png.uu and cr*-device-system.png.uu
+none of libgamin-dev, libfam-dev
+don't install .svgz icons in kdelibs-data.install
+rosetta support in rules common-install-prehook-impl:: and common-post-build-arch:: and include debian/kubuntu-desktop-i18n/
+build-dep on: gettext-kde, kdesdk-scripts, lsb-release, base-files
+cdbs 0.4.41ubuntu2
+kdelibs4-dev depends on gettext-kde, kdesdk-scripts
+launchpad.png and 	install -p -D -m644 debian/launchpad.png debian/kdelibs-data/usr/share/icons/hicolor/16x16/apps/launchpad.png
+Make kdelibs4c2a depend on launchpad-integration
+Remove 19_debianize_useragent.diff (changed to kubuntu_19_debianize_useragent.diff)
+don't depend on menu-xdg (debian menu xdg integration)
+include kubuntu_01_kdepot.diff and kde.pot in debian/patches/common
+use a local copy of kde.mk without the common-install-prehook-impl:: rule; edit debian-qt-kde.mk to include debian/cdbs/kde.mk
+build with --with-sudo-kdesu-backend and build-dep on sudo and make kdelibs4c2a depend on sudo
+suspend and hibernate icons (.uu patch) in kdelibs-data.install
+kdelibs-data.install : Add nzb mimetype
+libjasper-dev -> libjasper-1.701-dev (may change after sync from debian)
+remove kdelibs4c2a depends on menu-xdg
--- kdelibs-3.5.7.orig/debian/aboutkde-kubuntu.png.uu
+++ kdelibs-3.5.7/debian/aboutkde-kubuntu.png.uu
@@ -0,0 +1,1252 @@
+begin 644 aboutkde-kubuntu.png
+MB5!.1PT*&@H````-24A$4@```,(```#Z"`(```!\J@^F````"7!(67,```L2
+M```+$@'2W7[\````471%6'1287<@<')O9FEL92!T>7!E(&5X:68`"G!R;V9I
+M;&4*("`@("`@,C`*-#4W.#8Y-C8P,#`P-&0T9#`P,F$P,#`P,#`P.#`P,#`P
+M,#`P,#`P,`H)/30-``"``$E$051XVNS]:;1MUW4>B,UFK=V<_O:O[]`1(%J2
+M8"M1#479$B5+<B/'KCB*J[$KR<@HCQ$[98^1.*DD(W%5RG8YL>,:KBJG7&57
+M/&S3*C6V*4H4Q9X$(``D^H?7X;6WO_>TNUEKS9D?:Y_[+AY`EQH0)$$L7AR>
+MM^^Y]YZS][?GFLTWOXG_[*D]>'>]N_YPB[[;;^#=]4Y8[\+HW?46K'=A].YZ
+M"]:[,'IWO07K71B]N]Z"]2Z,WEUOP7H71N^NMV"9[_8;^%Y9B/C[>KVJ?K??
+M\O?0>A=&S7H7%G^8]>ZF]NYZ"]:[,'IWO07K71B]N]Z"]:YOU*QW7>P_S'K7
+M&KV[WH+U@VB-%`'?8$H.K-&=1DE)FT/RNL-Z\$*9_Y0`@/Y`WIG?]S!2E#N.
+MH+[YA40`!5`$)9S#B`"```'FP$(A!00!``84H""@2`""2`(!`"2^'@D:]"""
+MD$K\%4'E!Q!)W_<P^OTN`HQ>#2(VST`1$5$`@!2`!!4(!!%95=$0`B`*"@,(
+M*`EHA&2SYF9,1?$'#D!Q_4#`"`\]H6;S$E!%Q&9+(@50`#FTHT6($2%$HX4H
+M@H*JR*2JBM&&$0"`D""0&E!XXZ[X@[!^,&!T*`HC;;""J*`*$4`:D31_F9+.
+M?\H0``B`!E!$`5!5!0+4('/W")%4*?[>'\P([AT%H_E5O>TMH48TS%TA!42E
+M9E-31!2(-@E061%`#0`!4/2Y&`&Q!`@*`0$``B,$1%4%!`($5%54``4$X.A]
+MW>&,_R"L=Q2,_BVKP0K*W/``(B*"00!0`$)$4!)$!!-W/P)&#8B,*`"$$%0Q
+M@)(*(`$$15*)INCVWSGL-/W@K.][&+TN+GN]'7K#$D4D0HTV"0%1D:+%BEN;
+M&E2(GK(JJ`(J`@$:A4#`"JH0`%5!515!@$`%%%$!0?F[?3*^:^O['D:_ES4W
+M10@`BAC=;$4!!$(@5`1!5%(!):0@8&)0#XVO@XI65144@``"@"J$`(H@BHJ*
+M\TT-?@!W-/@^@M&W<UUOIPT1`6]G@!3"_+O:9(8`!4"1@$A1%9$T(`HB$(IZ
+MQVR05%59E(B863$M"A5@!$)D0%`)!D19O*\1)8"""J(20'2X-;S.*!Z\\S<6
+M6YKC\$ZP8=\W,/J?7*K1O06$V[;GX#$^(41@4%1"0A`D0HT&B;,\#\$1B+&$
+MB-X[[VH?ZE9[T0<3`JA@4&#$H!X#,&!0(!!%5(W[I"@V$=]AT!^\ASONA`98
+M[PA7ZOL&1K^7TND\$]V\'A%C%G&^FZ&@(JD2$"HJ$A@"(&0"]+4`6&8#HLY[
+M)YPG_85NNC,:"=2*!MD82%4``GAQ`(0H"`@J32X39!X%SC?0-\/-.S(C\'T#
+MHV^WM,DB-NMU>]P<3+>M$0%B(`("9F06)"2&A!$Y`0T@H$28MBUK5M7E:&^W
+MU[?.UW7IO6-494ZMM4:I=@$Q`"`K*F)00$`]2(R__LW<89S>>4CZOH<1O0XW
+M>'#EJ$D(W2YW``"A,H@10E0")2`&HACL*Y@$`F`M92EB$N14DQ#&]4YB*&FU
+M$[$02(*X4LJZ,A81F`$4,#I/"H1*&&MQ\:_.X7*'*7WG(>G['D9QW>$#`41O
+M>[ZUT8%%$JMH``F)@!@!`8$\DGIQ8@"X5I@)5]YZ0>_\+&]Q2AG4=3'UKBP1
+M6LQI*T]=J`E0%1D1`$%9@0410?3U[^I@O=%A@GG-Y?M]?=_`Z-OY1GCHNXCQ
+MB6`,VQ`!A(B:?R`:(`MDE4@CM`1(T'@P+N_`N-QR-+0=KV9T8^O2I==>WES?
+MWKPPO?OD(_?=]?YCR_>V.JL@QI=:5341"K!"]*I1(0:!H#B'\+N^T??LBOD>
+M5(J/,&=T@"*B(C08`A!$CI8($0B5"!F`%"U8`PHH1(!H@#QR$#.>R8YO[X5T
+MNE/=?.Z5)Y\[_PT7AL=ZYW[Z4[]XO/W0H'=4?+N<^.`*A"1-$^<<-.&Z@"(I
+MA-LUN6930XR@.90@U9AVNOT:0`3]ON<%?-=@)(?"\H,5$\IX^%6WEP(`*0C(
+MP2-@S-DT7A&I(*J``"*`"*)!9`)&856+9#%!,74H\ES9FG**B4F37$=AJ-U;
+M^^'J*^L7OG7IV;W)^I%[VZ=/'5F1N^ZVCV23,SJQ(F@U(:*@*N"`8KB.&(A(
+M51%5!<"@'-1HFP163%HJ:4Q]0X1<P)B>P.2-YNF.N.%[?WW78/3&TX2(@-_6
+M6>!XJY,P(*#&1X!8TP"2N)DH($9N!R!%KXA(",`@6B"CVFJQES1P*:2V:P*5
+M$[U5YYL[Y8LOK#]Q8><Z#.3<N2.#;C9H9RMZQ$RZ'/JBR@H**`B(@!JK*`@`
+M2`(2?7EA`$1"4``50E550A6-6QDBSY\T!9E(<'H'K.\>C#1:&@*`YLZ>KT.,
+MC=LKWN)\)_CF3A`I(B!23`X!0/2KF=`0L"(#$!*CB-]7TKH&0:!V5<&M$;Q8
+MVXLOKC]QJ[P([?+8L;5C"PNVMGUW]%C^D`D=0J,@$0\($)/EB"&6XP`E&AIH
+M&+31/FI$2@`%BD5?594#HB7&>IY^/YF<?\OZ;OI&,42';Y_(?;.$T!V%A<:"
+M'3C1.+=&T84V"(QD4`F`D`@#@F<#29+6B2]XIS`WQG)E:WK^U?47>D?28XO]
+M=DL,3-MZ=.#/IK/C1MKQ+Z+$BHJ0@H*B`J""!$1%54%%!45%L(*L&B*Y+;[?
+M@#$+BJHJ\75*H/*.::GXKF]J`G,V],$W`!HV-'R[O>_V<8PQNR+.ZV;(@`#*
+M2(3*2/$3$@$A*B*0%5/;GIOA]N;X?,$W]OSE\S>>AR1)6WG:%N_V?!VZR;W+
+M[CX:'R/)(PVRX4DB0N2Z(0309O]$`5!"$3`ZST-&E`&"JC*@HDKD@DO\C!Q+
+MN2KO!&[)=QU&=QY4;3R0-WN-'!B=@^^B1B]H;I"`")$B;@`,"2,!D$%`5B!P
+M"(YKH?V1O[Y77QCKQMYT?7MW>/>#9VVK3FA&%K%(R74R/)+@4M"8G8SF1$@.
+M/"2,X3ZK`!%"`"!2D.@9*0D(`+(VY%P%P,@^P=B;@BHXYPM\WZ^W%4:'X^'#
+M`#D$%SW((P((WND/14YT$Q_'O#03`JBR0T1"@\",B*H6/:$8-$W:B(`XJ`$Q
+M5E/9J2_M5*]J.BKV]_=W9BVS7.SK_OYDL&:7NFOJ<A\&:C)@@T$`%44!HCV+
+M^06(*`($55)5B-R`AM*OJHI*"BHJ0(JJ"BJH00&C75.&AN_V3D#2=S]O=+M\
+MH2`HB!Q/,R+R[91TS+X((E($$P$"S?&DB*C45"(("#$P*:,P>L)$XTM9Q=05
+ME][LWUA_:;MX->VVM[<WKUZ]WAUDSS[S2AF&)^\Z3F<>6**EI'?$V*P<3Q-*
+M4`U2)+T!`<W][#F;MLD/(6+,/:I*`$`"$40"4E`"4!``5405"(>2IN^,9.1;
+M!J,W374<%(]NL^BA^1<=>#_S0A@ATIQ8!@"(,>R)037.Z^A("H=M%0$!*E!@
+M(HQ=:(H&@;5&#5G:<E(CI$H2M`">J=V[?//)]=V+U':;V_O7;VS,9B./.TE>
+M&I,^_ZW+Y6[_XP\_EO#JM!CU6IF6'J)!B8P!(E5$P+KV[78V'!<BD.>Y0E"`
+MVA4"3D#3+)]-:T/6ILEX7"99*J(`*B)$+((`J-(TG"!2$^A]FQK<]_YZ^ZS1
+M86H]'#I3B$A-]AEP'KTA$*`R@!(PH*`P48,PA(B7:(I("3```;*@(@$810-@
+M#9%ZQ)H`E1PR:"+>%.L[+XZ*JX%F15VO;XQW]_>R+IT\M])>6=J?C&VVM'MS
+M=.W*QGL736HSG05`1E0@T-`4=U5)`)(D<4[;[9P(JMK5SMF$;6:S%,;3D1/M
+M]7NS:5669:?3:5+>*M$L$7!X9]&VO^,P.F2'YF7V)CJC@^,\]YQACK:&M3@'
+M#<4VC+G?C9&#KX#(1AE)`P,RH"HI&D4&1*@-.T;E)`%KQ8;UX1:T]SD9MWM^
+M6MB-]:V;6YN:RO+)SO+)5M*K3+>==[(+XYU;UU_I?-BVI>-*,L8VM&Q410U`
+M\2VF*>_OCSFQS"S@TW:B&BHW*2>C;B_W3KP4/H0@U&(>#H=IGC1O6@%`(-XY
+M[Q0D?>=A-,_WW"["PVV/YW!)=5Y)C<D]F1\7`E9LP(<84]BDA*2("A880)A4
+M*#*BD009Q!K)$_#>*U%1C4?3R:]\YM/ME?+X>XSD4X>Z/=ZOI#Y^9NW$Z7:6
+ME\Y5"_VV!;[[W-$K7U\7-T7A!-HJ"ABO.@(B*P92`@C>MSN9S>RTF`2MF8.H
+M-U9L<,`\'9<DK6YO%8)1X4Z[YZ0&"*A`"J)-0>0=L]Z&3:VY_(U;`W/(:/27
+M`;&A_"`((A$)Z@'-`Y"05)60`6]C3IO_*,9Q"(0@I*K`&HG38-`G"09?&<.S
+M(,CA^5>>[4S@4E'UCMND9R9UZ:%D5A)HFY9'&?``S&QPI+N9;EVY^.J18X_G
+MW*JACAQNB)5?4@(4",RL&*;E))!K]](Z%)/)/J<Z];M?_?*W&+IWG7K0<!M\
+M6LU\EN6D+`BJ'B`&:X+O%)8(O(W6J'D^+UX@(0$`(2!BA!$A`@@C(<>^Q-LI
+MH@,K!=!4/.(O8R$C`$A"&%L.$9`(&$2E1D4"3QS:G4Z:V7OO/[?A7]L'4>1^
+MDDJ2CJ=;YU]Y1<N%8Q]^+REUH6O:/9,-'GD@O77KEAX#T:8-;=XG@DTQ%D"P
+M5G`N3%K]#$RQ/UP/$)(TO?#R\S?6+[_OX8\?.WFD&`5K;6_0<:4'""@4][68
+M?()F5WLG=)*\3<GX>9U"D90`"9#FBYF9@`F(R!!;)DMH^$V^+#5?!L'.<T1,
+MP`T)#9I'!"2UE@`]8*CKF?-%71<?^/#[-L>[.%BH>WW?Z26=Q59[H1KZG=<V
+M<5\ZKM6'I:-\]]'DWD<>^'B[M0B)\UPH-M1M@L@\441`DKJ>)3FU^\;)^*EG
+MO_RUIWY[-+NU-[KQRL7GCY\^<NKL44XPA."<4X&BJ`[.P_R4R#NI%>D[:XUP
+M7L*.F5O0&)PK@!B*U@B)@*"A)S(HHS(&04`4AIA<)$2KBLI"6"`JJB$UBH1@
+M(";T"(F(0D#P1('(U5BC!N$@@@9%@G[LO1_[;W[EO[VZL=/+>R8+28M/GENM
+M>A`FP_%03BT>7X&3-:RD<#0DMN[M&"'#4`>(C?P*`30HUP"ELDL[N#_;NG#U
+M_/K.S:>>_H9"X%2>>^ZY!Q]XZ"/O_Q'P^61WMC@X-AWZLIAUN^VRFAWL8(*@
+M0*``*,TCZ+=A'<5D)7V/8^XM@Q&A'H0=MZND"AB4B`!-U'8!$B8E#-:@>$?*
+M1IG!(B!QDB4T&P]-FVNM14,GZ["P+P'0:@ZUB/!H:9"7>^(+&:ST=O:"1S6I
+MD+46J2Z+3L[&T-A/+]ZZO++6"Q/?YO;1?&7J7%7ZDXOW5+C93K.=C2MWG^JH
+MJUROM7G+SNQ2RD>L'&G3>Z%:@<(\>B3IE:3,LR!I!T(%P6MBO<"^FM&PVKUP
+MX<J7?_<KCWWPL4]^\H>?N_:-[8WQRQ<O?ORC/_6!^S^&+E,Q`:`<EAB0B:IZ
+M)A($5!6\H`B(@JH7;++?C0@`:"RZ$)D00C36(B$$`0`B8D8O+IYD58VT!V9+
+M1"'<9L,=KA:\/6)+WW'?B(@(#BI>T0WR!K$NB\PF"1L$,HQ(Y%RQMU<N+BP0
+M!Z4Z!'6A#()L;9(F>U,`X_L+/"W7![TEE^K>WK9-ND0F29+1=.2"7VTOJ"LO
+M77GIN<O/_/\^\X\IT3ZF/_>)G_^)CRRE::]VW,]7,Y[DU@BJS2I-)F@9]W,U
+M"QD<S<-QJE=DUK&2=JPQ3J?%M+O2V9[.,-2]7C8<WLJ[^)6GOGQYX\*KUU\]
+M]^!=_6/9W_A'_Y?-6[OWGWO?AQ_\\=.K[S5N0-Z(@$I0!54!$$!51(BEVGD_
+MIB``2`A>5:-2`"(A@PJ("`"J-D^(*-ZB(00D!!10.N!'B(B(?'<SEF\]C.[P
+MJ15%$(@"$!I4!+!@&*'3SH/S*F`M(:MJG>;:[O>J6GQ58^IMJ@(J&`2FI1^U
+M>T=[G61K;\1FTNKG6_(:YWENCF#=DS&=&"Q7A5:[U>=^Z[?^TE_[]T-W6N3N
+MW'L6E^YY;W<IS;JY0A;0I:V!*=DB>D8V0@QIEG;R3H;]-IY(ZR45`G+$E<?$
+M8583^7(O2XNT54W*_>>O/'_^RI56?VF_-,/*OW+QPLN7GO>%O^_T@^^[]X<^
+M_.!/;=^8`AA5#;&$-L]-*S3_Q104`!Y.&2$!(3`3D5%%[\1[3V14)7+<B$@U
+MHD5BXW@LOLS)W=]]MN1;!J,W;183%(HB5*2(2HB(&AWBX)'()$QLQ&E9RY15
+M+"?43Z4:)\F,,JA$*S_=W;U^X_+6#S_TQ[>VI-5N[T\VGKGRM7O.G.MU[&P\
+MNGYS_;__1__\+__EOPS!+O;;/_E3GWKVYY[Y!__T;TF_2EK:`J[=9#R=(!O3
+M:_<Z'9@$$B1P@,$83"C+;<M**Y4^5RW"E-C6.IS4$\!N.K!DQ[.P]=+EE[_X
+MM:],:CA[WT,?_.C'O_3$%Y^]\M5R7]>6EA<[2W_\D[_4-<=WKHX-I''G$A$!
+M5=6@*""J#6E-%302]N882I($"8B(R1"1"*@Z[YO$K"JJ!A$!%"(F!B\.HES%
+MG&U^N!_F^QY&;T15S$0KHJ`0!D)@1`(TR@0<?+"952,SG:&=YGW%Q-6P7>)N
+MC7OJQY.]R78Q'!7CUZY>N/#TK>-+9]YW]\?*:7UD[?2SYR^\>OV2&]'?^D__
+MRW_SRU_ZW_WUOUZFDT%[93@!ZICV8N_:WHWC2ROCZ=@FK1#"PL+":*BN'OMJ
+M@A(PH')-E%JV&;4R:&<A3WR60UM"Y@25,VY!;<83&LXF%Y_]UC>NW-JYLKD#
+M^>#A$TO_Y#/_Z)EO?E7-["./_UB]D__41_]T'\\FKDU4U/5,R8:HO:4@`41%
+M(7)"M%&5.+!.0`"0I!89F!F4$`D%T#O%N)DA`H805)08K#$V2<BAB&]`J@&@
+M@9-\5UWP[[1O1-H8(8FAOE%B)$1L]_)I5:C.LIZ*+;=FUT?#34^C87G#Z<05
+MTW$YFE#A,`QQ1WOU;WSAUT\MW;W0[>_MC:Q=^/K7GOB'?_^_N7IE^Y?^TI_^
+MY,]\*!M4^Y.;W?:I<3'>'M[8F>X?-<=3NT!L]J;%SG1*:<9M2;L*FQX]&=;,
+MV([-<EWL4V^0+)C`"265V*JLL$.VE>SZZU=O/7?^6U\JBN+*^FAG6D^FDU_Y
+MW*_L#*_W5SNG5]^#=>M3/_9G%LWIK&Y7DVJA;ZMRY)$54`)X!0$50!44T*`@
+M;T@W1@**828B@&AC@(B0%%``,:HQJ0@1V833U%K+(N*]>.^#B]L<O0.MT9WY
+M1F+$P"0&U"@P(J,"D5?01*#EI[QW<_>%ERY__<;V^8!%44QGL]EL6E.+^Z?:
+M23LM:J)\Z9O?>O7F_EY_82G/%\YV/_"U+S]W^LQ]__/_Q9_+.OC4,[]^_>8S
+M/_+#/^MD-UM,OO;DL_<^^LC8R_+BFG@_P_S*<'MQ;7D:-O9AJ_"%JQ`86MQ>
+MXGY;US3I'^L=,Y@$%0<UI!+([TQOO+S^U$N7GAKO[OWT3_W\Z$M/KE^\U.V;
+M(NR=ON<XE-2WIW_F1_Y,MSJB,^.J@JB>3$NRH$%])/\#"B`HJLIMOT@AS%M&
+M!`*H!G$L2F1$8OL1,*.U[+UOZ-T@QI"UQA@B0B(&8&.TJE"#$Q'5>:SW3H+1
+M'8N`&8`A$"`3,"@1"<FXG"R>[.SKYE>?^ZV7KWT)V\/6<131Z4T<[KG-\62A
+MO;"VL&P2.]XO/-G>B<&O?.Z7C__27TC0&&@_]NA']W:W7KMY-1_(RNJBP^+R
+MK5>7%O,O?_GI)U[\^N+1Q9_XR(^^]_C]/4@`X-K&SJNO/+<;KI`693$N2Y,9
+MSG0PP+6N'H%TL-(Y@F4R=85/O>GPN-J^=.VY;UU\YMKZU1/+9T:!GGKA><VQ
+MW^H>6STZFY0/W?6!'WK/SYKI0"I*%0-4-L?)S"%F"J1($G/32@*B&/E3#>?H
+M]4N\#\:`*JM&)JYA9FNM]UY553T1&L/66F8"`!&9IVUCC?I[HG_R]PVC;\\K
+MDOD3/>3YL0HB$0@2PKP6H&JTM9!OS*Y?V'[BZOCY]FE9/K7@:9R;P>G31[_X
+MQ6?!R]3@8.UT,2FS+#A3AG:][J[\HU_YK_Z#/_L?A!D^^,!#3S_WQ1N7+G87
+M3XR)1NL;S[S\F;)\(E"R>.ST!S_X_L>.OS\#S*#.(6VM''MX[?@W7IWL;EXZ
+M=^+(WF27P?3HV!(>S_Q242?&9Z*I9G69;8[=YK5;YR]>?_GJ]1N7KNW^T`_]
+MXG_[SW^U-K[33I<6VQDGRX/3/_S@S^33H];G1FJ5&7)9>E#NN&"!K*M]D_5A
+MDB`AJ(!*X[Q$HN^!'RYFGL]751%5#$1D#*=I$D*(O\<8PR9FX21N?]Z[NJY#
+M"$V#"01$CE=G;ISFV\+;LMV]E=;HC8WT`,!`I$#09#EBB1Y8Q]5^F>Y=V7[1
+MI;LKQR!==-9(`CH:[CW]XC=6[SW^OH^\_Y7++W73Q<6%$PE6T];V>/W6<]>V
+M?^VWEG_J(S]C(/G4S_RQ_4_O+;97/O*Q#_?3WF2LWWQ^X\EOOC`;T?&ELSG8
+M!,HV8`*N15D`__@][]N<;+T\6<_)M)-%F'06\KNZZ7)EB]QD7JO`DXWZPO;T
+MRHN7GKFYN5.4=9+WOO34$U,IEHXM@KCA]O3$N?M_^.&?S:N!K5)3(P41A4#H
+MU-2:>F7TS>TD",X['P(`,K.J!E`1+R(2>WR1R43TR'QONGTF\SP/(8@(DC(S
+M,P*H2&"V*B@B(D$U1&JWJM)<DIN:/KWF<H2WQ??^C@3\KU^QQD6,M[7'!;VG
+M<E1M7-EX?N%<W5O-U<P(@D!Q;>OBHQ\YUC_3Z1T9B^92P!-?_9T/?_!#^0J;
+M+@TOU-]X\4O'EU;??_\'7GGYTOUG/O"G_LC/)Y"D8(L6/GK$?.I'?N%O__U_
+MT*>EF=L=6'/YRO-N6CWRWH\@6.^RGWCL9[^Q]<+VQO4`G>F621=.8-V3\J;S
+M9:#A%#8VJ_-///]E-]+!XHKI)/OG7]T8OD8=430+W>7,#QX]^_&CV;DP!.M*
+MC$9&;`BY`W9*7@6#!U1DDA"\]SX$:RU99@)2]=X+B#B/!,S$S-8B&E:*)!=4
+M:D0%V1@4CG02(@*(R6QE`%$?#96J$O$A<<'7:96\G9O==SQ3CJA(![DRBB8=
+M2-(6OG;KE7&QWEODU*@!#Q!40ZTNZ]CC)P=I6B\,,@W%U1L7UW>N]8]E"\=;
+M2V<&6\7&O_S,/_W&-[]ZY<JU/_:3?[P%`^,3/Y$^&/6@%7SH?1^'.EFTK5__
+MS#_[]#_Y[Y[ZZA?^[M_]?^[NWAK818+D@^]]C(K@QL*^G>"*NBQ-;>#IR%_?
+M*BY_Y=DO[L\FVWO%!S_P(W6H`\UL)RPLM]/$H,>///)C]QY]I-CT7*4D`EJK
+M:E#RFHJ8H"3*(;K/(D%$5)F9K+'6YGF>M?*LE:=I:A/#S,:P39@3VTCCS*]]
+MM$S1%,WWJ*"J`(*H(@V&XBZ)J'%/O.-./C!RWY<P.DR-C<\%55`D=K8??$X4
+M-G+^U>>RW*\LY@PN!].6/(=^EJZ=O["%KMVAP4*G[^NPN+I62+!YEO3RP?'!
+MTIG%]>GU7_^M7_VACWZL@ST`,,;81`7!&K`M2/+6>%I^Y1M?O'[QU7[>_O)O
+M?WZAF_SZ+W\:U>20O__XH^V02Q%031#DU'97LXFL;Q57G[_X]'`TW=GV*9^X
+M\.K6JY=?KF&_=/N==KK0&71-[Z%SC\@0.F;!:*)*HN@P.)0`HI'<)HJ(0<2'
+MX%6`R:1)DAAF1`9F3!*39#9KI6F>)*FQU@*`"$33\L9U&%*'3J\T`=^AEQWV
+M*&+B^P!>;\/ZSOI&B*HH\2L>48SU1!&M=G=NG7RXW\W8N2JUB8;4:5MTG.4+
+M&?;28-M9J]\S_<7.QNZ&XMDC)XX,J=*[!E!6U:WI/>?.53*>%>,KK[[RU%>^
+M4$/XR$]_<OG,@Z?O.3G;WYW.9DF>_>W_[&^"PO7=K1__Q,]<OG+AR-F32["R
+M:)=N3?><<Z7?IR2#9'3MUBN7;[PT*JN[SCWV*Y_^K>/W+W_NM[_H6R[K)&EB
+MT<-TM_R)C_]"*OETKUCK+-0J7B`H.D4'$L!);+86KRBJZB2(B#&&HU^#Z+Q#
+M1"!DYKEV!!)!'6XW=A(Q`!R4^G%.N;TM'(^(@)%=0^Q$0$00F^S1P2Y&AR[$
+MV[.UO65H?5/?2!$413">9!`X4&D1[ZIN*SUU;"U%:F'>@>Z`EDQM>[U!FF>S
+MO:I-Z7#\VM(*GCR[]-J-2\/AG@6$=$;=VBS`VMGE!+1'P5<WGW[ZUP>#R:1X
+MX8EO?OKBS6_8MFY-]B#/9L!U8B<$3UZ\ND/#:\5-!V"@<[1S%BH$+$.VLUN_
+M^-KV4Z^\]NSS+UX]?>+]&]>K=KIRX]KU)*6TD_46!DN#13>1A>SD`Z<_(#-M
+M&S.;[?LP]4JUI+7:&M3#5'"$NH\R#5+[6.U0#<&)^*`25%2C1QSBWD0$47HT
+M@@R1B0PHJ6#<L[SWL6A_^+:,F(BQF[76S%>2)-9::RTW77JWU]N`(7C+K%'#
+M5G[#804$414%"-%]A-#P;8KZ2&?U6'LEJ\=9NM2!/.$!TNC8P"QVVQ=??O7$
+M6L<F>*P[V#]*#]Y[:N/Z9IYEW86\U^N--O9'>_L6N)+Z=[[\>9O+W_M[_\6U
+M3?B%/_\CSU_:^_?^-S^6Y)W>X#U/?OUK'_[$3W[V,_]J<04]Z+@J]F2&Y#W`
+M[O[.S`]GN''IUHLO7WK^QO7M8M3)S?*S3_R+-+.EW\F7LRF+!&:7A3%]\I,_
+MO;<Q6TV/4FI<X515!53CV!%%#:)>E51!XHP(0%4(04-0"C&%F*A&KDAS:46\
+M*I(UJB@22$A5O??>!U6)%@>-(0.(%"#$PARA(J(Q)&()8P&%$=F81$1\_/D0
+M0)H[]NU!TN\;1O-A/Z];C>1!DUW#IFL($``-,"DA6D`)*$J>T;-4:;"?^M#/
+MD0Y;(;01&0(`9*T%2*[MG5CYUY_[S.,_]$"GU:O!W;763JM37_C*B^^YY^']
+M8J??:ATYL_*[3[Y4@UVD06=P]-KZI:LW(03X["]_[4__>S_ZVJLWI+58TMKI
+M1WZTU4[OO7^MF@VAHK.G[D=JG=]]_N7=5]MKV>^^_)6D/W9EM;M?@?0'[2,O
+M?>N\+R9D`G8$;)YVVE;;-,Z.MDZ=6CJCLY9SEKQ%3"M7,@.#"^)8)2B)I!(X
+M*(.J.D5@BQP@5*5WSEMKTCS#1KE;50,B,MMHA[Q(556N<G./F`!$">NR`H`D
+M2=(T)<.$B*1>:U!`0INQ!2(%1([BVBB@2%Y40A`)B$ST-HF6\)_Z"W_U]XFC
+M;R-S_@;.6H02-?U#!*A(B"1$P`@)<8)9F_L=7LZT;T(O"6UK<DM<>S<NG%KN
+M+702!#\=+_462-J_]FN__N$?>0Q1M*CWKNZ]9^W1W/8+-[MRY>*KSW^]GL&L
+M"&?O>7#U[D?:R\<OW-B\^_[[>CU35)-''GGLH0]\^.C)1_:@^/3G_X>K.R\7
+M?EMXMKE[;6%I,>'^O6<>Z>8KWWSFF2##]@!FNB,V)-D"NSR==3_Z\(^=7#VG
+M/G$E&<H`6"56-8*"`U!`@Y@(6D0;&4*1[RD*(?CX).KM(-W6[P8`50Q>O??!
+M!1%I)E#$1CU54"0D!!(5"8*$QK)`B'>H0D,_B1SQX,-!$TX((E$A@/CMV=9^
+M_S!J6FWT#4=ISGB_O9?37%J#`.+\#41"-:B&-"5J6>HB=,2UO&N!]`$[;+).
+M>TVA\\KY"Z?.#:IZ_TAWQ9IDT.^ANF>??O*>4Z>/++9>??ZER5[YD0<_EG>Z
+M5UZ^_/$//[JU=?[#/_Q^['0>^J$?=4G[E2OKQ\^>.7[\KA/WWG/?Z?>%I>[7
+M;[WRI>>_L+G[<E5MFM1WNW9G9SU-,D.MA^Y_[,DGGKEV[5*K3P$FG.%T5B;)
+M0DZ+:_F)G_CH'PF5,9CY&A!M\*(`/GBOP2MXU1`?17V,RU5U+B2J*K'A-@2/
+M1,QS!2:*&H-8EE5P\P!>(Y.841$4""GFNYUW(L+$QEC%T+2I-/W_2%&91(&9
+MB1B`O),0!)&8^>WI&/@#P"BBYHTPNMV/=K`4E5$!A!J0(0`36`"C8E`RE%1"
+MXFL;7`:AC2%79SK9(MO^Y:N7B["UMM8?4!]($[$+G<6;%Z_OWMPZ=_)(-^\\
+M^^R+2\>/GUUZJ+^X^*UO/?W#/_ICK:65=&'EW@]\;-!=_,TGOWSI^BM!=\;E
+M^G,WG_S",Y^[NG]5T]EL=&5_[UJ[8PB=3>UL4H"WC/EG_LUO='M9JP->IWDK
+MF<WJ3ON(3I)/O/^G[CIV_W!OFJ==RZF(U-XCDQ)(%*0!#$I!U:M*"!$Z,,\9
+M*C9=>"YX:ZVUABC*#Q``B$(Y*U6:4DE3JS^4RXZJ21)406)UA0F;P3>QOR:6
+M!0298WZ70@C!RVV7Z'MT4SN`S>MM$A[TQR(=(F4#Q3QL[)%50F!4`F#&%,"H
+M6I$$(2%L$>8H.5<I^"Q)!DG.WWCZ<_?<>[+VU;)9.FI/+G97SJ[<=^O2^LLO
+MOOCH^SZP/9[]]M>>/'+FGA/'W_/A#_UH>^7$PX]_XNY'/KP;]'//?.&S7_BG
+MSS[W:[N[7_7N?);OG+ZKNWJB"[J_>_-\-=O+<S.=3CJ=EO=:5W#UVHW)N#!6
+MTCRT6AS$LV86%MNT^B<^\6?9MTB-8<N4B"J`<F*0&`P#,Y`!0\B&F(GI=3XT
+M:(,J0E5)DH03$QFT1"2@P0=7.5!`)4+B.,!-"128N*GO(A`1(0&"J!A+VO17
+M$2(C$H2&P^2]U'7MZC!/3.+;IN;V!X91A,D;8=2@YX"V1O&L-;/N]$#B@6-I
+M1$!!&8D-`@($-#ZUE'N%P6)W8_>URU<NG#MU:M&N>9\=H3.V:A]=.+UQ:WLX
+MJ5N+JSO3\NN_^_2HGHZJ?;0\J>O/?>V+G__ZYYY^_HOO>>_28P^M/GA/?WF`
+MJPO)H)>1.I9RY]8U5\XD`-L$%)E;52G.:6*2RDU;;2(,AHRO:7?#_>*G?NG>
+MM8?#E/O=3E%4M7.(R)8$4!`"D"`!&8QU#0-L.00`%9TC0#4H-KA)4M,,&%6)
+M64I7>PV-P3JXV>*U)R(5`%1&;B0R0``T25.!QMI%#0GQXIRO:U_7=5WYR#`Y
+M:`A\>V#TAPOX(TCPC=MO5.[1J-@"``$/='L%P0-0%6IF-(T2L(H@$:&0@80"
+M&DD2ZO[X8W_B'__*?^'V6YKW%LW=6'4?6'IX@S?7?O*!?_[;__+\A1N[]?Y@
+M4;YV^5>>>0FYA);MG#I]]O2YUH=_]&/CR?:@Q5F8#;)T=7$!`+9'DPSES-J)
+M3M+:VQ\[I>%DDN2&B=)VMC79,;E!HV5==/,>!NA0YT/O_8B?*$L"'M0#H"CY
+MH.@`@QH!X^,'Q.@,253(B58@UL>(3%0+!":RAHB\KZ-CI!J\KT$(!`_S)MYX
+M[9L,D.+M)JUXD@6#5U<[YUP(L46)`%`;<>[X>]Z.)N\_G#5J/O?MN4&'3T34
+M=*##'C?,N_1))-0<;TZH%1RB*#B`D)AL/*LZG7P\G@SZ@\1D+[_XTGO/?6"1
+M[Y%Q%V9)-UU&['[XL1_75O+<*\^U>C2;;;[\W#/WWG/Z[KN.G#Z[<O<]1V>S
+MS5,GEI=[G4&2+_<6,T[R)#W265KN+YX^=>;N>^[O]X]N;@SW]V;&YJI\:W,S
+M33/$D.=@F8*3%#L/W/V!]][]N/%="V8V<\B4M5)%*9T',H!&@!2BG)H*"*@(
+M2&0DJDK,-=O$V,0FJ2%#29)$_QL)F5DDN-I#0)6#H5AXIQ5!``!1:;+>C$F:
+MZ%S[0`6\]ZYV=>T)#1$98XDBDG3.M?R>S!L=I*%O'U`Z]&8/=[K0O%5J7@I"
+M0<2@/@0A$A>"*"!)G!Y,",JFX%E)91A6RX.U$,I[ES[8MNT+WQRN/;R88)Y3
+MJH5O<ZNLRH_=_R._\JN_/-#.;+2[UEN]<?'BF96!Q1GK<'4AR2RT3=Y-5PVH
+M0%G`:*.^,9F6KYW?N7%MN+XU2EN]5K*2IRT/+K'3:5G,)CN+B\<MV?'VJ&]Y
+ML;>8&IM)@@A6N?!U57E**$W3:>F03#,.X$"=F)&4A#4X3:QIM5HFL2$$4;4)
+M.^=00BR&("*(JBH1.0U$1,WF#]I8$HQ.]US@5A$1YM6.VSTA\2P3&6,B%F-M
+M;BY+1V\/AOY@,/J?7O'6B4/&&X/<W&A*1!)%T.?=M/'64HHJ:3"<[2PM+.4A
+M'^Y.B/U:_YPQ]O+5U[9N39>R-J4V!(-2V-JT;+)B^WO7;VA9U.-QD6!BM=]/
+M^YW$0!+`!"BWH?1U[7T]F>U<7;^T?F/[XM/;-R[M?_/YR]W!P@<^\MCQ$Z>G
+M;GCV[-G1=&]CW<_*PH"HHO=^=VL3-,R*,?@<6=,T+4,UF<P"4I:V*B\`V,@R
+MQ^97`$!E9J(FA4.`@HHJJ@0@J@AA+DZ+R$C66E_*'=?Z`$#(0$@!`@@HBF'+
+MEH5NWZ@'=5D1(30'-<U&>EOT0'/L>Q9&;[!)MX_CP7%5%15$"-J$%JHJ4?@\
+MGERER`0E(D%$=6*UT!)]@F`LD`U)SYXXMIC-9F4_*[VV?*@YJ55FB7<]"\Z4
+M>^-U@>GQT_>>N_NNWN*2@UI`)C"=A6HR+LO2N1KW]D>77EM?O[RS=V-V^>*&
+M[,!P>^]KX7=+5^9]["ZV.*6\G2$'9I.3X9)OK5]7JOJ++5_RK*KJX`&@E7>\
+M@O.!A!`T0%"$>406KUH@$!45\0"FL1P2.':C`6@(H$$)B<A:JDTM`6*F(+K2
+M""`B2$C$B"CSS`\114;`84?J307:YA79MX]O])WB8NO!QHSQ8U.S6<=Q/X`(
+M1A11&JJ-QJ8^A*35FLRF6ME^VDT(ZEDAU%I=.C69;9*%F:M(ZG8"`,Y7=:K$
+M*JNK*Q__N5_XT/L?=Z[:&>X4?GKEYH6\EPFC=U)64LYT/*K&XRHX0YBJ6$@M
+M[+G9]>&MX]>.<'^PFID$EY8'=35V1>G+"@OO1B[([.;>E93Z)FFE:>H=U"Z`
+MJB&KZ@54&\&KN7`Z-!2-$$(4S4%DP1B@SNOMW&268_+'6NM!@H0#WMF\MQ@%
+M!2+SGY0,(6,<'7D8+G->M@#((6WD.RELW^,P>A.;%$$S/]X(`$?B6FS!GBN.
+MQW\P`L:1#:"D0<(,+.7,IJIK3TI,1!R"[W0ZA"&H0R-*ZGU`AG;6N?OXHP]^
+MZ)ZJG/[FEW]'?.7#K*AGRVN#:]=N4&*)C//J2JVF@;QDQ%/DQQ]_G+%U8_UJ
+MJT^M`:B='CLV.'7N['@ZNG3YPE8Q,P;3;N*F];6-B_<?__!H5L]*GZ5=IER#
+M2(`D,0`2(!"J;Y#$B@R"QC*XX"'.#@V$"`I>1404(#+X:"Z"R8I)G@'7L2@;
+MU!,2`$8Q)8U-)*3&&),8:ZU2(T/:A/2$QA@4("+G@F+TQ97((,9Q/&^3GML?
+MK!ARQ](W/3J_)VA>%"%LAN7=YM-@,YE%8M:``%2`E4DX-IT"D:BJ>B:%``8-
+M,2)"Z2J;F&>?_Q:8Y,:M[8U;6UL;6R^]\&)9UDQF?7V3,'%5*.O:U8&$#5BH
+M52L:;DT7NLMGSY[M]SLVJ4JW(S3U6*1M.U@8K*PL)TDZ&X]'^^-0R;$C)Y>/
+M'$G3%INT+)RK,,\R:XRKA5`)%2'V-B(B@<9<)$I3V0`%%1'G7'`^B'CO)7@D
+M/*!+0R3+(C7C1Z")OQKG$@40V'*:I28S;)D.!S.-U!,PT@&55N1@2&DDXWX_
+MP2AF*?1-CX-RHP$]G_D#*`H!5``#D!?PBD&@)@RHFE*NM:IZ-H3,=?`"I3$H
+MP8*P80)`'U@Q48;/??XKW_C:2Q=>O#'9F_6RA7+JW"R@-YU\(3@*`8-7%#9@
+MC284+'G3:R_N[^P715&["?)L824Y=^_1@+/);')C_=;-C?7@79ZE"9EJ%JY>
+MN7'CYJ8Q^9'58ZEI^YHT&(-`<;X,!L2HF$Z*#&@(F12B4<"#@CX$`#5$/O@0
+M`B$Q\6TB:!3F82)#'/_'Q(:(J2$2)=9:&QNMM1GO)(<\HMBZ3=3D49K>W$.W
+MZ-NQOL-]:AI;0J#11(@?K/'^XN@,F.MI0L"`2E*#X100*E<S69-:,A""I"8-
+MXH*(J&.R-D_K4-^ZOG7YN==F]>2U5A@_>++=YW:_5TYJ:[TFP8`!LCZ`#\ZH
+MB(!8-5U=.].1JG9^EB_:&F9%/4;4O=%P6OK4I%76<K,JS,+2TG)"^>*IUJ7M
+MYZN7Z_><??_"XLERZ*J26BD'CZSL2110(68L`$)`PZ36LL0,&1&!Y@"DBB+D
+MI$)15"&-%"(5)\B4&@/&JL401(/$^(L,L4%$#!!B(P@`&&(`GK=O*S;J\Y@D
+M!L![)W.*P=NZ_@`P>O.2\9O"'E&BTF'\08T:>"(`K"B@D;L\K^,*@@"B%R](
+M0F0`0$-0902LJHH8E%!5T09@*:;CBZ^\S*XP=5V7X>*WKK[W`_=4QN5&14MC
+MT*M7GT"2`),#IU2K]?6D['1:F0-EF-H*3<)IJN/0[F1UF-95F$Y&"TLKH2Z<
+M<R?/+79/X[#8_]PW_\>05(_=]<-H<I/D!#D**!H4((1H7`B"1W).R$#>-EZ*
+MJIAF22<X]@XS0WG:1C"NGM9:9+G)&$/LJ`76Z"`+$K`:!A`&%?)!?10!0$*#
+M"(K>2W2*F@J)@HBH0@BAKB+M`)B1D$0CQ?;M@-%WEO(=-5C>(%`7ZVO-EPH?
+M?`5`@2`H\Z*52@`1!>6#]@DB$O1!/)+V%[L;&Y>3#IT^<WS0ZU?3F:OK&NMA
+M-:[9>_:!((`&A&`HM"'TL75NT2U"U?7:1[/4TFXR4JEL4@4(97`W]@;.A#)D
+MG2ZEMC5(U<RNK3_?6?2?_E?_\,+UISL=#3Q3]I0P&69*$1)49%4+WJ+/,[*6
+M?7`@H=/-%5P[MWE*$+7GXA;+:AD)#0,3*F,P`%%]L"G,@@+Z*(P4$VN(*$&]
+ME[*HR\(515F655V[$`(B,[.K0P@ABB;=V?'XG5]OA[RZW#DM[77J_=$-Q+G"
+M7SP/A$T3F&)@9.0X9485V)@$R1L3.IW.W0_<>^R1XXLK_<R9"R^_L#>^Y23D
+MG1P7LG'JC3$M)FLL6R,I2BMU&7&O3[7D):`+EKAT]7@R38!P6"RP-].Q*:83
+MF]%RJ^1J:[S7&]MCK?:E\U?[G>R?_XM_L/2_'"QW[YJ4,_`Y2A(_#6F2@$,*
+MBEJ58@Q!``+3YGR_G(3,2Y2<XQ+-U'`P-B63@:2B`CA3"*`J*@""#=M?HERX
+M*HHJ((&2B-25]Y6;)ZF1F8TQR,3,=55%LW0(1OJV#9-X*VIJO[=UQYT1J]QW
+MOD:A468CTH;$+<1$C&08$,A@8AE0B-1:OG+KXG9]<^9WRG(X\^,IC.JLPD6$
+M'E+;)NVLW>VUN]VLUTU[+3-HF7[+<<))GIBLK,6Q!9,63@C,;'_:WG>G;OG]
+M\U?MT07I9MK.]LK]8K1;32>)L:/1J*RKYYY[_@./?TB!D[1M+"<&#`-'`QL<
+M"!CDQ%)*J.H)D(E`,35&I10I02LRF-C44!Y[KY`]@!/5^=A4)0(D`!6D6!I#
+M1@-@O1-7^L8K$A05#2!!121JE4(4HS\T&/D=98WFN-$W(.F@9M(8ITCZ0D6-
+MPE"@A*"H0&C31-4!00!UWD&HC>#R8G_WV0N%[JE-3">UBUF^T&JOI*W%).WD
+M:9:W6PLV;2D;@<#L""!14Q4RFY25(Y\80[9+A-[913,8[YUV5;VCU4R'B+L=
+M'I8A03G2[D[WISX)T[T1D?G5?_W?_<F?_7=##1`Z%#H0C(@0*%+"J(0<I$9P
+M04I7EOW>XFA<&2(GB@!,Q&R8.6:.$,%8ZX.7($&\:FC$B@``A9"IT0`G1B(Q
+M$API*01$$@BH-,^`AQ@:QM8E.+2OO=-@]$8DO1%5`"`(H2EH*T1BEF%E\A"8
+M4%1$2128&!0&2P/3DG;'3-6[1"&GSK%!=S%K]?-VKX-I8M*NL@T"E0^^5@V2
+MH%4O*MQN=6<^X,2?H(6.JVEOOW=-ER\,Z\I<*02!2^^27F^_&+KQ<-#K]]O]
+MDV>Z;@P7;[[XZ[_Y/_SL3_PI)`=2@TO16U2#B$2H,E4M6QV;=VQ5>Z;*&JG*
+M@M"0&D(TS$RL(D",`*I!!2)E,0@`-%HS:9H"$2-[%0`BP*CK+.*BR6$PD8@=
+M6VOOD$[X=K?N.P%&<,C8?KN/IZH!5509E9C(,AE&)A<\&%(5`TA$-K$(OKW0
+MW\'18#7I)'F[UVT/>BO'5@()Y]:A.N9"0W`:%((3":)!)O4XX2P0]=)V&V!@
+M^9S/JZ>>[7SAI>4+F_:UK;T>Y"9I];LG!BU:S&J_N#_<N3:>6K$#3RG:H_<=
+MVY[<V"Q>;?.@9Y=3VT??$9<&E_@0DJ1(3-E)$$`*V7_NI6_==\_C*HESUD*.
+M*$R(X`4"@">#5>V#(*B)4@=-V.6]<+#6$L8F+4`"9C3&U#Y$12V8\V.Q:8Q\
+MG07"2'[4MXG^^!V'T9MNTK'X?_"!;Q]'``29<R8-(3(IDR**J@$012^JHD9$
+M0E#5M1-KW>,8F'N+"]U^+^NV]D9C"E`HU,[7X$4@#9P':GN;><T]+-IVL3%;
+M6D@'*T=/'%O-UL>__=2_N.N;Z\=NCO.L?1.FJV=/^^-'CQU9G9$OL%P[<WJX
+M/2Q&,ZJD+OR5R4;7I/_DL__DZ&#MKJ/WGEJ]9[ES.D\7V?94PS3L&"X)AOO5
+M[J4+5S[SV2\=/7FFE1\+`120F"T``GFM"0-B4JHBL+46D0B-B-2N]-Z%$$"0
+M"!E00!"XT8^G.%$;[MBT#F,H1K4-O>1MV=F^\];H$#/F]<</2'V'D*1@$F["
+M5B8VA@PKBM/`2$Y":BR1`EB1H(*K*RNVED&K"_U.=VVY"&&J8%N=Z:R>B5"6
+M>N_:8%9#NCS&Y3UW9")X9=W>&I47]PJV?_KO_`WH]'5M=NO8:5-=2:T=2UEV
+MN7?_F?VS:S9MY<'WV\9)W;8+?EE$M"AFPYWMW?UMD\BXN+'QVOC)\]_JXN#^
+M4P_><_*!7J^W7Z__QK_^M5[77KE\8?W&MM;9V&]FK7ZILWYWR<W\=#SN]]K,
+M5,ZJI)4#B`^0IJDAK&LP2";I3-P(0+WWB&AM(DC!:PC>6`H>150%FQ$4\TWM
+MH%V_\0UDSH7Z7J6MO37KL)6Z37L`<"&P(6.-L:"$7CUIU-9&``J@X#V!6,-H
+MR(0D[_>F5;74RBE-_:Q@8XFL=Z$=[&+(>"B+,UG9&].%+;BT/;F^DVWL]4MS
+MHLRV1;[X'_^_/O[7_B,\M7)Z[=@N`K<L#=*5]ZV]X";?>'D;`@;G":7?[RXL
+M+K>['4[3/.]GBYVU<&*V/QIN;&QMCUHV'<[&DZO#9ZY\O96VCIX\MEFN:[]G
+ME\RB'>S<FEQ:?Z&[L)@O],IR4U&[_70ZW16O_=[R]N[0=+I":`P2`7F(\V@0
+MF!NR.@3Q*N""^`#!2^7J>1,@4NQP;"C]_S:_\YT,HP,/Z7",*B+6)#9-V"A`
+M"!KSX**1^0Z1^TQ$1H(K@KRP?O/8VB!WXH:3[M+JM):M2=7E_FF?K5P:KKRP
+MVWKNFGWE)MT<)L$8@6Z>3_=&O7:GG;1?_#?/?''_;W[\;_VUA_[8SW_K__MO
+M-J]<>2V%R>#HM>'FCFB6=@E@,6]#D*W-]>LW:H\AR]O=_D*WU5E>/;VT<&*R
+MO[>S>:L8[5R?7%.H3&U>>OZ5;M:Q2YD(IS;A&7SCI2].ZM%DMW[UN0L;5S?^
+M_5_Z#\\>O[>5K7B'[=9"93U#0%94-`8```-8:X.X1M,H>!%Q07Q0B:@APR:.
+M6D$O(69&8(X_N)V6H[EZY#L71G=`ZO8;,B9J;A"IUZ`*#*+(M?<96R)NVHD%
+M0^W*6<F0MK-^!DD8.S%U-76K^?)I,SBS7[_P3WZU^^R-M6O#8Q-=R;LSHEWQ
+M&^/1PO+1T4B=\\MG[K%9_S?^^G_^DX\]_/"C[WM>9_YNVK]G,$K%IC8Q%D0F
+MY2RQE*:VW<T`93J9GK]V?6=[_]Y['CA[]JZC:VN<L;5KUZ^]ZL*HV)_M#O?:
+M2SUH&S<4YVKLZ=6=\VI<JG;I3"NP.7_MJ7/WG%&LQSM[-NNB=4Q1?<8H175,
+M8&8?:E4($H(V!;683TQ;&3+-J_I@'(K4*/.\[=PF85,T_EYG/_YAUQU"&7%W
+M1\0T38DQ0#AH&E0ZC#,"B`H,B$J9IK1=;3QUR1X?VS2].KVVMG3B3__17W@`
+M5I>ZU?8+?^_,K?H^GZ=:8JBWBG)_96#?]_[VT;LN?N:),DM__C_]:_#0O?`;
+M7_KR7_T_GII-7X7-W8\\?OX]^;1O,S8YH+$9=]IE*.I0`U#+6NY8*5(JT^NO
+MOFS%3W:WV_W6XDIW[>2I:3DBNY]9JBLWK&:0<Y"`;6$OV*W`>Q?JUHI^X9G/
+M?.*/_F0[6VA17H49Y8Y(Q!DO1":%D(@0SIFRV.A@`4"<&4<F,0+$#2T$@`$-
+M,K(X46D<ZJ@A+1KGVKRC871PWQSLZY'&9ZT5#"(!4(@.VMW`&`,*(00$%1$4
+M3&RVT!ODV,)RM'MU$Q$W]R:S]N3JW1<^=/<)F+EB8X\K;]$$J.NJR@>=E0^^
+M_\C?^EN0=+_\XG_8.W6\?L^YQ/"O_XV_N[A?;=$L??R4^?A]P^49*&7>F!*M
+M98="F4G(I!8-`;&VVAR<!:V/KG5V=S;+J=F\B>][__O7^B>V<,>W_>[.)N6&
+M$4G4"@K2C>VK]YZYI]@O0N;SY>1KW_J=#S[V8\8,>NVE?;?)9(%3M):1P3$$
+M(4I$1!4)B*,_W8QCQH``JEX%1`$)"-@R$;G@!*29,-$,-?R^83^^-4B".=&8
+MC8%#8A*'VSZ966J/2$R(@")B#*=)6Y,$;>K%&8*EA:5BYG_S*U_]L;M_.)ML
+MT;TG]JZL7]K<.9JQA%",)Y>>?_Y(JP,K:_87/GG/!]_OEI;_Q=_\.Y/UG58[
+MO=$SW1]_8'.))VTTF+:PU9(.LYGH3#@0J()W$#B']I$\7X39^<U.W[?2;C4.
+MXVT/&W#T^%VI71J;/3":Y5509)NQ]1KD^FNW3IXX9_+V[NX69>9+O_O;:Z>.
+MN*D.]Z?]0;?;ZF>FG_)"KV6,83"6$$4,``9@!0@@`BJ@`=2#*$2&.P$(,A&0
+M(I!1\%Y>!YVW+U)[^VIJ=V*HF='3?%XV:%)K4^NU5E*BA@`?I6L)P2"*.&LH
+M-08UGE7TMOK6U:=V9EL+_5ZGUZ^][(^GF]N[CWSH?6,IJQ;@0GIA^[H83!*3
+MLKU5NG#B],H''C_WOD>/WG,V,WQOM_?HRNJSEY]]I3\^_4L_=NVLI1/]E>[*
+M8GNYVUON=?L+B[UN*S>))2*3<MJR[;9M=3*RXC5TVITL:2UV5_=OC1\X\>"I
+MUFD@*J=CYT>4NL6E=E&6B6T1I<-966IH#=J!96MG\QM/?.7&K6O#\=;^='OJ
+M)M-Z[+%.<B8"\<#("(I$P*A$@BPJ"K6``Z#8_#<7]6W83K'7+31DHRA,V^QP
+M[QP8-6K&C?`*`F(LUBN!!T&#)K>4L(<:.2`+$H&:6(,B`L*`X`V#(5'P4:P>
+MF<"ZKW[SMT:SS5:W$T@#ZMYH;WEUD1:S%V%?'CE5?^!L>7)I9SBJ]R<+A:`D
+MV^WNW3_^B03M__DO_:7ZTBOW/?J`>?2>]_[1QWYG]YO91TY/5M2D62OT>ND*
+MFS8"=<A8`C;&)@E;1D++;!)3>H]IHJU4V`*:0:MK*G>LNWK,G#C>.[8YN9(.
+MM)1"``QV;=YM+PU<*G5:808`.AW.RE'A0<<RW9>A=(3[NC.^UANT$DC)$Q.(
+M^AHJ3^31>$""$:,#-2(,C4@7"H(2*2$P1]ZEJ(#,JTEO"X;>5A@=^G]LJ#=Q
+MDI\!MD2)04(A00J`@&@:)62,(X@#@Q(*(\0!2`VSF]V7GOA7M8[R3@X)[N[O
+M4LIYOY4<&X2S2U=Y>M&-=JEN#]J]Q;YSY>6=[2N[^Q_[U,^!;2=///7R/__T
+MK<_^!EPY_W__?_\GQW[ZT=[[3F"/V]S.J$68UD"!?`J!$0!9"2.!S!`GQC@1
+M2C/.6\K64II2T@+3Y^ZR'D>/V_7ZC";>"%F3V[[AE!+&!#$#8Q$%?%E#+2)!
+M$A9+PW)$1KN]=+R[LWUUYYY3=Y,(,@06#^1#`HH6'9-*2!0(E00!$950%0,V
+M"O=Q@AL"S=V!M\G'_B[X1CIO3//J$<$88RWC@22O'K1&"%*D(BE'';QHXH$0
+MD($0`%5D.LL9VVGBC,QFD]9RC]>ZLPXE&0XW=G=W=P=='7ST1/O1HSL/]]P3
+M"_3D[DO_R5^G:Z/LTHV?$K1;N[#UM4\N+73.'2NZ+82Z!MHN]O?=]JS5JE!F
+MWN5)BM0V8#,#"L:"6-`V>[$`;+V`6`P(PW*R,=DYWL%$VJN=L]O52%)56R!1
+M)MP)K:Y)IYJZI.8E\+-6,1O.]B>E)%6=*M>IWTY+W;Z\L?G"^-KSK_[)G_UW
+MV'133KV`*!""@6X(==S,%"7.I3E\8HD(#:*H1M*C-F'_.Q-&`-`T96L``F-2
+MM@R@H@&1H=&04%3?C$@'Q"CN`\!1P$5CHPD*B/.E@Y(L>@@UN7;/MD\OMX]V
+M1\/M>CHT4M<6KW;KZFAK[>0])Q\\-=+?>>)KGSUW/;R7EWNE-=V\'.VM+,-]
+M#SQPN=5N^VI_5EZ]>?GB^FME-PNI,0R]P:"_N)IQ-X$,C:`&%<>4(*&B`7"*
+M%!`J#=.Z=M8GG*UV3[]67J_`>59-)!%N^U9PF0EF1E,>!'*.1ZZ:3JH**M6E
+MU<5BSZW7M]K(1U=[KUUY<3K=R5O,)K&(4?P`/7MG@!6;'GZ%>,,=@A$P`(L0
+MJ(37R2J\DV`T#[MN$VH/Y)M%`@#$N5"(@!J0`-&3(H%E(J-LA!B!1;&AWZHG
+MJ1(=<VA#?7UO`_IIZ\3*PID52'"ZOM&JW%*:4LN.TK!A"]_+;3>__Z]\//S+
+M;]SX1]\\5D+>6F7K:3$_=O]*WNYWH9]+DKKR2C'RUR]H1WDAG29.C-5DVNUR
+MBW(&`I7:UV*,,B!84`2UH!;5,"?J0T)F`18&NC*3F8.:C+0Z:<>WH4*L"!VP
+M4;,$LBK%Q%Q];L-5>V[F\T3//'3Z1S_X^,-''RXG,MY15$(A5@C-N'4`M8@!
+MT<US;@V8J&G^GU...("H!@B@,:_]CH+1`88414#)(%F#S>!#B3=/HR"&0N@9
+M`Q'%38V!4($1"#"*22$(1/?<\&0XVMG:6+CG^/&[3B7=?'^X:U4,0CLAVTI,
+MAWS&`F:8%%LL/_=7?F'EX?=?_*^_N'D!U_J+V[#7.7FV*%-H]W*W9(T]TP\O
+MF.M[829HLY:RS8-J4=;!JF6#ZFNIP`@H6H54TE9H=Z33@FQ@EUKMK&72LBJ7
+M<6GD=F8RU+8+P&+(HLDT]^($G>:0+/G6E,[.\NL7-M>OWNQW\[L_]4>.+!]G
+M,(-.6TMD;GNU*/-&=01F:)1I$$@A9A\!,9+6FLB,B9E]$#C8W=X!,(JZCW-Y
+M]=LL&55-K&7+2"`BQ#B73V#41C8Z^M0,L:>V:>U"5(``&`"55%/!K(9Z,NQA
+M=NSH\<65Y;W)1.JJVT[4.#$@K*T`&!C9@$+::C^S>?V3'WOD')^X^<LO;^^%
+MNK4V>/##=7HVQU6'"T3V:`=[R4LW].HL^.7.<M)*K4T"2!&<0Z\<0N(,`GI,
+MD'K<6Z+51;_8D>[)UM%.EN=`=NA/92N5'Q;%>)+N3XQ#\&U&DW#F,U$-QNI`
+M3<W=R7Y[`[<V]]'+D>63?7MT%@1J;](5"&WP*0$8"DX=`#.#-%H2,L=25!K5
+MQJ&,VC^&6=6K>WN$']\.&-VQ(IX$11'0H+$<Y_LB,C)(``0B$$1E%`8E0`*A
+MF"0!``R`0<@A!HQGS"NY4!;3Y;-'EE;7P-B]];V%Q7ZH'2<9)#:(5ON3$$)(
+M>.*KEWS16SEW@;KW?>3AD]EC5[[RO%W*B]6[H5A@[8QF;+)T,3NQVCUY`R;4
+MJY43M*E-\Q!\T#J`(!`@,1D0S*&US$LG^=12LM+GP8EL!:!`"%3+T>[1JO(3
+M-]L(7)II"8Y`NDF28AIJJM@0!JN:SNKCTZ6RT,UK^S>N;YY</35(>PY8P(2`
+MJFR8R#CQSFDEB*"6@40;U9_8!Q$.2OH*D3(*0D`8E;I1O[/]/V\'C*)4CP(2
+M126I.&@>T]P2HZH"(2J(>$1BMNH/5&T%(4[7U#@O3-$)5P"5M8"D=1VLD42Q
+MFI1BS;&[[QJLKFX/A_W^0NDKVTXJ]6F:N-'TV2>>[-G6\M%C"5!5.;^^=_3]
+M9Z^ZE>-WG3IS_*%U-RW;O:[K=EP&)I^X$%#/GCQS_NKS@IXSBS9!,@E90SD"
+MU%H&QRDE6&H+VZ?ZIQ;\H%]W>ZY'!"9)'!3=O%^.PK(Y<E^'@Z-7AR^'P3CV
+MZP<KZC%-\KPCD/BD;+G]V>):'S79VAN9M#T3__6GGKKGY./'CZR6$[`&RFK&
+M*=50JY("@S2SL"'.'45D`!>BPT1-==*0"(406__P0#`)7L^G^+Z!T1M1I:3(
+M46ZCF8C=:$9CE,941J#8L`T8'Q&1C1BCBA7;>E8-"=DI&&/&LVD%L'#V5._4
+M,4<&/&599MB4&!2X*(O]S:UZ6IE>SP0KM3#WO/8V9TDG6TP]&TM3ZJMM)1.&
+M0`!`!&S207=Q:6&AH'6R)L\Z.5BI'`<DP)RR/,W"S!DGB[#8UW[/=;JAQ045
+M5;`]EV09&Y*BL#Y?S)/5,%PO;IK59!\VO51+M)#G[?%LU^%DT._@+,A:ORY:
+MD_UK+YQ_\6=_^F>_^.7//OW$\[=NC3[UDVN)6?2>XMP(FYJZOAV?H$),5,?L
+M"-^AG4A179UTKJAT>+WEM;:WAT1[>.B\($4%9YH/`&^8'Q2W,`(#2JB,1*@$
+MAL`0P7"ZN[!DI]5&EKAV-PL@[;QW;7CEU5NOU8NR<.:HK`X*7XJ`]UX!F"$G
+M4XW'L#UMF]:@M]1+%[POK%>1L+Z]??+4W26A!4-)7J`)+0ZU4^,"B073[2WV
+M_8G+XR$%E>EL-O2YLV<63W62MIMYGJ)1M@X&TNG.VEE(,\J$*(10#WUP5H!\
+M:#%@1[.3=+IH[[]T\PF[F-HLG4%@+=/,=(A%9VEF:H;V0G[RW+']W;V_\7?^
+M;\Z/E@?+%VX\O3O[R)%.AIHG23*K"R0C37$(`00;+3LXX,OR_"P+"$8862/.
+MO8Z@_9WI&'D;K%&CN1ZS00)(C&@8.3K+<7\_Z%D3`F[P!,C`&$6"4(\>6]X>
+MOKJQ_^J7_\UGLG:2M;K[>_J[WWQF)TR/'#FY>O8DIUD.TDJHD!D0,'*.E(`I
+M3$I'CP^6UM*T1YCH9"3B]O<VX50M8+P:13.M@S`+*:J`]TXT;>>K[9.]T7HY
+M#>R0]G$QZ;^G>^\B+.[5PZJH,V/SS+;%=J0-!6BJ0*I`!-EL$CP`(1L`**"?
+M#.X=W#<;;M\<7J]F=3K(,K)U71H.J4E#"NVEP<Q5MHVVY$O77GWHT;/M#E+B
+M+UU_MG?7D7Z6DR:HP3LD-N(!`!C01^@H!`5"G(=D>$`K96:P&,AC@#M8MF\Y
+M-_)MHO3?QM1!KV><GH%1<&/^8@@$'#5?""*IGQ`8P.WL;YJ6NW7IE5/W#I1I
+M9W?$K<[EK2NTD)][Z+YCR\O#O9$1SRE.W:S5:BN*\<$0#;J]O)=@UJU,!BES
+M[G"L4NQ@L<.P"&H1E16,$Q1DP*!8NY`FZ3D^NV_&KXVOKZPM]A;:B]`[[E<S
+M;-N0VG9"A/VLE0&FPGN3O;JN@Q*@34RB<W%>+P`"B-!QO?<M?:PW/G]U[UI9
+M3+&C6=IB".+KH(@)V390YNLP.W;F2-8CV_*(X857O_;871\G<76).;=GZ@%(
+M4:**W;QXK\T`B3B]#J*X%@$",+(@,T=MB8BD[Q!UY#L-(XK]U*CS*6&L1,@<
+MI=FED7N:<XM9@3!$`79$)(V-:@`$66YN[=UXX=4G'_S`V>%X9W<VW-I<GW$U
+M.+>Z>M]I2UQN[2$$R61*TV1@%5Q5UHD"=]-VVG?4@KQ/$F`6@I2S<K(Y7&^W
+M!E8I>&1D=&(!59&)##KUO)8>O;_C^S)8&RPM^'8RX\XXUQIS37/.O88<LPX`
+M,TQL"DH!"`C&59$DF664"@#$)"C,]8PS6+R_^_@2GSR_\<)H9RM=;AF`W6([
+M&*S1>2ALIF3#QM:-^QYZ>&VM>^/BU>%X,NAG7&&H?-))$TU*7\4Y$(A(TC1I
+MQYL3)<Y1P\,%$$0TQH3Y3*W#O?W?WRXVS*7F%`\&6$;.6B2$("LR12:D1B%Z
+M(""&`-47OO);=[WG1!WV-T8W9A)^[;.?STZ<7/O@`W1BP0^K%J!F294Z2I))
+M*'T]J\JRG;0HRUJMC#31+)V5E6I24(`4+A7#([T6U.VZ5HM1#@0K=8;)H/=5
+MG?'BD?38Z<537<@R@E!X<EA#*-A[$1?*<2'*26Y3@&:,D$<HL%0-)B0&5*@"
+MYD"`DO`XYPD>3SN#(PO7W86;Y969@X7N\3'M+Z\-AE6Q60_)TNDS)^^ZY]QX
+M?$O9I=8DAJ70Q%@*0!Q;0.,@L4/YQKG'<X>>>M1(,,8H2811<_Q0F_);!J/?
+MHQP7'KRS.[_QA@S7Z[,4`?2@MA,%C35VGS5JX;%8'V<V$0.8H`9B8BT&L($0
+M">L77GAB-MI@6=K=FMZ\-OS2UY]N+_://W!FX=12"?7N:)R;-.UTC:V]F6T-
+MMXG!U9BG&6G&(1>?.-'QYK@%%@H%:!>>($\!3"@=SWF\S@LFQ(!5Z0Q+!GG'
+M<\M`XL$%4Y2UTR`618*QB2O]6'RP6E3>L*E%/&JKF[NB=$[9)H`X+DIASM(^
+M5V@-:)UIZ)[LGEGK+>_)[JW9M0I]$=S2TMIP973IU9<^\-&?OG;K^J";4<@)
+MS6@\2>I>WNY-RH!&T\149=#7E]+F]^*A:1N*30^$`C,ZBC,V;X^W_[U<;OV]
+M/38P(I4#Q8\YM^#0_%MI=#_B516$((!,`"#B00-",[)G3G<E48$XJQ!`@["!
+MV*!7!P<,UEAC3`A1ZPZB*VV4,`"!8A#+BK5T%MNCF:@I\]Q,QWN+'7WYF[^S
+MF.#NQ;V]"C8NF]%>IW-BX>B98T>7>[O#K9W=Z7U'[TW3CDT4=%R@3LM).?&Y
+M),=7S\VV'!0R:*7CJ[Z7=A:3U1.#HZ?Z)Z;%5$6M,483#5B+&,Y=%1RFF"25
+M]P%4]L#T6VQ@1C#6*G+)-'"D*031<26`J5-$!(-034M4J)E\`*`<N<7(K@9.
+MP"D`U%;1EAVRV9I=.M,Y_;OC;SY_ZULKIX\>OXLNW[AQ=7AQN=T;[O%H.\GE
+M"$`K:>6E%X^U"X[9,B(#>FJJ;'ZN*AIU`%&4HK(-@)%XZP;.R:"IZQI%F2TA
+M!'%TJ-:FAVQ!_,71%8F/#"@($.3@2..H2'1M">*F-I>#>3VZY\(QAX_$<Q?U
+M+0'BU%,ALE$>!!%%4/V<XZ)-FDO$"RB2DB$RABB6@R+SO"E3$R(#6L:4403J
+M"KR$?M^,)AMI3J^]=G&\O][MVV*,K]W8>?75FV@ZQTZ?/'[J*'GO1L529RF#
+MUHI9-C;IRM`F?&.VD5!KB5;=AK:*UEU'S@VRSLG98LOFO;RWV%[LV78B%EU@
+M)1`OBO&C*;!7$`*O`4'%:S$+SG#A:T>`""+0Z"\!`X`<;DXE)<%(&/-$#":2
+M.1"@#IY1"!T&H8)ML+EFG4R/):>'_=G^]GJ>+_06%P1D,BQFP^"'R=ES][?2
+M055Y9INF*=0^YVP*I2`:(*\B"`0J@`A(L:$?<;[A-=)5H:'8*+!JB);J=7.2
+MWGC=>8ZD^*B1VH/(`+&#24$;P<M&@/G;^T9A+O89&PWGTL\'CXU#PPDS\SRD
+MA^`!-(1P6.82544AQ`D',6,D<#"*(+XHSO`A4JJ=8S2*@-9O[ETY?^'I'_G@
+M#W?/'OTK_]'_0:%^X<HE_OK77]F^U5M*EU9ZJJ&:U+(?3JT>7Y/%LWBDQ?G$
+M#):U2T,L.2S:53=Q2[CP4/=L!]/31Q8T->VLWX6V!W&36CUJ@$C*C=NNJ`JI
+M%PVDD;LSF151I2K*Q*L&D>;NGR=A%"E*@BD`81-`A8//SZB@WC(0$2C'X3.B
+M!@%/I:?V>[LWSE\^\]#)L\?OG^[MW7OD]*,?>HSV6LOMLPDF91&40RMC"]UR
+MMS"I<:B(2DHL<>1?%&5M_*.H9'.0'HHB6_&T-]JT&F%UZ/S/ZYYXZ-+?N<T=
+MSGT?C#>9/QB8RU@=L.7BD8-)RM+PS"":GSAU6%4"!"1"9C`<,\W:3$/U(M(,
+MKXQ1*35B_(H@(B*('&]E000^&.L<N[#9`',`0%M]_@O_X]//_DZ[YS_\GL<=
+MD(7.PV<>O^O,(V'9?./E)X/.5A86KNYL]K5SU*R<3D^LZF([M)?L8HO;U#&5
+MADZRD)IT()V%LIU[Z)O%&K4#/0-)!2XX'UP`91&-.6$1#01>04""`H**JJ]J
+M`D0V!!A$$4"!@M=#O!>*;UY1Y]-G%"4`*3:P\M344`D00@`O.JN]H)/,+[1Z
+MB'9K<WCN[/VG'EH["<L&J)BXA6Y7U&?M1#S5!20.!GD^%#\O:J@B:$/,ADAX
+MB**:JKYI>5>*>X8@$I$$E69.TIMY2$U5[@_B>AMY$W^KB2(5-<I6TAR/V)0P
+M8J*B2?(@QRPJ`*(PA$-M98BJ$+`9'P;..2^2J+6IB5UIU&QK#7H%B=@JA5(*
+MFQ;7-[[E[>8W7_E2WH9[3SZX"+T1S)YY[9G7;EPX<7:Y=:Q73H?)6,XNWK7,
+M2Z>ZYW@$:9VW#(K#O-7)LLQ(-C!]KG&Z/4K9H(=0U6PU)7"%4*G@.3I^0420
+M1"'VI@IJ%`<FQ28&`@(%)TH*9%C4S\6#XR0+``6.4P@C"9H4U&,<)X<!-4@`
+MKZP(@!R`1'SM"X:90#58Z=_<7Q?N7*W6O_'L%U_XG6=TG_ZW_ZO__;%3[ZWK
+M9*%_1"90C&?]M-4(*<?QQX"*8K0IK<%<>S;$K0,"H*+8B*0F4=>,EGI3EG;T
+MB6_[26]JD^Y,!((TUN@..]1L:BHP'S\0?[#1I\9HP$0C4YI04$7C;8=`S?C+
+MH,$T+7D>F8@8$4""<RZ:'9M$DO7<,U<!9`"H@D\M(M:%[*8]_]#),ZSAU:OG
+M+U]>'X_*S9U-26O.).MFM9L.=W3!K-V]?';%K@Q@H81`%1%R6KF4\I762D+(
+M`*X&Y],T28NZ!`'/KK*DE5#@H*J((<ZQ`@F*$J*6:;3>`H*`%(!1P`F(*!&S
+M:IB'0HI`$#O$4>(H5"2@`"KSEC%!D"2QC74G\*QB(*`/J9O"]JWIU63`.::8
+MT>[^WLYXUUF/+?W/_M[_]?&/_,0?^:-_(E6KR(.UWG@XPC2E1IE528&U4:R/
+M.NX*X$$I]LTTQ<K;8OZ"\V+)M^%%HMX)G3=5-KOC"``8!9J/33FP0]`8;B)C
+M##"1@HAX7TL`PF8`9>SR4,38JXD8.?CS06*AF>\<Z0ILD*T)@<`Y5?7.$2H:
+M4J)(PYY/\E-BX`0-^ZN;E_*N8NI\63[_RO.7SM]:7CJ2MS-F,#TR*=AVEMA\
+M0/U>UNG;Y5GP!C,%K@MGL27.28V)!7$PFXIR4@+51`2)*X(ORB`4`!7(!Q2D
+M("'$R3#-=*%8J($@$)._49T1$47`!8^B,6914D90`4:0F!AL!@F3H@90`E:!
+M-&FQ03#J,4RA+&16:CW#W0G<*MK[LWJZ5=S@FL\=/7'RT9/#Z<:M"]<65E>^
+M>?TKS_S])W_^4__.XP]]M.3@:X_$<4(&"X(B4*SA<_1?/08#Y$'H8(,@`B!H
+M4G'-OA?U?._$$$B<5O%O@='A1N>Y!1,XZ`QI5+MO.T$``&2-39(T3=D:00@@
+M0<*\,`B`RI;(FJ@QC]0P@C3X:'`)4%'0(!DVUJ9IRLWDE`A$901#ACC:I$AP
+M)$1U6H"97MMZ7M.=T707H//JA=?04G<A;RUF2<^D@\2!TP3ZO<6>65S*CQPU
+MQV?[99>[5L&5FB:IHE9%U6HESL.H\,I42$6&4=#76M4BBH+L%(*B!ZA%).X.
+M&NU(D_(510$44>\C1JPH>!<@CBT#;`8TS2=7,D8YV3FE'AB5"3'/\S0SQA@D
+MF-%L+VSOUIM;X<:-\,H^;JE5F]/6S@8:27/F#&9^NC?>.GYJK:RGSW[SR5?.
+MO[AR;'%A=0D"(M*!%X.*D2S1;*X0)=AI_B]&0$0&T1""!&6,DZ+>0/6/0H&-
+M-1(&`E0&4A125!2##*2D&(\#*0,1S>MW?_(O_M5#[3]SC")D69*DB3$L(!JS
+M`XB`X%T-",:RS5*RC(3-8%.-@I_:T#@!5$54R5"2ITF2*H"(,#.S(4+U'F.W
+M$`%CG."@`))8=C)-V^[Y\U_?GUT5#0#]%UY\Y>B)I5;?F#91!I!:SI.TE61I
+M*S>]TX.[.%`GM+J^)3-)#'L01Q*8QC6,G0;"&H*`]Q)42("$V`,Y10_D%+R"
+M($0Q+I4@(G%>AP84@-"<%%9`B4W/,)^D$Z\C-A<-%14$"-$P$`'$J8Z&T;K2
+M*X)):0*C?=B^55S=U8VKQ85)OCN!?0`/XB1455U0"MWE[M;^>N6G('6GE;1;
+M^<V-ZU]X\LM.PUUG[DW8`DI55XC*;"4$8RPCBA<?[_.FZ9^8"((R-KH^41LP
+MXJ[1]<>F5XN)"(D9"92B!@`J(S''81(`HH@:0REJPHG("5-\8\!_4`([^".H
+M(*I*2-88`$9BB"5Z4H:&X!I=-H3H-R."$H,1A<")B1-];C?J$XEBC.HTYE=1
+M@"#:I^!=EIBBF.5Y;EP^+F87+U]87CL2;*D94,:<6\I,8`H@/M1D`,&S@E4D
+M@431:Q.U"(K&8"E*MQ.H@@H*4E`)B*+H`0)B@'D25E`C81<4`PF"1*%A```A
+MI8-]GYKJE38I=T`%#4U\)"$TRA:J0,`&04`G15&G"HE,8#R$G4U_J\K'=5($
+M<8:2)$MXT/-!).5"W+%[3PSW=W9NW*JQDTCGR(FE6[NSW_[J9\Y_Z\*?^Q-_
+M_OBQTQ;0,,U&8Q&;4!(",I$%5""!$.()(([:4,IJ/`4F$(,`A!S+(PPD**0D
+M((A(<9M!.NB[C0:.D(2D^0Y08V\(`"BRX<QACSW>=1%)<ZL>&D4T0&1D9#)-
+MCCM.@H\YR>9,0C,T#5&16954V1@6]<$+`%BR1"3>JP\'T<Q\HVTT'QB4$"'H
+M<O_(S9UD-M7-C;W3=Y_$=)<RC[E@HFBX&>X;)!<RZA-14E$(2K%.(*RB041]
+MQ*NH>`H`)(`2J;@0@P,("D$AO@R@\?54@!05P!^*3.303F`(X\_@7'PZ9F*B
+MQH`TXV8)B3`F3-083L:SW4*'UT97JT[I6U4P+B"@D`'LL.VTLAID#&%6%ZU>
+M?W%MQ=?&;Y<+O?9X-DU2V)\.7UM_Z?_S#__S/_[SO_C8PQ_T+G!JH')L(`1O
+MF1E8`9R0(L61[!*4(0XV48[V$=#@07U"&ZD$C!(V2(@$M]5M#IPAYCN8N#C/
+M!T4&_>N<K-LVR==.G!<?8F8NZA``H1#.)^YJG-2K03#VY#5?<0I8#-X@J!?5
+MZ*T3D8AX[YWSQAAF>\B#BW>Y6F-"'7+;6QF<:-F%V=0-%A8$0M)..#-J0`CF
+M$\(A04X4L?2DA(@!-#!ZBK!6*Y#X8$/`(*@*2@'0HXIJ``PJ0=0+B("&V+4<
+M%P2!H.`%@L"!U;QCQ9?&)X>/'SJ=$K.",?M$C8(Q5JXLM9Q)X9.`Q@"@04L!
+M23%!,LB,P&R0S9FS=R/;.OC!TN#DR:/]06MA.;>]L#EY[;_ZQW_G<U_Z5;`S
+MD]6MGBW*?4)!\*A!11C!,AMBHU&87A":D4N,R@`@RDB,9`@B59`)&8D)3>Q*
+MC@>1XM86GQ]^C,</MA?^Q;_P5_&@QQ[TH$<N2%``)"3#0#'K'`5SHE?0^`ND
+M35V,$0F0FD[.)F96`(F!!#$2BHBK7?`>`+(TM4R&B!GC#4Q$C!JGJB0VYQ0I
+MJ9YY[NE.K^.ARGIH,XLF4[)H4F!$UA:EJV9E`1<[=@FD)6H"&4=16MMQ$!N0
+M`H%00/*(BJB!XNR)J&@..F=[-Y]L_O'F?H\<3O<J'9RJIIHPSZO=SIG$Z;H@
+M1(K@28,13QI22Y/I'K?!=+'*RRO[5R9<D"5139`394-,R`&DU`"(X]'T^,KQ
+MS>L;Q:2<36=WWWNO6D52A;KR$U'WRBLOU75Y_WO>PXC!BS4&E40"A%C,1@05
+MC<^)XKX1^4^1H(S1\"!1?![G:2@34C.SNP%3\S@G[C2/T2>,V6]\@V^$<X`0
+M0)1_)S5L&"0Z"7'/G!LZ`<2FC#"ODS7<L_D,YR;#JZHA!%][[STK&&,L,<4.
+MZMOL8@$`7]5YGOM:L];@](E[@G/@(>UB4`E*C"ERRM8$"HKB18!,%4#0*%$-
+M:!E\4(,0`$V,2H!)D44)50%)FB%*',?9!PT2#<Z\RM/LY<TV)7`(1X>,C<YA
+M=+AL3C&WI\A(!!X!#&.")F7,+'BP:OSF<'\$A0M(-O?@!2"(%+XF5#(D(`I.
+ME:RUN_O[]SSXWA<+?^OR]:=>>.K</7<O)1W%,LO[V[>&]7CRFY__U>'._O_L
+M%_[=E<&):A8$")$#"I`VHT9%F]H,D"%!1C`$D0P)W(28,0N`#!!#.(`F7ZB'
+M'P$/M7+/"60ZEW-[TYJ:``(A>=40`HLTGGN<S(L2`%@9FK*K0%!5#?$=4\R#
+M(A(I*R*2@JC7.9%!YV*\A_^>:ICWH"$B,MJJ0IO"YM8VJJA42=H2!(4T:$)@
+M"958D`68ZR09*]5,["DJD0!@0/*$GH"!2$B$0,#X6,5!42&)>AP*`BS--+N&
+MSZL:%!4Q-!;I\(SO.V&$\X3^;9\)C9E+?2`XP]S.DFZ:&L56;W%]=NO&M9N7
+MZ]?LR:ZU-(8=!)Y5X]EHV$K-VN**@21@"."7!DL7+EPXLWJJ>WRY\.6U&U?S
+MW:S3SI..L)%VR=5L1!:?^-TO[6\-__R?_5^WTY64.Y8S`!0)JLBH0N!$YL$!
+M(**AQM;2_-,HQF\U,Q0)E.:#LV-B>%[GG<?P392*VOB4`//(_W`OXD$&$D5]
+M",%[U_@(\=1[``\JHCX$%WSE?%&Y6>G*RA>5+VJIG=8!?$`/*!I"B-X<,T9=
+ML*#JO0MS)SY^EP!(@8%,FOF@R```SSSS##.WVHFJ,X:0T0G5`6H)'@2MH9PJ
+M6]58D(()1"&F4P.@5Y"`X)GKZ"$@-V.3WFSIO*H8'<$8Z2D"H.BW6?+Z'YQ[
+M0^#1.92@XH.H1U2V)DU2I`R`8+\>%52-_5B,KZ`2$(-<EGYK>W]C>SBK:P#Q
+M$)SZW6K<65@NO5\[>;QDZ2X/KIR_H#/G9K6K/`;I]SII@K6,7K[T[/_C;_^?
+M=L:OC<L-[\<02JFJ4-:A)A4&[S!X\0%$(]L'2&.Q`9D0E2`P!0*U0$:9R$",
+M[XB8E$F8`C=>$<?H$U%BIL]@PF@8@?_,7_R/FS"70:/^%"):+%Q%ADQB$VNI
+M:=)04K1H&%!\"&7M"J<ND"`!:5`"(D7U09QH"*P8]:XL6U00$2*6$'SP2`HJ
+M3&`,,1&),J!!P\1L[*0ND[:%K/C7G_NGDVHKZV4."FJ)@V!;BX$M)#`+L_9"
+M!T$LAN/=I:-NN35KL6:B0%@AU@P`0!Z,:%0#TD"H1%X#(FKT7$!]$`_J02*Y
+M4!HN@\H!D`"H*3,TCA,@`<ZGQ-%\]YY/RW6)!B-(ACDQV&+)ZDK&,P<MLQWV
+M;KCU;=ST@]+U"\\S@8*<RRFO"KQU==,4?GEUR:%.Q1G;*Z;>C>LL22M?UL-)
+MNNUGMZ:<]'+3+[:F85*G)A$(%11[Y=[3SWSMU(FUNTZ<E-*I8\:V"PDA)\99
+MAN"PFCE12?(4F:JZLL9&24!#@2$DB!8R1BM(9`QS8@D)*P+'&IB8($4P-C'*
+M`3D`LCB;)BFH$(KQXF+V!I6:?`M)4+*I128RL?6YJ<(T55F!F&_A9F!<0X2C
+MN186J(*/^ND>D'6>ZR0BML9"8"31X#TB"*N"J&74("#6N9#D5J@:S[:W1IOI
+M0N85/*#5.'LN>$$$)&N%K%>:NJIP=?#`F@`W>JPH/@7C%$545`R"DGH0`0&0
+M`!@T2!2Z)T1``Q1BFA4!(OOJ-IWY0.&E<8!D/KPK[M."\WZQQLMNBG&H)K)>
+M`8V"[$^+,<YJJ9VXH$X*3QP,0CFMR5$+VLO9LE$S&U=51X!,,9OEEI*V`?"#
+MU0%[G>[RSO7=S:OK2TO+Z!4%QI/AN)Q1)^\M=*KQ[G__S_[!9'OO$S_TQX(P
+MJ%OJV,W-65'OM]OM3KK0ZD'A"E\7:*372:I2+2>6+:I7+2$H2JR@UZ(!-$Y@
+M$HQ#3W%&:0BAFLK89E37-4#>73JUOS--F`C0`!D%109D)B8`!5+DQG@1(U"S
+MC<:9E"JH7H(3$6CFG,4I<C'Y&8L#*BK@?1P%ILC-./HF[$<UQ!J<0<;H?JN&
+M(,J-7Y,053(=3C;&]5[6ZHQ]F:2I=PZ)H*Z5A#4Q21Y"&H)IIRO.+)70KWP2
+M<:Q!K4`W3<M:Q6N08$D#BD?G@A"S!"*,Q4LDBA8'@DBDIMXF?KUNQ/UM9/U;
+M]%X0(`U@1!(2`]Z@-+T+&J0N;:)]RE?L`GM?E5,7ZAG-'*`+Q2)GO<$*M,#D
+MW82`P2-553&<%A,U9`:M>FC+Y84L;>^/=S?=**MJ(^I)O)'@B]G^K*-Y*?K9
+M+_UZ%>23G_@3)E3#6_O'>T>03A05U`4@A0QK!Z5(()%!:\G56)>U2,`$;<*$
+MB%2WL1:I-1`(&K1H4K)>D^G+5W[GJ\]\MH*=XR>/#WK'E@9W531..DO@VQ2,
+M`29414:36#3,T86*Q8WYN'/?N.\-=R2$X+TGC<)G<)N\-3^5#!BBTX,J057Y
+M(#]DB$6%F0V;./,31``#@2`B$Z7&:EV'I)Q6HZR70$K%*!C**N<21@R>`%&!
+M.9U.@WIS-!LP]@23"@$"((8LD=38/,E00NVTTJ`J0$$Q*#K&5L0#1Q=9FI(K
+MS6/4`,J`#6M/`?%->J3FWN/M%KS&@55*O%JD>$NBAGF*0``@Y631+AEC%F6I
+MU&DALU$8;]'^7K'.=<6()C5=FS'@"";,;`RCX8#:Z?0,3_(D[73;1XS-@[;;
+MIB[=U9T-5\_$<-I.J0@4W.[LUC>^]?FTEW_HD8^OKBV6HRW17I#,<(S48]T2
+MR-C@)4&V>0)LE<N@H99274C`6T*;"!&IB(>BU%$=-A;/CC^PU-O8W_[RUS_]
+MTG,W3QY]](<>_[G''_BC77,:Q1JO(J"LC("&$!$C"02:/'6,K)I`+>KHB`\0
+M)`Z4;SQU!8W&K^&+Q(=F@GAT(J(W?<#&/+@D2`2D<<)E"('!5J$VN2_J46]Y
+M8#N4BI1.C!)[`%'#`475P<YP9@4XIY3`D"`%CQZPDKRRM@4@F)"ZR.@(GM23
+MB"))0,78V-0HO*FH"&(4<0-5?-T]T83TKYM(<0"FUV=[%90,H`$BP>@_23.`
+M""08KL5R>T#Y(%T55!?JJ9_LR?!6<GF:WICY]9;U`R``&BF-G*:=11*NQN,5
+M[M]S)+6C_?[-R5&?PMZT%%F?%9/=<C0M)ZU2^L%80RGT\DX1-I]]X?,GCRVL
+MW//HWG!_H7\.O/<52PVDFIL6(@8'ZH4M*X/#HO(3KP$Y2_-64B<$3F3H=12X
+MXI9OM>LNE"/87^Z5F[3^,W_N\8^NP^=_ZYNO;'[>A^(G'_F+%#I&FGGW:AM?
+M\5"'2DRC'`1Z\X-Q\;P+$^5U')2&I3N_86-,$Z4(H@Y$=$D4U(.0,!$JB7H-
+M086@#L&D!,P^A':[G[3)8_K:]<O]7N(#>@D,'$+`H.6TS&VK"]S&D*85&71:
+ME#*IJ%;H!D#/-K`12UY)0$").69%!56E46Q#0_/J'J$$,$3S&I#"?,#+X6UL
+MKL,4RS<:%9CB_D@:"SPD!$3H*!"ADA(0$4L@<(J$EHVU5C6T86$I.;JZU)FD
+MZ?:TUK!K83J$Q*(!DX1`R4Q/E^U[MTQR/=3/K;=?VRN??G6VOCM""7FZUF/J
+MFAU&RCK[7+97>\5H,AE-B<-O?NG3S[[\Q-KJF;-FTDN/M-NK)LVT)HD2EH+M
+MW%9>:C?&I&YUA!)VHJZ>UE`G["$9*N_7,BYE5$Y'SFZ/]>).<7GUV/&=\1!;
+MG4<^],`KSUT>K%DDAX@&YW.`F_8Q`-`X[G1>6(F5C:85OYD['VO7`"022)&(
+M<3Z?XG5);D$A$"2&VV8M8A$)Y[Q>;+PN1&22H(:M=]!I+1CHH"AJ/9T6><=B
+M""P^IX21$F/;B3V^W!]D=6J'CM8KI#V=C/Q80[6'O66M$QDH]T!-I`DFRHC*
+MF:V]JRLO(A#%_X`YENX!B1K<Q]$;<\$7B;U0^KKZT8%VQ?P101$]J38:@XJ(
+M@LJ$BLJ44!Q!'!`$Q:O!)`>CP;=-#Y/LJ$TFQFQ6X[K6D+:933+SG>WJ[@V]
+MYXLOP9,7=[[\N]FV6S`M"0RMP=Z^O[E>OT#[Q1&`A<Z'?_%';H41CJ8\<6%C
+M=FOWXE7=Z?GKO_VMW[C_],./WO>)D\OW&=-Q4T@I;7=:K@9`S^PQF0D7HW*\
+MN3O:'>[.BO%P<GU]]Z7M_:O3<N)9($D@E5*&*\?[VSM/KRPNN1FL7]OXR.,?
+M7EX9Q'G4)A;P8WXD<B!0%$7(4FPV"%'>ZX#,__JY>C&#PG$@->C!'J:'3->=
+M?BCBG'_=W/>BJK%KC=!8(Q3*(BRVCV:A4XTG5>'$B1<`$2MJ"5*V66H7._FI
+M(PN^&HV$G2M*D1$5$YT"RD06O.>N:)LS@P1!*6@2D`FSEIW5!`!:.E&)Y#)#
+M_W_>_CO*UNNZ#P3WWN><+]U<.;P<D4$`)$B"I!A-2I:M0"7+DBRW+4OJ:8]3
+M]]A63Z^1W7;/FFFO-6UWFN74#F/95J)M43E0$BD&$"1($.D]O/Q>Y7CC%T[8
+M>_[X;A4>*%`2U9:^5;PL7!2J[CWW?/OL\`OHN1[<3BW:&>O!DR!BF&+1!(]V
+MTK1PF^9/C$13H2ID5B`H2B,C$HC&:4<_.$=*Q\J0PKH#1U!C_IC$MCC,QZF%
+MF49UX/L5&U,,R\[833YSBS]]=>N+6Z?[<&D@S=3DJ(<Z]FD:9<EBJG?#P5V]
+M5P5L=-H9!-70IO!!Z7Q[?RO?O#7:.-V>_=Q7?O/E*[>>>N`;WO;(NY9[I[#T
+M_?PPHM1A<9!OW+WU\JWM%_8G6ZRT;IBH"9#:[L5HN?F`CG5A^7!0]B>3[;W-
+M3F_EW,7'K[[\\L'>[A./O?7,R4OSG27("0`T396H))2VK%P-5D1$0B4BJ,@H
+MA02AEEH&)(V@R0?O@]6DM"9AML$:4D>A_O74@14<UVA']0Z&X)G%`X<0+#,I
+M0!$B4H0!8>A<,S%&VG.-QI__Z'^Y-KSQ*Y_]V$9R1P1-FE$C@S@NK>MP6)[)
+M6`Y<TZSY7&.?-?2E[[6+5.+9I:9M)TPZZF4++B_)A]FLT\Q4KF!4A."\UCH$
+M1@8`<BQ&Z<#`R*&6Q9LV9.N7/Y4*AIJ$,#VN:Z*7'"L.(``0L_:(`4@;4@1(
+MP@1(@6-MC*9@*Q:.M/+!AN#BELG]_DQC,AELSW8XINC4?G1BRUS_C2_9+[^6
+MOWQM803I$$XHL`.(#(P2VC\U^Y8?^QN0F>N3P:V=S58Y>'OF!_,LJ%M1&A)%
+M65"($5K8W"N&HXU<HBJ1N/_\RY_]RI>?_;9O_L[SJY=,,QN,1W?6[G(\6GUH
+ML7WYTCATXDY\4/1SL0>3?O^PN+.SOWYO8SPIB](_^.!#EQ]\O-M-AX?K::P>
+MNG3A],K9A>Q4TRR3Q`"L89HCB'"`*6R/&8&]!2(=&4U4JP^`U&QH(*W`D_A0
+MC_T5D3[&^1^A*>IR.HC$<5P/]NO,RWL?JHJ9%1)*P"FIA.JYB@T^3=+2`T+B
+MQH5.FRNM4PUJGUD\.=)5L]?5C1A(]G?WSI]>+<>[T.GD5#D#B*7'4/!8B!DJ
+M13"L=KL1674X8N:(FW&L3,RJX1GJB(G`M8@BP!$0?ZI'+@!82YQX$:RQI37<
+M6NC^+C@><[`0ZNJD'CE(30KV`4$3D485*:PF!1AE$)3"6%&LHL"D?=[3$AWL
+M@X_@"]?OO?K*UO6MUSYWNWF("P?Y8A].$*@"C(=.%DV4VE.\UHO\VJM/??1;
+M+ZRN7%!Q!7;7[_[R"[^^C6.EE)`*$AR)%Z^94XQD3`OSJ['NW'KM>B.*_NU/
+M_>,'+S_ROO?^B9GNZN65E8!Y";L'Q61GY]Z]>W>NW;O)J;EY=WUY\5P^+OM[
+M_<7YI4>?N,2.\SSW=IP9ZJ;=MFFOM,_UU(4P[!J.`4#7U(SI<DIM7S9USE5&
+MHV(,4T$T$$$2J%5S#0H`<\V:176?<64XRIUJU)N)(P!@ECH'M=9:ZP!$F4@I
+MI375C6P`(0(AK()#@6YFJD*PM%G<XX%TD]G9^32TJ*1J9V_;EF4C2Z3DJAIP
+MW*H0&22`!_(:1(%58,MP6%%T;YR/AJ5*HM7N`L7+<[!<AD284:`&1BE`P'J7
+MUQUIHF-L*@(!U=W6:9^27Y]['`VY01,AHJ(:`DGBM=9:UQ!/%JH1N(*]5D<\
+M(#OVWCI?V\C2,#_XTJ?=2Y]K;ERK[MWDP\G*S&*I3S_PI]_S[+//WGCMQM[A
+MY$(S;96A/QE/C%]\\K')DZ>VI'SV$Y]Z],FW-QY^2`%X'?65E!J"0D)0@NS%
+M.-7RD7(F47.9G_W9?_=S4:0[[>B!!\^N[UW]ES_U\L./O?74^9/[D\T7KW]^
+M9W3;M&!F;F[IU"G5C"\]]I90F/[^,'U(-])D;V>[+(I4IWGELOF>+B*J6CUU
+M:48]J7G&<ZC5@_&X%..C$XE!C%(B-:V,B51=]#)S;4A-6HF(N!"$!9"/DZ<Z
+M>2#$6@A+`Q`%#L)BE`(`]D%$(FTBI95&8XQ22"A`M;@QU('*>U"H210ZY!R]
+ME72VE1<5J&)T>-!M=VQ1:JUV=K;F,N.U"D+,/E:L002LDT)C,8'A097O#`_1
+MQV/=%RA#!K%?809$)%`UU0L`%`$"H1)F"4>IG=2-`8"Z_Q'N&\Q.UXQ0`1+6
+M!YP0(H$&)A6,FC*2:CTK`N)17B)(%AEM(G864=G"V:V#=&/'OWPS6=ONE1%(
+M5NS&S:??UOFAO_:G_DH$+[XR_K5/;O_ZI_SMN^E,+UK,X/QR%5$^&&W<NWK[
+MR]<O/?/V)[[C0W?[VSO5D($#NQ@\"6NB""BQ*!6MS*\^]YD7VTEW9WO=6WUO
+M0TLTN?#@A1>N?.9S+TX\Y2OG%B]=NC08#Z2,8]/(#XK]C6T5$H-I(-S=/$#6
+M<^GR>#@)!4,2JTK-=E?GLE7(8YN#TEK`Z_L3X*,=I0@`23RS<PZ(3`U".4HS
+M04$=00*!A!`"T[&G`((0*D6D26LMBHZ3;!'QP7OO1<080T2J[I6+!&&:RF(0
+M"D21<E69I8E"&`S*4.G-M<-!A=B#,6UKSS/MEM*8I9V=@XW1_J')D@`&)>@8
+M"=F%(%`B6(@*WQ.=)BY6AS!>]SMQT5R&.>18HP(B$:Z#3L"@ZLP7I@2N:7"M
+MC^;ZWA(0PC<N5/V$Z+KIA$(@,4;$(`)!L5<.#.A8P*`$!N<J!2Z(0(@%D8S1
+M^LZ5%U:+85HBY`0Z&KC02V9@)#`S7UY\2_/19YI_[H?A'_W/S__.+^9GVM`,
+M"<@YBD=5/@C^W_^[?_,/?_TG+G[O^\(L5FX,H2"Q)A"P:%':`Y3AYI6KA_M[
+MMG1`:G%E9>7$4K.KQ]6HU4TQMRPQ3\+6U=W^80&A7?H<$]:97IV?R0>%1ZU<
+M]^3*V6ID9TV\/]@ZN#X\V-F;>>@T%Y;"?J>;C,8!P.APU->!(UQDW3GTS$%8
+M6-24]$2HB$&FLTB9*J.S#W(TPY\NL2*J)8R4(D5.&!'K`1N'P,S`PLRHU''Z
+M6C?N&`%%LB1.-(SR<C)Q<=1LMF=^\/M_Q,;%%UYY88P'G[OR2Z0UEZ4$/LR'
+M:^N;YU.3IC$1H%`,&H`K$$>$*`%]:%+<3`.$X!`J%@0.K+#NG$X5RA!0(1V+
+MD:'4$'X\JDKK0Y["Z[S,*2*;I@K,0%`K,(,&R!08`RH#2:A$-?2#O;)?C,;M
+M=A,51!#%I`U&J8ITDG1/=N:^]YWW_ME7AIM#F/AXH55ES7_V\?]D=K9^\'_Z
+M1[<VMA]</@%QLKYU=U>*WL,/;[I^KYCLW]X\V![^PF=?OIN"?S#K;)]7[8;%
+M":N<D5FTH+!"1(4H>P?;I\^M?O%++RV>F/=0+9Z8>_M[GOSY7_I/6=J>Z?86
+M9LZM+"XMSBXM=$Z5(_VE%U]Y[I7/&*\4TD??^VUS[1-+\V?0QXC*VI*4`RBW
+MMM=[C=F9[L+NQK@H)B2)%]'3&^JH<\@(M7F)B!`1Q4;I2!!9F!&PCBXUWF)J
+M"(?"='\'\@B;A(`UQE"0:KX+J-IU3Z`&GAYM7V1$(21$9!@=#+!A>C,-`'$>
+M1I.QRF*NW`.G']TK[]W;FE_O'V((:9I&C:6E$Z>C2#52XS!RSJ'2+MC<"QCV
+M&D"L!A,`BU!&7G=UNXM-[16`JC?-$7"B3H^90&0JJE1'20&`$$0T"$/=]3BB
+M@]8PP.EF0JR/-E00$'.3F+AI+#B"R4BMW>E?VSK8KC:*5J,]$\_.QK-S\:P/
+MS813W>IGEP]/_O`#G_T[OW!IY8%K&\,U:[_SQ__JXOL^"$;N_/IO?/K??^Q[
+MW_+(Z,H+,QT)NDH;2;6_;<3M[:[/SR$VHA<V\CE`I?4]KKQQ00,+H%+!$*5I
+MU.93#W2OW[CW[@\_G76RE5.S"\LS.E('>Z,3#SS\S*/O?=O#3Y[*3IGZPUQH
+M?/#"1[;_]'?^QU_YV-KMFX\N/(2AK0^:Y=@TFIFK!B:%..LN-)NNTJ/=1$NJ
+M*:O8`8#ZKA_],3RZCH5`Z@13129)$Q49``G,#**(:BZ'\%2]4A%A[4ME#&F%
+MZMBE&NJJK=8R1J@%+0T==5R`9<ITK.EQ"A2@L'1;C7PR0?*3LC`FT=HTTM3;
+MT,Q:C0;-SNOUK1N@`L7$$5:N3&)J-3,1<I4-PJ.R&DXJZS`Q60!`10S@"YGA
+M]ED\V>,%[9LDFI``@/V4E@PB.`4L!T5!$9,&I4`1(8L272_.%'B*M22E*`"B
+MVH+RR&8!A=F)<JR#4^4(#G;LQL;X]G:Y/M;#@>_?V;US_=Z-M:V[6_MKX^I`
+M&GO#YBMSYWJSI\__SLM7UB;5=_VS?]&\<![&$VAG%]J-Z__VWYN]]7*RL_SH
+MV9T6]8LQ[!Q$EMO-3C8S\\*]+5R"=WST@]NA[V/'$2N#BK18L;E(B0I46>4+
+MRSU6CG45M>'$Z:7YN:56/--4B]_SD>]=-;.'!VOCG?U4=*8;&BE3T>.7'D>'
+MG_CU3[[U+4]'9+(X!?:MU!3E@'VE2$.(C6[$.AN-*B`MPIJ.U#]JNNZ4KCX-
+M'1IKZ95ISQ`@L*F=*5$\!\908W<9V;+'(P4^7=.>I![L!I':OA(%,8H-<,CS
+MG)%\Z9.@DR0B(@DL"%KK<>ETDCIQVBCO/1&Y$395TXT'<YWDU;7]R.$0AMIX
+M'2%K=$A%Z1N*/.`D^%$9#K='6LIX5F6S71OYT=`VQ^VE]O*"/M,H9R!H(!!F
+M#ABIJ.8L*P(D7Q2#*!:ED(CF9N<$8'W],,941#OO/0(9K36%X%Q59'$<@A,6
+M4"3*!)!`Q*0=(*#)AZ7$(324G5@;JO92XU#R45%,P#-P?SBX/;S^RK8S=_;>
+M]<&9;=#R:*+^PCM>^/L?^[Y\%S[YA7_U__E'?_KO_/69CWSPNW_PFS_[TQ]S
+MK;C7;!M,*"^D]&(]E<I7U<5'3KW6=EM@Q[$*2#%K$Y@#EX%%B<DB`P10D@Y&
+M'*4*]#C.:&YFWN?7_LR'OR=R_E_^Z[^_T$TV;^W/MI82$W_C-WU':_&2+\W[
+MW_71004_^4O_QT%_O:$;,UFWUYJ/(MU=[+9Z"VF\XIE=H;.L7505USC;:7)\
+MI&=37VF::JTE,'O/S`2HD`R2N("!06K"P%3100A1JSH:30.;"#!+8#HRC*TY
+M(<RLM<ZR[/@9[ST(TQ0\[`4A(#&H>NI`@HJ59FHG&;OJWHU;2J"9Q+8L`)F(
+MK'=%453%A+T-()[93EQ^.(F9\OW^UMT-.RB7H\5E<R*NNF%LZCD'*%":E#J"
+M2@$'='%;0Q:@X>(9+<`^0*(3]!PK2I,H,DJ\L[8DX#2)`:9KHI'445L?$762
+M,"D(FKSVN1\-\KW#P^UQW\PTDH5NNM##3ERE?AR/]]3^!NQOF/!<N?M9W-V\
+MU+KX`Q_\!W_K1W_MO__[CUI\X:=_$HH)7#@C^0A<D("3O5%*69)U^B,[')7#
+MO'SNY;O2SJ#3L!$!*4T4H=(`3(&5$^TP]MVY5KN71*V@TVIF,3UQ>CF)4U>&
+M4S.G=C8V%N9:_^EC_^Z?_Y-_\_,?_TD=CW_JI_Z)C`9IW"2`I]_^]AL;KVZ/
+MKF_U7YSP/3+C<V=73YU8[;;:69;5ZIU5-:D58+^FOE&D=``)=1/V2,LG,#MK
+M06L@`@(ZZE,HF2K=U#9QS,(^`',0(2'2JF86U&:6A*2UME")B.-`P2M-BE2=
+MAN,QG*?&===S.62&4)23>_?NZ$4?0AB/QVV!R!B?CRQ7I8D\0)`80(+S=E@4
+MPU(4$5$WZRR9Q7;H&MMHIF;B.2@'%$@QA0"A%FV5H(.+JJ$<F$BO8*<$X`H,
+MI@$+1H^$A$$!"PDJ`X@N3">[1$0(&J2FPR"0>(Z8C5*@8J,33%N8)`&;)I)V
+M"BK!(@D6Q#=1C+O=/VAU34ZRG^^>?=N9]NVB^.)G9HIX[W.OP'.OK/V=?W"B
+MD%'I6H-BZ7SO`,+MK7S]SOZM6^-U@-<,?.NERT-;<@.)0"DD%9"=4"7*48)(
+MD:)&Y4/2,-VYQO+*K(YD,AG/+RZ,H?^__-/_M:6&G_W23C&$9U^X=^[1Y][Z
+MQ#N^]/(7GWQFWD&8:33.73AM0P/*ZMSI<[NWAXOO/!^G<SM[I<>F=8`@2HMS
+M$+[6-D(!5UE4I,TT&_7>6V?9!_;>,A,1$&$M+Z(`IY;O-3A6@@OL?:CKLJ!T
+M4%$4:U)U!'+.A1!""*10*4VDN2:[`S$P'>\AO._5@!3E:'^P5U1Y5(5B7%*5
+MB)<TBH=]$24>I`BA#("HHL14NIB4DTA%$=-LI$_$[7F5J$D0,4`@R`&%1&KM
+M$TV(.DQHL#;>V'(;22LKVVH1EC+.4%"E6'$10C#&M+*8E"JJ4%16:<.$5-/>
+M(2AA`E:">55H`E*$!*BQT6YUF_/8*/KEV'M/0W9EY9PM?`D-B#K-/H]8R`IX
+M`R_U=]__SLO9;ZY/7MY?9KS^H_]UJW(JA"B).@&_N'9W_LG'!I4_*,,0("=H
+M+<'I2V=W@+4F"J"8"$F<@`LH3FE%B(4+8N)&)YJ9F^G-S!&8W>U1$O7V^Y.G
+MW_7^_M;5\P]=_=)GKS?;T%TZB7%GZ>19`'`PMC".,].)ER)69T\_]'?_YE\Y
+ML_JN!Q]:D-#0<=/:4L0[ZP6T`&CY77NH/M=L6>HHTLHH!!>\MY:=8V9D$@&F
+M(!AJA31#"I!8IIZ?4RRC#^Q%@`DQ"#BQ*HI(*0G!.>><$Q"C313'VA#4TC:$
+MQU`DFCX<C[:\*'_KWG7'3@.&$$"H*(IFLWF80R#M`HVK,M<A:;:SF18`#*O#
+ME?;,?-P]E\1+8EMV$`#)S&@`!JS9C(:5UDSHK1FO#V^]VK^RK0>9;NU7D_-Q
+M_T$Z;TAS(LQ6,:1)W$B-,-C`4@J0KJDEB`(!E+`15AHLVB@V(';HQH<P*%3E
+M0<;Y*'>38C*2OI.\RL?]87FH2+4Z<1RE>Z.J'.1-Z4)PGUZ[\JZW+PUWMA[=
+M@_;^)-:JU6KEXW+]Y5?:?^JQ33OLKB[>6]L^_4"21;[*1@%S8^+A>-Q0$@$I
+MIU6I5*&,-Q%H4D8PCAOMI!&S),UL>19.O;1^<^W&^/U/+URZ_/;G1]M//O/V
+M#WW3^RZ<OK1^^W!YY1T+RP^5P2GE"*I[:W>?>L,U.OT``%I'241!5/+IN7BI
+MF9Q]X;E;:VN'YRX"D`8*@(P0*S!>O(!\S4.-F24$KB"@"R&P]PI`HX(I";<^
+ML&!*F<.I]2DR.@E4XW1J+01"9F;K+`MI=8PZ4DH;8Z(HPAID!SAM6<E1VV`J
+M90J`GLE%$;UV_64;RE;<3N(,&7WAHDY*F.25*X%+#_5+ZK325J2T^*6T=2[J
+M7$X;9U0PQ8$=CVTYD49;H@Q"XJ8T3'$RZ+NMS?SZOFQ630JIGAS<I=(MM>-V
+MU)B`UTG<C=L9&`U@`RB&V$106RP0HC!20)%(D=&HTD02R$/5SP=;Y?9^M%_*
+M<#+9=R$/18[L30)-(A42U=:=7J.8#`44.-H[/&QR,YEKK-G0NM@N!X<7.]W]
+MP;X?C]DY/XE"<!-?S5\X'=_;V-C?W,/\U!/G&HNMJBF1U>"\L`H,KB(."DFA
+M5@`F3B(RD&1IN]UI)>T*W-WKF^CG7OSRE6]XYNU+\VU-DQ>__&R6-#_ZU'=W
+M&JL,A"H6J)Z]^>E&HW?VU./+C0O5`9\[]V0<M0#1<V'+B0]H,#;:E-8+B):C
+M%BW<QT2:YCF!'4_UE-6Q<Z`(((K4;GFD!94`<(V(``#4@BPPI4\@"LLT1/G@
+M:VXSH3&&C%*1%D*6:2L!5*VTQ"1PQ,-$@``0!.W8]C?VUC`"$T<67%D4!,I[
+MCEJ]P]T=<4%%*:&7LM0:LDR=6#RAB[SE["Q.S/X=N%G)O6K$2>O=STAG64&"
+M;!0!*)E4_8WQ]7U_C[I%.M=!HX3].-^Y4[J.:N6HFF;6`&20$.A0"7E(05L0
+M`&:8[B&ER:@HCE22A@GD.56'T7`']@>P;^50R4"*@TQCTHVT5DJG0@EI,%KW
+M^^/@E4'C,>_G>2#UG-U]YZ.+=[ZRUMF;G.JT1X-A>V[AA<.=X>9^I7"B"$_-
+M[=O-PP27+ZT>X&1C.!Q+,9/$)1$(%&`J%4@I#X9`=,.%4&:-=&Y&1V"'A]LA
+MS]__CK<]<OEA.W'EN,<V>_SA[^RUFHHI-K58&[R\>>77?N,33[_M(Y%:83OK
+MRNJQ1][.02H[AI@%@E99R(,M&32)\->65V=A#D*BD912B`@L')@0!8&($)@0
+M";@V:U!:`P!(/0FO^<E(1-9:K/M]I(*P9U:HE*(DBD&!2`@A`,K45WZJD%S7
+M:'2D'^Z%JKV]C<)/TG:,"HJ\E)%+5.PK%S>:^=:F>.G%L0KB1WFA)5/I\&#G
+M7-QXHCV_L@OC7_GD[5][*?7-QN6'DK><=$VE51HD$TP"VKX_W)RL3ZBOFS&8
+M@.#2;L20WS[<3#'!K-.R(VW0*--FHJ"U1R\<@3AR`0.@@%8DFHQ6!@@T`Q=2
+M3K`8<O_0[U5\(&%DN&@VDC@%AL`*%9$MRN%!$;M8L=G;W2^9&VF[/]Q;O;QR
+M;7S[]#.7UC]S,]X=QP!;^[O-Y>;:<+@_B#H73CWTP,5'OO5]>:/::91[D#<:
+M*5M?SP2"2)A:#2@%"L$BAD9*S10I%"BAD[3/+)UZUY-O"[X,Y3AM-R$8PG#]
+MZFO%Q/</)HUFY^KZE[^R]DLG+YQ\Z(&W)=B;]'VWF7[[MW_T[/D3:;-1^+%S
+M/C$UN7[:I'U]&QVK1^`4IUPCA)B@5A&KQ9BFHH&$R+4!49`:#'$\X&4$18@!
+M0$2)Q/5$5B0$CTB-)-6Q44;+=-(K2DV'LQ`8$)1"X9!E<7^_Z+138R!W>2N&
+MNULW43M1[+@BHCA-]W?W5L^>T1$4Q>34_$JYWX^T(J4<6*+(%-P8>+YS[<6?
+M>58]M]GJTXG3%[:O7]/%>C=I5B'VNI535J"]=7!K$(8A8F1+P0GXBC'+4*<J
+M@',X(HRV[19*1!`W0IM$-4A77!`%A]8&QQ@'I2<.QH7O-+5E+D(9*-A0Y>6`
+M3$G@C/82<D#!*'+.VTHXL!<-7E<C;R`AA5RX.(YW\Z$ZV0V7S[RXMX4'PT>;
+MV6"<FV;SP]_^K;/?]2W0.QD@]E!LP>;/?N[G8J[R@V%$%2!B$H'W*GBRI;!8
+MRPOS<\/QL+4X:R?CK+74Q;G/?^'&MWSX!Z&"SW[RY_?V;MZ^=:73;9P[<_;M
+M3[[_Y-+EP9Q\\:47#@;;<9(IRH+7@BI+HJ+P[WKWT]:7UH$V7?*CO/")8A-A
+M""!(ZKM^Y&^_?I!-Y];UI&D*IJEG,T<M?]1$2%/Y$@)1JA:C``FU,AE+$`FA
+MEE_3QWTI!`0@55,F%*E:Y$]H.D:`FIVD4+0"#!"1$<;8D(`5&I5R^(G/_%PN
+M?8XL*PX8T.AFHV5T--]=#'W[P<?>M?GRK7@H2\TY`*@.1MG0W_B/G]K\B4^U
+M7SI8V5<GTSD_&.-,E+SW5.@Z"\Q1<*E?FZR]NOW2QGC#18X5:PT$''Q5V<F$
+M)R.>3*3RPN1-!LT6=6))R=?J.5XI#XH%18!$=``#`3`@*![*>.CWQZ&/B8]C
+MK,H12E`*!*7TW@F:J.%$3T8>2R..G//!>L6LD4"3(^F=6<V:+3P<]7?ZL[-S
+MYQ]^*)Z;J0:%21<H2325NY.]%^Z^,L!\Z(>3?)1$.D8LAQ,[*C*3&C`Q)3OK
+MNUF:3OJC"./EWNI<O/K<9U[\AJ?^A!'X]&___,UK7_KT;_\"\OC4:O?JE5?/
+MGWW+TO+)Y7/+J^?G;Z^_<N/6]?>]Y\/@P(B*236;J9"V3A<6*L<DFEC[4--N
+MY'5](SQF^M\'7_SJ1D#=8<,I,PUJ,E+P@A1\F#)R!-24]%^+"-3B9""(`86.
+M):2GS7+&J:S<E$FA`(4@>(AU#7]U2LOZ[MW=PPV5^(D;8ZFB9E-\<)6UAX78
+M\D]=_N`3\,@O?>'?$^K=JZ.\Y1;F6]5@N%+.^3OKLV9&N0`E1\VX@!QT7R)4
+M"1:ROU7J%]9O;.:[U$EU+%4YMN4>&<!(B2;4FHT*,`'0#9H4-*E486F"&"G&
+M."96BHA%P#&%6J&:J*Q8!'O-5AR?I6"O'0[S4,1QMQ`Z'!YH$YK=#HO>.RQ+
+M;Z*XPX44Y<@&3DVDR[(H)NE,>_'LJ8,D*AY=V%A;,OEA>>=P_#O/5;_S19>D
+M^_2_++_OZ<XW/NX>GP7R0Q/&#17I3I67.'&ZX!YFOC0;VWUM&OO[]G!O?:;=
+M[-""V"R7,#/?1-C]-S_Q;[G,/_'QWQX=VJUK5PXW]G_@O_B1NW>N=N>7FW&L
+MX_FE$[/C:OL__=P___YO_Z%B+_=5UC^@*&XS11+$*(/"OF0?:B[_4:5VO&GN
+MWSWW@=7O'[O5\G;W\6V$Q3$=D4IKE#$03E6[IR(_$D"F44V`A`F)I]C3J7@T
+M3060.=)&PI2LBR2HPJU[K\W,-^_U-R?%,,O:VA`2544>L+78G7UK]D3I\^+&
+M9*'9&_7WL>DGZ2$*K\Z>^-`/O_O9?_VSV(DDN$54=^_<>;@\&*($D"UV]QS?
+M&EX;4=R.%K9W#X:3/1_ZS6[<6Y@Q[09CY&NU(Q."JBP5I1H6$D4`D6IEQCAV
+MXE%/[:6)"00D:E`5@GBG8\R4:6`*6DR<C@?5X-`!!J0F1B842EBACIW/4:-1
+MBB54X*D1S:S,GKIT]N"@WV]!X]T75I<6![]]V[ZRK0M&+H*13_S.S]VY_<NM
+M;WK\\+%9=2H3[\9Y$2$Y%U*3QM`XV!C[@=G:.^P?YAC&825:Z&!O9N7J]7L0
+MI01Z]?3*WO7-"R<O/K_Y?);!B?E3O68W!!LI&L&80!:7YF_=X4F^\4_^Z?_K
+MA_[,7_NQO_5W?O#[_OKR:FHZ$1$*ZN`",VBE+5=?G6)_K0@T38"G3!JF&J(U
+M10N%>EQ?(QAQ.JNG(QT.J0<%`:<";5P[R-8S$IC"LPD$0=14<\1I$W.H&0=@
+M##KR^P>;K5Y<[(Z3IHEBQ>RS.&,?H'+G%D\;,+?N[54#WKR^MJC4\GPC^'&C
+MFTVX^H_ERY>^]8/50?]+O_WIQ\>%--U&_W!K%";<WT/.VQVU#-7>^/K:P<;=
+M#0';[%+6F\<($<6ZR@:/Y`5#,+:@X0#W3$3-.$*@`"@NXA#`@5(&$`6L($^X
+M"E$Q#`?]\=Z0^TF4.`>;&_NNU(8[>3%8G^QFS5:K.Q]S--H9D2T;J?$V'(SZ
+MIIN=N7ANH3<[+,:;ZVO5N#AL4'&A.32GD[<M.PY5GFOK0K+<79W-+JX4NAKO
+M'R9^W,LB%(=(-HK&0[^W5YY=>.3*)W_KZLNW%U96E:7SE_%P,GK^Q1L+[=,!
+M9M_W_H_^ISO_^AO>_9YWON7!=B>=6YVS%;SSO6^;\"2BQ$'8W=P_L;("7"0A
+M_=F?_E>_\/&/_=6__.-9E@0EP97,R($(M=8$E0,4_;NWSA&%[_[OCX,1**4(
+MN>8**@!`-86S'?\>!!$*-`6?U@U%`N6/YKY80^/I6'M3%(J:[BD!!"0AJF63
+M!%&0V,1J;]S71GH+,Y[(!8D3PQ9"\+_YF5_?7MD>;.<3+GAX.&<:.]L[<^W$
+MC]VP*WWPJEL)N/=]]T?U)SZ[LW,P&DV&/MLI)L,8`!*]:(P+U<$HS:C5GNDM
+M-WL+[:@1`XGQP:`*`0PI)"YD>.AWA#F*H@Q:`#IX<)66@,A(2A2%H"JGQOVP
+MNV77#\/NVG!]>[#C/(S'XV:[T51=T3+*^[O]G='VI!UU5>`H!A?*/%1Q.UDX
+M?V)A:4&*8OO./56Y-#)[Q62B15WHZ"KLV4FL6_[PH-?I<#/;<H?#_A@PI$8B
+M%5AQ)5ZTQ[CA&35'>S?V9,/NA=RDD>=P]>:5K>&VA^A6>?-R<N[[_]Q?F*QO
+MW7[URQN;=RX]>.G<HV\!TP30'NPK:U_))SPW=_+TR58W:?SX7_\?'WGDW-)B
+M2Y0KQ`;P2+$RFKV4I:M3H*-#[4C>X'?%(:DUU.%H/VF"J8-U8%**J%8%O(\D
+MB2!<.Z'@5!$8I\-^00BU)!NB)@4@@%SC4&LJ#R(P^1"<ID@(B)`E(,KJB<57
+MG_M4N]N(TH@`8DJ44H)LJ3K4VU_<GFQ>W]_BM=E4;AX>-$L[NWBVZ(\@8)JU
+MUJ]OGSB_\I6=_6]XXHD[OWTUS;V.VJ,H[T><0UY&TEY(-<W&L)JF*;6U&`C*
+MHX14B6(,DF4Z(\4^Y*.PRSX8B>.XV60D&TDP)`9#$*@,>8HM1FYM]\:5@ZLV
+M\QN3S9NW;IK*-./F?-;SE<I,9EK8KVRUNR=2==(&1#RB*EYJSU]8[<[WQH-=
+MMWZ@^Z/8414X)DJS*&8C+,22@]7=9M5IE*3W]L>VXC12FKF8Y%'7"`K$$D4*
+ME6QOK?D\7UI9HEXS2D(5!EN#8./#E^[<_NPKZ:DG_VQ&I^:6'YQKGX84P1]8
+MI!+$@AOX]=>NO?+T$Q_:W]]%[]II]W//?OY_^/'_(4KS254&$&TB9@,2D-B'
+M"HP!`/4]/_*W\?4@]'I0(3R27#F2=E,U]T$!@W4\"CAA-0%=H694]7;3"`9!
+M:22%6/L^(.EZ@EFKZA("$BK$2!,B*Q)$1A+4@`2`$J$"BQ$:18`:G!28Y&PF
+M7W[UL^W9U+I2&=WKS3KO/7L3F4K*(I3S*XN///X(LW_^Q1N-MO+>MTRC'3=2
+MG71;[>W]W:S9$$5W>30^F38NKAPD9)/82@!0L391$C?:#9/%HB!P`"5&:Q+V
+MI4U5,Z%$U2%2M!*30;NI.Y`G9*-(B`B\#E85G!4AKE[-7WAQ]X6UXEZR$#=F
+M&Y6O=C9WKKYZ]<SILYY]@*`)6UESJ3W38#7J'^Q.]I+Y;.7RJ?GEN9`7@SO;
+MO)-G(4I$EWG5Z7;G6C-QA;.M.:5;5UZ^/1KZO(3QQ(^&90@"P":FM!6+DDZK
+M&T'FAC+8&(*EW:WM="99N-`^_?!<U('#T<![42"3P]T;-UZ;;2WWTJ[.XN`F
+ME"E/:@3ARNW7MM<WWO;X.YKIXDQ[?K;3O?K2:Y_[G6?_WM_]?YLXL\Z+4@)1
+M68CWH&OF6=V/_MGG]E^//?0Z+[TV#%,(I%`CT=&,/DJ,"P.5#IY_\;>5*1OM
+MUL+L^=GV69\W8^Q$@&S!`&NT('9B2\@Z#DDX'/7*>0HMT*0C)5H$V==N:B0Z
+MJ$9I=(CC%!BA")#TPCC<?/[JKWSF*Q_'9,2Q+=G.+*[JI"'*5&7(3&,T&K.H
+M7M:E,6V^<'O]LU?=U:W'DODSICE<6Y^9Z79/K^AN>Q2"=&5=W7KG#W_DU;FP
+MHZO9K)5796[``B@RXKQR3$2,X#BP\^2E)<V3<R><#^)50W5QG)Q.+C6*WJQ?
+MZD8SZ&'B"]^V93:^-[YY:W)MF]9&-*BD$&2MM1;%8RE'[MZ-+06:`$$"L=?,
+M"8"/@EY-+SQ^R9?%SMJ6/\AE)'/1;#6L#@X.TD82M6*CXA9T%CNGSI]X;&GI
+MU"NOO?R9SW]F8W>S-9?<.[CEDU$R@XV63G5$E6[ZV8.-T9.//7/GWKV1'0=3
+MQ4U;%)/=[7(R\)-AA<X]^>"%IQY\RXT7UYM1>VEQ<6YA-F@>5RYN+ZS.GKO8
+MNN@&E6E0G$;C8G+KUNUJ$BY??E`IY5DJ3RX8'U(G$$(5A&NE:O4]/_RW7D^)
+M[I,WH"/+222L"WB:>IPJ+U74<(TNO?3:LU_^RN<'XT/G[>+2BM:F+`(()[$N
+MRX&SH[FY[KBH4%`!Z%HI5P!%2#A26A,II:93.44*20ETXTP3'`XJT!H3MC(:
+MV[TKU[]TY^X5YZT(!L8H;KC@HL2DS;BP96^N%S6HGQ]66N;/KBZ<.=V:G3W8
+MW[U]YV:"/#<W<W=[0QI-.SOO&M'&]9=7+YP<KW2WJE)9"#;TJRIM='-?((`)
+M2%YJI<S*<35V4:$N]BY8%W1(H-"4Q\6V7>V>[N@9=E)Y*YG/X\&M\;6;PVO[
+MN#V`/4>Y@(=@(3BVUOF2?5A<6FPU6\VLT>MVEQ86%Y?F6S,M:D>+#YZ^O;$V
+MV1VXW<J,HP6S>G;AH4ZR?'+U8A9WT>J,>LO=<^>6'E_I/-C2BYW&[!./O!4L
+M;6]MSR[UDG;D5>DEE.-JO%.4VVZRD\_VYBX\?/GNX5ULNHL7Y^=F9E-]`KGK
+M+1!0;L=77KOZ`W_AATZ>/Y>T6PXAZW;.G+^PLG(FPUZ;YSM1FX6'PS%*.C]_
+M=J9W6C@61&$25A*TB!'!`#6N'@#^H-MH*GA-B)-),=OKL6<0D!`^_)$/WKIS
+MY>IK+^P>W.W.IO,+/2'GN6KV&BJE<3%N4]*D*",5`2D@`E1**QT!D")C4"G1
+ML>C8J\@I%9RH00Z'S=D&)ARHW!O=^Y5?_^E?^XV/*Z*JDE`FMM1$2>5=G(2X
+M@7$WB9NDP'D[$0B4:->(L-,X^?#%O6JX<[@W$4^M]LKEA\\\\;;O__X?^),?
+M^>#M>S>OICQN9\-1@5&B3))/<F4E]LKXFH%.`)@7^6AGU'*]1Y:>'`W+M>N;
+M#YYZ9/?.X=F%BYUXAEBQ<(B\C<H=MW5M]Y6[@YN5'+(MC/@H"%H'9255!3:(
+M#UK(5I5S)5`P,5*$C,X)[^P<%`?.'U`+%EN\_/ZW?>OE$T^?7WER=?'!TRN/
+M7CK[Y`-GWW9NY8FYYMG(]VP!699D)CU_]L+RTG)13>[<O1$W8ZV5`9V9K*&;
+MQ:CH#\:GSYYY_L4O:R\7>JM/77I'IWG)01K/M`I3[KL]2>-?^N5G.XW33SWR
+MWG-+#_=,ITV]!L]$55:.4<@$U"IJ*-U@4$!D*X9:@HYK2B@&X0"!:VWBWW<;
+M3=T\2.$TSU:SG<[AX3"*$D)U^N0J:7[DT8M77OO2<+RSN7TG+\>MF<RCL^`<
+ME:`"B@.N`E0!+%!``]J0CC`$BQ00`Y!3Q,J(-@*1+<T!979OLJT2=^WN"S_S
+M'_Y_=]=>JZHR.`I6LX^JPBNCD5P4!U9.9SJW$X.^VVTFC602[`28VDE(]?E'
+M+_>69ZB=?O#;ON6C/_B#EY]^)Y+^^1__[[<WUL;G%@\B9!\"H[/>B"(GY`4"
+MDA`*N=(-]P;CW>+2PJ-G9B[^_'_XQ02RBR<N]S='#YY]1"Q:%Z)FQ(G?KK9N
+M#U[;R.\,PHZ5"3$K)O0LWK/U;`.[("Z,#@>V*(*SSA;%>#`9'Q;YV%65AC@*
+M2;Y5+C5.O_WR>T_V+O$HT=`6&QGJ)*JGI!F*V.4(+C)DG*NLK0Q&L[W9E97E
+M]:WU:S=?S9HIB?C2^9)]Y:WUIT^?%9!0E.>6YD[,G3HY_\3\\FF/A<-1UO$F
+MIF8V>_W:O1NOW6HUFB=6%S4HGV-D&E&:680R>#2F\C(:EZ1,G"CO?"U=*(`,
+M$(`]LTR[?C#=1CSM,ZK[J'Q3X97:2@YKM4-!#088LR1CEN`MD;SRZA>-\2^\
+M^*P-H[7-FZ_=?O7F^@T+9:6MRE!UV&>EC0N)*XF<4.%Y9/V0=$F)U9GCI)BH
+M@SVW?F=X_=;!U:MWO_+RC2\\^Y5/_)N?_=]?>/EWVKUH?6WK2U]XU8X,03.)
+MLL`V3L%$(4K$BZU<A1226$>QPI@H-DYCA8%-V"\/&LO=DX]>//O8P\GLK('&
+MLS_U,Y.?_=4>2WEI\2`2)"6(,6E?^H@T>Q$A308JR?='X[UQ&,J9[@,NQYM7
+M;C=-JY?VGO_,\P]??J39:*I(^\AO%]LW#U[;S.^.9+^@OI-*00Q!,8OW#(&1
+M@7T0&T)5*4$,0:K*32;59,3Y)%055RYRY`]Q(5E]QX/?0'D\WUF"RFB*0Z5M
+M`:$DQ5&JX]A@I)!(V=)34`A::=5N-V_?NWG0WS.)]NR)42EC2V=+]^#E1]GF
+M"/T'+E^*<-%(='%IOI65KKC=:C%#2-I1O]K_RHTO7EM_B0UWYQ:C9J-?#3!%
+M3U*$"C3$F285JC*?%N%3KSCAVM!-Z*M'LU]U36V>[FLJU5S'LBP-*?:@.`+*
+MRE'^T+FG?^KG7NRU%KHS[?6-C4%Q&*<[>Z/-T<2>/'E2P*:Q:6:M;J/33IM&
+MZ5IW),_S23'9&^SO]G?RJF`E8!`1?5EX/]S8>FUV)LN2QL;.5<08@K[VTNUP
+M.>HT&ZJA)(3@77"15*`T>)0)%"$$;6*D.%411F+)RPR,T;VZ=W?CVN&#_<W'
+M3CWYR=_YI8>W=L<'96/X\'*R<+?LC\9%-CN/@5F!#Z(`G<,P]).]P@Z]\O'F
+MQG:98E%4K:3YA<\^]]033X['_5ZW)T!KAW=>O??J3K'NTG%)$Q=*1O;@A4DD
+MB'AD`0G@0[!>"03K@O7L!1@U&V$?V)J(\BH<W*D>>ML#,A&#D<^ERITV$0$:
+M,4J#(A`/>3ZQ-M=Q,MOMH8?#05\UT@M+#Y]?>5AVPO;>71T#&:4;6D9RZ^ZM
+M=[_K_;AZ<F)O;!SLG.VZ%F7BAH\NG5B>?^K5M1>[/=X>V%$NP&9S<O-CG[OU
+MJ><_OSIW_H$''IB9F>^V5MD)$5H?RN&XV^KYB1:((-0-8P\@=;9<7YI?]\]Z
+MW>NA5H.@J4Y6C1>J=5B#,CJ*]61XV&@F92D+<Z</AIO?^J&_]/R+O_GN#S[!
+MNOC"BY__E=_X1"@+#_'=K<K$)DY,8O<V<V(IG2N=SSU8K4EKK6*-2]A`%;Q4
+ME:OR$$B&17]F(3&158;F5V;N'.;,`$#>!Q^*6+DX)6UJ6ABQB_+*V8F%%C52
+M8[3/3&I:C?U)WT;*2CFWT,U\>GO[9O_:P>S%5MKTC5B7?G+[M9=XOM7IMB;C
+M@=9Z7`;26@GXW-O]\:1?N(HUXBCD-U[^?']_.U3YTX^^]0-O?W<`61O<VQWV
+MKV_=O+9YK=)Y-H-!YR%8U.(H]X@DS,$1!V`1[X,78@TA<*7$*Q1B)O'"H7)Y
+MZ49%&."%$^<7LEG#K?W=@TZW5SIKT(A@$&`/A#YN0+/5$DPVU@]G6KVY;G=_
+M,$@;G0\]\R?7/W[[W-D'1FXOGXR$?=))RN">>_8+A3U<NF1\8@KG8E>T%6G/
+M79*'3LUEXT&<%^NC:EQ6X)6R:37JW[(O7OW,9]AB*UWTE2C@<C#`BK_I_=_V
+MR(5W8Z69(PDH$.JAZG'+^6M%(Q()M?`<,DQ#%Q*`E&5.&->^1(VXU=_+YV;.
+M3.SA>Y_^]L]^\E>V^E=59O/AH#L79<WFQM96W,P\1P$,V&!#;J50FE4$*HNL
+MB/<^>,$``"1>6&@\\7%BDB2-XS#J#P:%U:81I;QZ;J'54:P*BJ31:F#3ZX@\
+M*5N`4HF$:I2/G2Z:60L3*8?CN&D:[7A@2TI\\$7S1&8/RPOO.'ORYB.?^*TO
+M-&;,TIFE.Z-]/V%D#'%2B22J)<(^+_/AL,@KA^BTO;U]?7-[@R>NTT[B%@[A
+MH`7MF4[K/_SV?SBPPX-R'Q/F*#9Q`$'%).11(P(22W",+.(%1;SWM7I8Z5U5
+M.%LQ,YB`'17_I3_[%T\M/L[CU%>JS,=1%-FJK`_`P(J!%$I`[T)1!$:4F;F>
+M'\-X!.VL,QH=]AJ+%TX\^)6-SW.*E&HEBAVT9]LW;EQ;6)[9/1B^>NUZM'+J
+M_/SY$*JB&$L64+E.1ZH.\$R\/ZY&_:(:YK&J4M6)6KZ_DY=$16E;F0I^F!=#
+M;PY8Y\IGXNA(7IR/;&<``-^PC?B(;0\`ZHC%5_/9F85J[3"C/7M%X+U'5+%N
+M56.*5->.X5U/_*G#XN'?^LS'9Y.EMSW^UF?>]=Y).?G5W_R5:[>N.Z&\*,C0
+M,!^NK"Z&,I05Y_DD36)$<&4!R.R#L)%*C&Z)CX?C47!):M)G/OA,9$Q_?]QH
+M)(UNE'8HD(]C)4J\>,*&+5PB`DY`<3X>#REOS'406,"U,YT1.+"YL]1LKK?=
+MPGO.WME[?F;1]!X\C9.9T>&HR/-\DNLX\;:8E,-\?\23"6/P223&_XF/?&!W
+M?;NG6\NM1=>O$&P?=A3$C3ES[>KFYL%FTHJ<35O-K)G$4'H=JRFSCU&#%IF*
+M6I*"*GBO/38Q;IH$M%(F"^U9-W]B[BGC9P-$KC)*J1"<$PD<!#2#$:":VHXJ
+M!27@56E9:?("8D5%22CPG4^]Y\NWOVA::0`['`YC2L9%^6W?\IW/?OXS"G2K
+MU=@8WGCIVN<C91=/JE8Z+&`(P`15JF6^J9>:+5^Y@]W=_LY:HWFR(8886@O-
+M=DHO//?2(T\\F,VQI1RA4M``1"0-P1/8(`*H04A]]P__[3>=RR+(ZW*_"`3U
+M*'6:;Q,J`"*HO6](`65)-AE-YF?FGWC\R5:C<_/*S>NO7NOO[UD[VMJ\6XXG
+MQ3@W8$(>3(A&>Q.I")T:[@XFA^-(F8B,M[X8E\A*'(SZH[)P\W.+>WN'?_*;
+M_D2KG7@>)RV,,DDZ%'<2BM%3$`%VBCQ'`FPKL3P:%WD1#@>3RCEFAA!H>B,H
+M)NT*/]P?K$-EGKQ<9%&BHT:<SK1G%A<6F\UV;Z;7;K0;4;32Z5TX=_[T0Q=.
+MGS^C-&=9/-_ID4`UR0=N>+)]\JZ_\\KU5])FE+9,44P.]P]"Z5.,(Y7XJA(6
+M"K68?6US(\`2.(3@68*)3=9(HB1&0]HG"^;"HZ>?`6ZQBQ`B!@H2@&K?$A10
+M+,0`@L18:WDK0%W3'1!1B)%$#(]LWV%Q.#E`%&'L[PW?]\P')/#>P<["_.*E
+M"P^</W/1*WCYQI6UO2U*XSZ/O4*B!HKQ);C2:A4:63H<A'$>.C,S<XNS%%G'
+M^9G3)TZ=/,\NB["CH.D<>EL1"I`'"!Q(X&@;R7082\<"T/?5:U#;D](T."&B
+M0H@(M:J]N2D0.8`0F2B44(S"RL+IIQY_NF&25UYYZ6"\N[^_M3"W\/YWO?\'
+MOOO[O^&M[YE-9P_6#P\W^Q=/7IIISD8J18A&PZ(H?55P0LW1X3A-&P*LE<G2
+MN-%.'W[T4KL7M7K&-#AIZZBAF,0S"Q.6#H,7\F55E0$.!X4->G]W>+@_KFS(
+MBZJTGKV"H*2@\<YDM#<9BCXPN+:UJW)V8V=+#ZA=Y2!`1*J;-!8;W4::6';C
+M?,R5NWWM]OKMC>V-O>M7KA&H[LEN?]S_W!<^T^C$21;9LBC'A<N=F_@\+P-Y
+M+RZP!,?>!?8@`=B+JG68@12B!`Y5\)7#/'YXZ3VG%QX-+@I,0!2$/7HA#%`G
+M((H!I88T(S,@`XA"1N*I]S4H12K&*%5??/$YBL4D$08H1M5\9W%N=F%M;6UY
+MX>1<9\7HSES[_-G33XATKES9W-P>'!S8T1B]2XB[*$V;XV0,@T&XM[9;V:",
+M1H*5E:5NIS4>EN*32'>-Z@:+/GA%HI3UP;%$(O2UL=BU.8G(U&[[R-T'$4%(
+M@(0AD""PPMK,6DD`@JP5M8&K<G!X=NGAR]]WZ>K&2Z]<_\KN[NZ5+U^_\>*M
+MT6AD*[][L+^TO/#P0P^T.NV#8?_E5U_:V^Z33J20T60R-SLK6ER>-UM9:4<O
+MO?+20X]>./_@Z=EA8^\P'N3#W#IPZ"U)8$U66$K@DGT()J\@M7JRSX*LQ`U'
+M^7AB82G2S43R<KPU'*T=0!39/>N5+XK)7CEQ"E0<S<_-C<?CHBQ34$VG7.7[
+MH:PD..<:2=N.W/[&'1/T*U_Z!:.3+W[Y.4BXS(=DL-U,TI/+H_W)X<ZPZE=M
+MB9*F:41-C8;$Q&04:0V2#T=:IYHH>"E*QTQ)G';,RHG%BRAQ$`X8@,2+XUI9
+MJ39Y@<!3ITJHC>I(D,63\D2HF$!0>T4V/K-P\=3L^2U[VU.A8IVU[*>?_?1,
+M8V8R[@_V^M'%:(9F@VUDE#R\,+<Z<_F5C=_>'E]?W[@[L3O:-(AH,NX/^J/M
+MK0.ELV:[L[F[R:YX]*$+%211*OWA9J)G(S-#<=>(1@D\]<P#1#P^U`C?4++5
+MPK,RC48">!2-:NPKU>9MQ(0>E`?RSME&HZG(%(5%H#1*-$7BU5QK]?32Y?.G
+M'^[UYCV$D1M3"SJ+R1A&V_WU*S=?7=M8V]\]/+U\YMN^Z3O?_?;WOOM=SPS'
+MAS_PY_\,*K\WV-$1883C?'3RY$J:F+2=D*KGO`;98`##0<07P0\*9RN5#[C<
+M"8/U\5QS/DM;$Q\J%R+0*I>P,1S?W@U]ET5-@\8-JO(@KT86)78Y;UW=KO:J
+M:@#%GB\WRFK?AY'&W#2XUZ6Y,W.7+YUX]&!K[$KY\I=>Z/8Z,[.M."$$IQ0T
+MFHTHB@(@1E#P09Q0EF0&(PH1V`@*$T9JJ7MV+CMUHGOYU.Q#%Q>??/3TN][^
+MX$>>>>S#+3-GHCB`#6!!!\\>@$*]80!J[TF`(#6X'0"0!)A14&&-84</XH)U
+MY<+B[(NOON#%:F,(5*AD=V=C9C8E=B=G3BZW3L1%-RZ:#6[-I-VEV=;L;*/5
+M$AW[($7E)S8X0#&QG#VW>N+D*A$>]`^`T+I)ULRTPDA%$34C3$EB\<AL$50`
+M`T"_5Z4F5'>/^#@:37TRJ!X9``,&"`!`@(%AG.>&HCB.B,!9QT)Q/"-52+&9
+M->=G'S[Q^.-OVR\V=P[O[8^V*REV=K;R\42C/DB&,='M6U<V-C;N;=UL]AH_
+M]5,_68:Q,FHPZ9]:.N&Q&MOA3-29H\5X-DN3\6A2&!H.?#_/0^E#6;E02LA!
+ME\GF]9VB7RY?/MWNME/8SJ7/`S?,MVEW,MX9=&>7O7#>'PX&`R2==#J.?5GZ
+M&>H^?OG)<P\]VDB:;4YZK=DXRSQ#K(SSP58ASAKO?>*;?_)G_NW=K:MNDI>C
+MRL1*I^#$^Y#'K70I6G"NQV[FY/+JF1.7Y]HG6O%<)YZ-L$&!8DSJ]J82`V*$
+M-4),9!C0>XLJL%@1Y4$41"Z(A@AJ&7FLTRL0F*)'&4B0@81%T"):!#!^#'.S
+M2Z?FSJV-;N3Y.%(1)NKM'_K0%S[_&]SL)$DB@?)1V39M%4Q55NW&3-8XO;@0
+M+BVT]F!OOQH-<I^759(J9JI*:K6S@+,!_7:_+Z%Z_/QC+'M.]CQV%*4BB))H
+M$N>!H3:.^EH=R*D6=MUX/*KM."`*'8G/"VH6[84:G42\][X,7!I0QD0D+>N"
+MB5-$5XWS`$))9RYN=>=/P)*M9'2PN.UA[,/D8+#C_*2JRD(LM3H!J;(.33+.
+M^VFSL=_?3-OSI1\5D3&PU(16U/!-,XQH+=9AS5<HAD8<343&.K7)JW>&&I/J
+MD)LKK:R)HQ)<OE_L'.BA36(],56.`5#I3MI(V@(FS_ET]_3W?,.WGEHZG\VL
+M%@'\*!B?8&[("P4WDV65@)]P3T7_ES__7__\)W[ZQ=<^16$R&0P-"R;HP0)P
+MTNHT9>YLZYG3,^>7YL\DJJ-"HJI,BPZ.@4B"$Q%1"I461AM8Q,8JL=::!K*S
+M@I$74I0$7Y<UJM8/@]J7$A2@8D`A7]LO"0?O.'9&@YI-YT=V]YV/O>M7OG`P
+M'`Y8_/Y.?_&]RV]YZ*W;:SN;._V32SJ9;=@B4"Y9E)+M!1YH(Z`J92:-N!K$
+M-`$8VWWG`51#3,Q8A`"S,VG@?%#=-1%ZM>)Y#GE&4P:B`GL$#\#JNW[XQ]Y8
+MJ4W-Z>KDB&B:&^&4#P)`#*K67R4431@1@D:V-A<NXP1-C%ZL%4&=H%+!N5@;
+MHY)8-6-J:DFA4N#)8)(E6:O1-E'<F^LLS2UW%UOS)^>C3MR?#*S(SMY^E$95
+M5<XMSBTMKQ)&E6-'I%640!0I%1M(XR2``5;E)*\F%>="+G[I^6M&-?;W^DF6
+MD/95.1CW]_I[NQ(X[K2*6$V"=0%!#$J<#]Q<>_4O?L^//KC\B/*-HM0DS0A:
+M[`V&*#7&<&)SKLJ@=1+%:0CR\$,//'#Y\F0\[A^.B[%/59=\QE5DJ-W5RV\Y
+M\>Y3G0=GLI/&M[A*R*>*$Y0(@E(0$T4(QGNR04"4UI$$R&UI(FU=`"#@2%/D
+M+$#MVXLB1UHO(!H!N2:@$B!0L!#*H`(;A=;9)$M9X\M77_52D&$7G+/E>Y]Y
+M]];:7I;.+B^<1LS$DX20)#JX$:@1ZL.@!I:&.>056`O6LG."('HR<G?O;FI-
+MBRN][9U[6F$6MUKQO.&F\JT(,P2PUC.*(&A\_;R"^N1%F?IHT!'SL)ZG,**0
+M.)3(:*((')&/E(;8%`B%B6UI"Z5GG,!$\JS5';M*!]TT@LZB1,)`!*2UH98'
+MXWU.H()J:(@$_'K_]N'$W=W=O+5[C6*X<_>V(G-X6"S,+C?-F59RKM_O]^:;
+M7(W[H^VSLRM-B!MF=M;,9SBW;K8U^,!V@&7DC9E-1N-J;VU\\&L''_[H.SAV
+MVY,19!'H=.QLK"C3B5)).09$\\Y'WO/N=WSC<N]B446@#(EF3\+`"@'"Q`,!
+M8`0(II(@C@E5**.Y[,*WO.<O5;X8%\.\F#CO=1PUFZU&W,F@K=BX"0HH122,
+MKH8#UYKAM0TW(((21EM)$!]%35L%Y`28-$6V\BPR*BJ1(,B`K)`BI8U2VJ#6
+M&I#%*^\#.%0<O"XJ8A,U1Z,\;BZ_^XEO_+4O_.N)#'73W=ZY<9`_T1]/E#($
+M*,XB*=-2@[!+[;S`R:$O]LHRU^B2I&`[M#RRC<`F[Y?7KMSN[T[F'YQOM.+S
+M#YU?O[&7J&$;=]OIDO(#-T$%V13!^M65&AZ'(J2CL(3'O/JC#15"4!PT:*,@
+MJLT2T'`(22.;V.%^OG]GY\;2F1,Z[LUT>H4+/A!(+*P`4(2]%$YRZXK#_NYA
+M?KAYN&FQ&A0'0:J]\7:4]=9OWVW"W-+<\E)WU96\=W=\K;]V]H%3:S?7FVTP
+MVF[CCG1Z'=6IK&UG#75R*>NB::B-._N#K9#V]"2$Q=G>N0=.S:UVL94F8S@<
+M]L%IL2R.8VH.#FTSF?W(^[[E'6_]4&IFI(H<1RA&N+ZK0NW"#@#AJ#5[9.>,
+MX`V"2G0S,=!2[!,70D`28XRFR%5!0-5S3)&I;_-44Q,0N!YNB&>6P$%8:3V5
+M9:V=PAF96<1;7]0*<`"@!8,/CBHJ)<UTG7Z+)V`2($'O,8@/VK28J9TLM]).
+MX$'$QJ'_Z8_]AX5T^6"_;W2J@Y8@N:UL<*]>>6F,6WO%[=UBK8`]CJR5HF";
+M0[BW<4^*8J[3NW3VQ)F3W22U@^&D-=,^&`Y<KQ!5!"B06@;C4`94`K\7^?K-
+M+L5@")6S"CE20:L(4`E'#B,R,+;[V,J_\-)O<7IX_>JG%I9.5!NAV^H0*`0%
+MI(*`]]Y:[]E.\E'@4AL>X="YRDI)1!'QU@L'*XUSW_S^;WGP],/S9AX!'!2?
+M>>UW?OZW_^.%Q\X/-OJM7G:K/RSG53%9>_CR10]Y!-+I-B^EY\Z?OG2PD5,1
+MW;VUU^OUED[.]7EKN'?@;0X.L0`N*=:=K;N3)Y]X^W=\V_>=F#U?5N`=82!A
+M`.':+OW(PX*/E1Z/*]CC.ZK,2Z51*8538_A@/0=OA=44BUQK]`#7'A((*,S,
+MX#FP%^=]<(&!=1Q1H",%!`$0'WSE'2H2!(4*`)")1;QC@0`%UWIVR`C,H$"+
+M`D'G.&G&+*'9[,S-K!;]/:,R!_EH-.X:L#8P8_`:0T8!(VP]_<@W53@\=)L[
+MP[L'^>X@WQ_DPX'=+*-[<^?UTEQV\L2"UE2IRNFJU8;,Q+<V]_)B&)K@!(GC
+MB)1G1>01P^^UC8Y!_J^SV(0B4<1""*@\@@]LF`PH@`0<^(V#E[![6.%NLZT/
+M_/514>W[5@``"$HC$0DC,X*0XZ*R.3E;5GE55:YTXV$%@^C1Q:<^^O[O.;]X
+M-@(]V-WYU"<_,2P/.DN]O_)]?_F?_,2_@$9<CB5*8Q/)[,S,EZ^_VNTU?:AV
+M#G;SW*:J50ZYT8O;$W/R_#P;;\=5%">N'Y`5Y]"-%TS4_>@/?/-CCSY%;`8#
+MFT9=$&4=*T)A%JE-BX7K<GOJL\/3>?8;_$](&()(K2Q7VS8Q4.TQ2ES+L-8Q
+MB0&`.01AYX(+0;QXX7JW!F>54J*T4GJJ0!>"#Z(BHPBQ5CME%!\8/'BIK%>H
+M@0("$9`("A.0$L%@@VB*HF1E\>3MG9?8HB_#!S[P@1>?>U5%REJ;,&K02BD1
+MF!SD%#?;\>EL9FEUI@H07/`%;NW8SWN\:_20>>3*290ZA+P"-DD;T.WL;5]>
+M1%1:0-L`4OL_RM<6IGE3XA$BDF@U9?@#HX/:)CB6`O<V\B]=V?Y-&^^-;=&4
+MSKB<%)6?E$"H$\-:('@W&>7YJ+"5!PG]P7[IAD+2;'72K`-`W?;LA][QH4>7
+M+D90``SN;7Z^J;8.!]O85#M7=__V7_K[?^WO_MV=_.X3[WQ@RT\\6U28;P]&
+MH\&U&]>WM_;8$K'J9;.Z2?O5;K_?SWK-).J6`]/)>G/)PL/GGWKHL;=U>PN1
+MSM@CH*I*P8!)TK"5$\%P[,%TE-J^;@3&?-^RH-)U05[[YL"1J[T*?DJ@E:F'
+MB-1"T=X'Z[WW[#E@7;0H8@3KG4($$@)")!;Q@(($J!B`2`D1(8J`N."%E2@F
+M#(*U.!D#,F@64117I8T::0BX,G<:7!Q*\*5_^)&+>^O;/DP8K8Z$K(0"@*&=
+M9$S@O,4J`D@CI9MD.E&OUS465FRU7OA-R<8JJL:P0WK<+X9IC(>'^XB`&IE<
+MY84,!O:"\/L<:D="CM/E$T0O0!@C*08G*F"$H,:5'NQ6+ZV/G^/&OJB"6&VL
+M[T:1+H:6V(R&_<EDUX6Q)HXBW<@ZS68[-M&ITZOM;B/+$L)D."C6UPX>F'OT
+MR;-/&J#)9+QU[^K_]K_^HT_^UA=Z\\FO?^J+GW[^ILOA+_W9_^IO_MW_[MG?
+M>O'$I0YA-K><C88'^_N3_H'U(6;F+$FC5I0TDK25JJ";[;G#O6)I=O%/O/6;
+M+K0N+K1/FK2[VQ\RFSA*\[R,3&PBW-L[S+)FG1<Q@-3;@*%V#)%:6QV!$!EJ
+M4UX)UDEM1X^"`@R"$@1#;:L"0"!U'"(1#H*EM9Z#]\P`2FFE%!(I0G:6/0O[
+MP$"(WGL;V`MKHP1!IO-RK.6!:V-VA01`<N334O.?E5+.BS"(PW9GKM=<V!_L
+MD%!556]YR^,W7]PFDN`J"%%P+C9I53H`%F1$-!!1T*@BE*XMYIJ)B9(5S`XJ
+MV#F`FP>PR\)VXKR5B!/V$4B$B"Z,C8J%W>\5C=[T8@`'!%H')`$QI%14%+)Q
+MZ*Z\>/?CA=YP6"POG[W]VM9DQ!"&+J_NW7A%*=/HIKW%=J.;8$*DE34*(DVH
+M!NNC8KA#3AN.FE'W?8^]'P`<`.B.J/E/?/+*<`3?_KU_FHEFYGNM+-:B_JN_
+M^)?G3W2V#Z_]ZF__1'\]:LVT^SM55>A6NVV#:[=BYZTA`I6EJN$+E>'<.QY[
+MWQ,7WM,-W<FA'4^J9K.=CZJ#_J#1:)7CJN]L;[:7Y]4T)ZHMP1!KE7#D6L\1
+M&$#)T?=3B4%0B(+'KD;"@O5A53\C`L)3@WKK@V<6`=**E$&M!""`8!0Y&YSW
+MY#P*>`Y!$!49TK64"R&R"-=BY0BU*\O1H(H9.3`@`@$KI81%`A#'9U8O;.S<
+MM#I][>7K<YT%(J60O*LPQ*2,TL%S)>A)H4)DQ.#9EY8!VXUS=CRJ^H<JG8FZ
+M"PT5)[`?!8*BVEL_?-NYBU*VN4P4$*DQ8R%@1/37EQL!0"`F`IZ*/8I0.0GW
+M=O.7>R<<5/;DPIEB'#7BYJV7K\[-IKM;]^)8!7&5<\.1J\0H`SJF.(XE:L7)
+MG+%IK[&XV%S1K'U1K<""`@*`J]>O!5<5@>).]L!;WOX;G_SLHT^^8YP?IK']
+MR/O?NK6WWHJ6'O^+?_T7?O5C_8-AF%"DLK31LOD>I:A`KZPN):JQNSD>'I:/
+M7'C\G0]]0RC4P6#<RKK!PWC@HBCN=N.J8B%,TW0T*1"166H!=0$$@2`$`H%K
+M]JZ`H*\/-YD*#PB+%P;@6@]_.KZ8JL751^+4385!7`@RY440:26$S!R$HR1C
+M*%U960XU+A1)@R)6&)A!((2@:GE[82^L`9"#)Z]INK4""`E::],T=<$!0JAH
+M>>Y48EJQ&KSXI2L4;CYZX6T*4I$(@%!1Y:PRY`*X8`$`42%H8V)`4XTQCGLQ
+M=EUU*.-]3`809D-5&`L':UL+;WE0\JY4F<8,J+3!`IC?*QK1&SR?CDXW%"1!
+M\LA*&W)^:'0Y&-\<53>S7ICO+)4V(DPO7#KY\@N?7UKH//;X6\=2.@`0HQC`
+M5T;Q7*^YT)N?R1866Q<R.*&X:SA;N[MNJY$!;4`#^!.G.]L[:[_T6Q_K#T:!
+MH_F%U4:SM[6_]LCIA<^^]'-;F_?&@W$^LM_^C=_ZBY_\Y>%X!"F8C-K+\Z6?
+M+/=FJO$X[X\W7CM\XI$/?.3I;S1LJC*TLT;E*P!CE/8^.!<8`8!#"`!37V,!
+M$:':@JG.;N3(%WUZR;1Y/RW^C\0O1*8>\\Q2;P=UE`_497^6-<K*6>^8:LUY
+M%)B21TD9BH"=@\#*$!*A(A^8\1@1/U7>$&%2),`!G-2>-B2"Y(4UH@W.&!.4
+M\I96%DXE*E)LLK@++D+;J";83>;&!V4:92)<.BND`C+#L6]\`,$TB_(1)XJ2
+MI#O*"^9>$IV1H?WD+W[F/4]\UT+V2,++4K0#(.F$&+P@$/X^AYH<&7D>'VL1
+MB?B2.(F-)@%?C=I-S$VTL7MOZW"_U3DUTUG:W;VS>W#G]JW)VH99O+!$2=S.
+M5GK-7F94HJ7;I%ZK/:>64FC[,FJ8&9<C5DG3<(`J@K9UKF&:LYWYTMEF*TG3
+M^>6YD]O#[5.S9V]N?C$2]XL_\].9;OW-O_'C7WG^RI_]MN__QS_S3S=Y.^U&
+M/JE:2;*_L<>';+?@&Q[_X#<\_:=GS4(U@43%`I27DSCN,`01'T!@VM<1GFXC
+M!B%&1,':A."H-)NB_0B``0F$`=416IT1263Z"`2H"`#4='_5,L<("*A(L[!W
+MP0<DHR)2M;DE"P)I98Z"/RHZ&C;5WA*"`H#``*@H"`,P(:!2I(&T5DH;!+$>
+MD%F\^`!:L56=K+OE[CS^^%,J-+",&UEO>)#'<6<RL5IK)L7,@A`@B""(`M$`
+M6$V<0@Y@QD492&?-I9WQS-VKX;$+'SDY\V13+1G?`D!B$(Z%@P@(?IVY$0D0
+M>"6@&+0#K:FR/FM%_;7^VM;NPMEEDYJ*=TY=3C_\S8_LWQ%?JO4K^T!1I%66
+MEB9142RM=F@VLMFF/;/0Z=!)9TU*V<J)B^/QS0PRE#BF9JS:C=G5RCJ,DG%A
+MQSG/MT\)5&<7G_B1[_VK=V^\]H'WO/_2N<?[>_E,O+`\?\H[P2;>W'TM4OIP
+MO8A&R9]ZQW>\XZ'WSW7.#O>##T1:,TG6[E1EJ`-$36\0A%"+$L@TF6:>GD<U
+MD0]PVDN2UPOX^N[%(Z#Z?8\HS+5-.$'=.:@]P1$%4"FCM536AA"T"`MZ$>8P
+M/>O,5&N*06H&3VWQ6VLF$X+2I%#Y$`@(%9(&I5%I4DIK5)Y%@$-@02:,V94K
+M2ZLW;KQXX_IK?^[/_-"O?OQ3^_N[D?2,2)Q%@<%[#J0",(,240"$H@#`AS*)
+MD2GX:LPL),THK"9\_O+EI[OI<@09>H^@48`#B6@!\%]OB@W(P;HD2C0KL#[2
+M2E$6;./FRUMCA-EE/;_40BHS7;WU+4^K"Z<:N#SL]XL)%Q.3%UQ4N94!%B/T
+M)-R]<SAJR%X[UB<65I+(W;A][]+RV0@!R@#:U'+I*D`^<0(AC@*P&P\.[]R\
+MD9GHK4\]-=C>65T]X8!/GCUWY87K8=^BC=?6=L[/7/R6#W_'`W-OF=$KU0A5
+MB!K-N`PP&H]M(`+QXEF8!05K.`\&@:G9K6!M)U=C&>HF$+SN%??Z(^-7/S/U
+M8./:=N=H!QV'<692I+4NO9ON8&'K'!'5:2;QM.(+];^E^J]/C5<)D8P!31@0
+MZ\:D1E#,)`'1BY!6&(2%$4A!!!R?6CF;Q9E1T&ED)T\M=;H-LG$Q+@A2ZP-J
+MJ7$:#%!KO]1_3<7:2JD#$Q$[*H?2-*>>N-1KM58@J%!YMKEB$"!F+TBUA]#7
+M)AC)ZQC(8]-T$&*@`(@@2HB\`=>(::4!YS[[^9^;G9NO.A-E;&_QU$GS<$7+
+M<_'%D`054N2FID13`"J`AJ@<2L+<*O.FLY1D4=H)X^K$\S=>>OOY9U0CK?50
+M06!MPSK'R\NM5/MKMUYV=NN'?OB;U^_<?>)MYV[?>^W,(X\`1%L'>TF6[I?Y
+MP<;DL7-O_X%O^N$T[U'>#CK5`(&@M!`0E&E4UAHM7+LR`P1&00C3(XP$"!"$
+MCUR[CP8A\E4=M*D3YILO&RH%0#+-PV5J1X7(*"#(=9`!"$&.IYGU"GN16I%<
+M(`!.3;CK6U=``&HM=U(J$@1$A1B$A$$"`[+$2HL$8"",@&.`:*8[GZ;IYM:=
+MO_</_N_O?/)#EB?5Q&EH^X!)(RVJ>F87ZE.=12%[06``]E!QB(""UV'"JM5;
+MZBWE.01G/5<D`BC,RA,P*?'PU9#^WS<W"H#*1&40`U46139X+DV2G'OFT>_X
+MTDM77OCTK4:6/O'XP^66*=J=U>R!?`=C/:-"HCA32$JX3NQ%7%YRM]MMQ%%(
+M8'<P\5*<6%G]^"_]I`-WZ?RC&<P/K-_9F.QN'C[\P.4X!H9P<G7Y[IW=[_CH
+M=Y=%(6P>?LMCWB0;L`^I1QW6K]^]</K2NY]Z'Y6IJIJ9[H@',>#1#_,1*!W'
+MK484EU7)`"P40%@4U\V3.LV4^]]UF-Z>"%_/12(8@J]-+`F0B`21`90R+@3G
+MG/<>B0*(`M!:!Q``4#+-HAE!H0JUO#R^;CC.M8.@`&DU?9E(`L`(01"E]E*F
+M(*Q1.8NB*<(D2QJM;BMXC*+(.I=DG5`I9,QS*_5A75>G@A@$11C)N4``GC4Z
+M4M`@K6Q>%+ECBE$4H$9@%G0H=3)0W^U?WZ$6$!GCBEP*-C+,N3.40=DZO?"^
+M_^9'9W[RY__W+_[JBS/A@8^\XSMIW"CNNE@U`XG'`%!`0(-@%&N=$6&OG1WN
+MYW$<@896:JIPF&KUP"/G?^7+'W_^X(74+&S>'8]VJE;4?.:=EQU4(I-&-/?0
+MQ0\4D[$Q1D>F=&,&+F%\9_?*]N&M$ZNS"[VNC*UE>VZI9_O@!"P7*I-F4TWR
+M,B]8ZQ@`A%60.@51+"*,1Z[6]1X*)""U/5=-7'^S:/2U+@7H'=O*UGX]M2%X
+M`(ECJ;RSSA*1B@Q-+<"@'@#?OX.9)=0'*;Y>H-4]"`0E(@)4QR@DXEJX5=#:
+MBIB%`42%`*0B$-5L=/:'!]_QG=^Y?7M264F2#,`H;8IQI0P!,HH2\<B,M<$4
+M!@\VBA(0S3Z*2`$#>U6%4D<QD`(R(8!(XADK%:8G(O_!MM'480T``*QG;;1@
+M<!R\2!8W)SF@3UKIZ1_]L__MC5LOC(>%W9W)H!TKUI')15CI&I'B@04A,((7
+MYZPRFL7]VB_]\J-/GC]W<?8+SWWB<Z_^5O=\Z]4[SZ-O9:IG456C?0MC!DZ1
+M`B!!ZAF3J%&&'$TV@NU??/YG=O+;A9N<G%ETSAD3+_7F#W=RQ5F<P<3)>#!,
+MF\88$VR=P]1$BR-#2B%!F1XD4A_T*%--^&DA_-7'E_Q>2P6:`"`P>^\5U2,V
+M",P6V`7/"'&4Z#0&1!M\"$$I1<``5#<9(7`(041J;5XD0H+:'GQJ%G4T)Y[&
+M(@$)+`S6>8T\]2+CH,F0--OI<IKLKRZ='NW>:S:ZAWN#5K(XR5T<Q8Y=K>,@
+M@L)26X\'`A0*07R8,GZ9P1.D6<NZ``(A*`["3$P*!#T[8D`172_@Z\MP'$:G
+MDEE4URK,``0<0J(T.$92#E"9>%)95`HXD,W$ZW-S[U%S2H?(BP8`:S$@@C<R
+M[8`$`6:P2%AYV^EV\]'XI5>>_5O_W9_[FS_VPV@.EI>S:[=NGYCM)3H=[!V:
+M*-L?Y+>'KYUJGR8@!O``::N1<P!E2LB?V_[\"_<^>>[A<SN_-7`VBGM9,#`:
+M#[N0EJ$H)PF;-(DB]DY$#"D6Y8,/@M.":^J=6^/-WS!V/19AKD^<W_].DVD\
+M8^;<555P)C(JB8F(18PB9E9B%#`:%:0>BH`Q1B,%[X/UM<,8!3$R5:\3%$$G
+MFEBC,B1$0A1"4##5ZE"L*`AXQX$Q.%1:(9351!L#04:[</;$4]?OOAJ!;C:S
+MRE=IH^=LX-J_FVM3YKH@1`8,J`0`1+,#AX`FN+KL`!;G@P@$(%`U>3JPEYH&
+M*R)"ZKM^Y&^]Z;H<2[`=7P*UR1F2"#(AJ*F:-0004:`Q&,TI<81L8#KN)A`-
+M`@A4ESP`-;(;M%95E3/G[WGO$Y]]]M?_CW_YTZNK.DF3P'K]]M;>VJXOPNG5
+MLR)P=V/MTH/G$20"8T`+B""/8>\W7_GECW_ZWY?I]LQB[V#=-AKS.DWF>TM+
+M:B4.F1<5@+Q`8/#!<P#VQ'5&`$=(H.GH0YAY^L$A':E33AEZ?#Q^?>,%1^L#
+M]RT4`3&3=2Z$@%J14HP0ZFXE$6.]@O4FKE,BDB`2^&@/(3&0D&)4]8W'M5L&
+M"@(JJBTT!$'52E$,X(6=]<ZINCM%`"*$HH@0#*"\]-IS][;NG#IQR1;(/B%,
+M#9D0@#T#"',(=;.C_LLP72(68>"`GL$S,!^7`C7K#EB$H?X"!0`UB':JO?_&
+M;43W3T&.)$3E6"Y=I@\`<A0=09CK)MY1B3R="HB@$_1U#T^8!,EH5;E1G'K4
+MQ;O?_>36]I6?^G?/+2[/)>G2QGK^]&,?^HYO_7,7SC\\OS!_;^W6^N;=;J_C
+MP35--JKV7KKQV5_[W,=N[GWYU$.S]PYNS"^L3@Y<$K=48I:Z*\OFE+(9`[&`
+MXV!]Y;T/GCD`LP`BB]1'VU0&%VLC"IG^X_1MU6]4E%)$;_(E]VVU^[X@,#@?
+MF!GKA@X=$1,1IE:V1U\$I(B\=>(".T8&"$C36[/.I^N-SD>9$M!4[W?*=JPS
+MJ3JCU[HV=@,6(22BVGW&B2D.^_VGWO(,A-10(S@23\Y9K&GAP`Q<EZY0'_>_
+MWP5O_!D6#/#[]8V.)6:/2C9Z_4X$$"8&KO7^N.YGR-1@#'':AD/DNIZ8JB:A
+M(E#`P7L;@LV:YJ!_>.+D\H__/_[>XOP__?*+UQY]XIN_[[O_;V>6SWHI=P[6
+M8DH7YF<.^[L_]_&?@4H5>Q61DV0R?SY]RSM7&POIIU\+$+#12``K0,<B0!$'
+M!*I?JF/Q@8&9L<Y`'!X;#=?\*51:A(\H5_?%&"$D8N;7.]CW/2*JX^^/4$H(
+M`.(9!122FIKN8FV7&L(;DH<ZQ5:`E?48&,/])-/C4Y(4"0MPJ`LR8O1HJ/:!
+MJQ$'H@@\HB*>WN($$AP']$A$H,S2_*E>=[:_EV=F7F-<NL"N2*/4N:H6*S_J
+M=DY+!SXR&_J]=\7T0JB'`4?;2`A@:A7^QHN.X\KT_Q"F*%$01D&IL:5U_Y75
+M=---G\/ZW:$H$0!DJ+6O$5%&Q;`WFP#9$W,GU_;NW+RU^9%O_.X?_,'SL_/G
+MXZBYM39J-*.%[NK:^HU\.-K>O(<!C:1GSES\EF_]DW</KGSQ^J]38U3!6$2\
+M@S0SMBI%><\.T`10#"*U]UZMI"^*&9C9NE"O>*V/BXH``R`K,G5XFNKFUJAY
+M/C((_!J/4Q,Y/D*%`#@7Q(LP<@!40(18HP4`J,Z.CUKA*,#"R@,&E"F0=GHT
+ML4A@5DHA*$-U,X?1!496)@:``(A`/&UX(1,&KN_8*=+7<VT.A5DR.S^[TC^L
+M="J,]>D,`4(`GA85=9\>IJ^!CP@=OW<6*%.E&?A]](W>]#\.=4_UJ*-R5->@
+M')V)6`<L!`1!001&#(@H6/M(*P`4=`"^TVG$L51ET2_[XV%XXO%W@\1*M9UK
+M-(RY=G?K7_ZK_^_)L[W%,RV+U?+2_,VKUTXM]59.GE*F88/9'?3/-Q;61G<1
+MC"O%1%19B]I;J0`)T-1G**)H!@;%"%R#-NKXP<AUM\X%02<`B&Z:WAR%"JJ]
+MO[2JL:U?]16"%V$1>..C2*!:Q:?N7C(S$0D"*57_QKJ-6_\K]@%EFK4>CV#O
+MLY:O7ZXRM5LX<W"L4/DIGDZ"\!0?!>)%(!#0U&F#H68.T&Q[95R,YSISP6M7
+ML2*C#)1E282"H4YP`M#1+(AJ[/C7V@!X7RL+7L?T?=4V>F-,NN^_/#K;19CK
+M'$EJ-C"2*$`0KL^V&LQ<<R`4*(0Z("D4)6)(""DHL@C5*,^39B<O*(X79GIS
+MUOHD2;P%+28?P*7S)]+8_<-_^#_:LCKS5.>9]SYQYM1R%-'JRBE%W5[G_/5K
+M>Q=':;O5(33>2JP@H`4=/'A&"O6[K8__>NX8"!"!6:E:V!N8N:[PF04`''N<
+MJA@<R1;6$_LIMO]-#C614/-"I^S0.J*@KLG&-6(?&8(2058B&K0H!$"4@(@!
+M`%A0:CO-(^GP6I4>`)4^0J5-35<`(-Q73LI4Z91`&4&E&$1"$`8@/@[[08]'
+MQ7CL=4L+DW/!:*.-%E<QLC!/9](UMQ50&&IDYIM%DN/>/1Z?3,<;[O<9AL`;
+MTZ/CS<C"1_7;]"82`*R?K$E*==QF1-`*$$'79!-"$?`@(8G3[<U!I#-;@-:Q
+M0BB+4E$D#"@<1_#?_MA_\S?^YG_YLQ__B4]]Z==6EY9[W6ZJNZO+YP8#UYLY
+MC:KM`UA;(!KO0JP0T(MB#RX0*P*16J-*F(7Y:"&(V/MI=39-7:?)GE+F_G?]
+M^EU$.#7+?N-CG;L`0&ULBJA%!(4(%!**"`L!`R.C2$!@M@!`J*<U78W#48(0
+MIM!*F9XE]4M2:NJ$"0`$#%A+N>#Q*T8B1"2%H(0$E$!PGH.K<S3AVH,%1:*Y
+MF9.#PW&[U;506&MK_W$$$90@$F2J;3WE08'0UQCTW!\CX8CV<+R-IJ:?7QV3
+MIA<?N3S`D1'L$?AX^B52)]/U^P0\[M?AE'%NN*YWE2CTA(XA((B4@M@,/D$P
+M(0@0UP@,%H?`XGT2:871G_F>[WC?-SZUMGFSV<RTS`8?I7$[+\9)W-X_*+MI
+MK,#L[^QWSR\#"2-7OM`1H48)TYK^]6)<@H@@**CK5:#:;4*`ZW'A,4OX_CP7
+M^4UOS>.FTAOO5JQAV`2`1'+4MF41"8Z1.#)`1"+!.2<BJLZ!B`B/6C`B2*@4
+M,7M$)*6.5A+J3M[Q1F=F?YS+$WEOXR0F2+QUP;D:K:`$$70Q#I%N%+D%(40)
+MPD!3$_*Z3+O?(%H$`[SY6[XO^L!Q95HW4/Y@7>RC./15)_=TW8]R\```(@HA
+M3`]&1M#@8T0D#,P!E`/Q`(A>!4I(M$!$H`@X@$<P`H(B#.Q9*8B5=JF)>YVV
+M\TN1;C7B%0P1`)+A9BN;C,=ME\8ZWMD]*)=ZD4E,K,%`[D;&DM+US4#U\"G@
+MM"4-,+WO4:!.7K_VVR8XYJS^`2\A$L3IKZV+.)E6'(A'_SBE!B`B(8BB&E]9
+M9ZL,@@+,1YTJ1`2N@:9$M>_J4500"5,2DS`RU>T[D=I"$Z<(;J6D%D>K_P`S
+MUHE)'?.(@0!`D(11CK+>KVN*6*_.\3;Z73'I]>=?3]WK/L'T7CS*"NDH<[]_
+M;QVU\$A/B>B.L!2T(H+!*(F%8P*%B`I9N)X[*D%!Q1*`?"9$0#8VOI.U4!&X
+M7J]QVD^(L03LS\U%.]N[*V<6%-*MZS?:S;2UU`5G.79>\JS19>NGKQ1>IX!]
+MC4U#7STGDZE9\O'W?_#K=8.P.I7&:1.MYE=-G\>C!%X`%01@#BPB2`J@OC'E
+MZ&2L=QX0UMV2.MF^SQSH]4U.PBBO-X(`J3X9:@0<RU'?OGX](K7++PACC=<[
+M/M'EZ]]'?]`U^EH-*#X",!]_?S3UK$<H'*8O/[`$9L\@PLH'(ZP#(W.MTAV8
+MF9D"3QDVS":$F(,204-I,^TE:H:XA:P@E"BCA?GFUL8NL5F8FRN+O,@M8>Q#
+MJ%PQL@>@*\90;P*\G](Y;?V^\2[Y>L+-U[>-ZK4B)`5*:]1UN?)Z*214#ZMI
+M:N)$T\%9G3Q-?5I)1(DH80-@5+W(QW]K^F,T;29YX?M_H/Y0ZJO.@@)P``G,
+M@5D$A%$$IUQA"2*_?]/H3:^O.M3>)":)R)'T49V#T1%X9-HM"D>!I]Z;4T(2
+M($F=>82`#.A1!$4)*Q&%`)X!*0!X$:Y!ICCU*/8H2@$HB8"U#\J(UA"'T*A&
+MDIFX@#YBL3#7'!^.)Z-"$Q)!\`B4!('"EZ-\M\H6"1L("D`?N54R'^'`WN2S
+M_ZI07F^UKS,.O?$W<AV>$5$I!23&&*'[:I2ZBPZ(L08"QE!CYT0$N+XAZ^-F
+M"EMC@Q1IT%2'D:E-F(@'.')S`:C=[7P-CD4.=0#VT\\.I\.?HRU>/U47UO=5
+MY5_W&_\#]XV.HUW]SN_;7O<UN*>K\GH*Q8@`@;`$\"(`0A#,47N;B:P((WAD
+M02"$FN@B$@(P*TBHSFK8""<2E(;46S"IKI@CPME>KY5UU^]LS\_,GCRY&IF&
+MJP""V%!:GI!VX,/15L"I;"I\W0?_'^Z:WH5U:*DA.HI03Q7':GG1^D<"B-8:
+MZWZT"^QJ7+C4CN!`1ZYU"BE28`B40C]M1S%S"(&9ZZZF)J7J/,I[8:YM@E]_
+M.2@R70&ID4M<,V[E_D^0X:@)^?5>;[J-?H\\Z8WK-=W"TPP.CNJ7H[P?`2U#
+M!<`B69T2(0F"1?)!0FW7AC40&(7$`S$B,[(17UN(BE!P47"*V$3*L+,"'*NL
+MW9@]?^KR:U=>/?OADY<O70BAIZ.,4E)(I1L-Q_MMW9B^AF/U79`WUF'W?^YR
+M5,G7:_[FSW]=5]W3`:5($VI5:^_53:"ZP5:3;CTB*$%0M8X=!J10]^08B<`H
+M4=,CCPD%`U'--F+OO:^'=P*(R!@T$0H@,QXA->I[>KJ'A`$@"`(>8<N/V"]U
+M=:3>;(CQ?V8;_6&N-W1<[GNZSE&PKJA!D$%139<08!901,B,1`@H+&Q0"P0/
+M3"":R?M(1((C8(ABRNW`JR(%;FA]?G7A4Y_]Q2\^WS@<E(:@W8QFHME(="B*
+MOMUMS9VHZ<_'^X`DU$GE%$;]1Q.70HU<.C(6TTJ1(JHIK<B`2`(B2%![.8/W
+MGD@K177H`18-2$3L/"@"K8#0(SMA%@\!#.@I-J'.@;A.O5"8052M^PH"I-24
+MEP(UH;PF91[=\+_KV$+\VD?^'VP;O?D6_(/_RJ]JWL/]^MI(`"DB0*VJ#>Y(
+M24DA(X!BQ'K2QAR8"$$[:Q#`3>$G"5=!@RA0.HK'>;_1\IY''L89E(]=G/OF
+M#SY](''<B?+A1/,H;`%`:QSV%F9/L%BH\09,'&KJF4P;V(2UCOYQ%CP-#\?O
+MZ/BM?+4HS^]_L4S;TIX#.A21F!+2BKU3FA!)1-@Q,Z/2J("TX1J(@20&)7`E
+M`L!19@)(G0H#3.,U`%CVD=*H-#@O@34I+0H"$]#Q1$J`K)]^?WR&".(;SI.Z
+M_X'W]?A>+VG_,-OHC_*J-6NGB*X`1X`)$/!,1\@3!&$B$F$4!:`(D,D'8F)"
+M(28"D-)9*SERWIHQ^^6=9I*7=NT][WEXV[=V!V'C[KU[-S;RK6$8QP^=76R>
+MG`>)0.X[CY"1!:?_`Y;_K.79_>\8>4J"/$H<V0=1(58ZB`0;G/?>>P`PQF!$
+M0/7TL6YSRG&KH:R+)H0Z@`&B`@P@2BG&:>*EE,)IMYHHU'N?&&M(YYM\%G]T
+MG_,?\39Z_;!['4`S]2RN%ZWF=*%,4T4482>`=<>9B0,!U))!%+*9Z'!R9SC<
+M-NW)6KC::<.ZNQMXN1S9X?[`CJ&C5][]@6]^Z,PS4C2ES$1B`!!Q3`QB@9P`
+M""LY6M"CU_8U[L(_U+H?P_WHJ"8*(8BU1.2%O??6VA!"W?510*()CUI*>$1*
+MJ9G@]TUGI]I]"K%F;8.(4@H\2/",K&EZPWQ5RUWP:[8SY#_KC?3'M(VFM9LP
+M(M:&@$JIUR&[]1(P(Z*B4`MIX+3A!(&1B<5;6Y6?^>*SZ?S@Y&50K3R'/2ME
+M/CX4EY0#F\C,R?G'+I]ZE_$+.SOC3I8*4[V'A+V0KS%UQZG2?9/J_YQ9TO'L
+M:)K)!F;Q=48,1QZL2BD1X1`8`B+5X[PW_(8IUZDNTH6GO0,--7"<!024UN#!
+MB0O,M7,"'?,"\/7'/Y[KCWP;3=_8T6A81`(@(-.T7U!/41`!"8F$19Q`$*R]
+MNHA%(Z`(:4T8\R-///TO?OK_^1CTYD]YBWO=F1XXVKRQ4>R&5KSX@7=^9]5O
+M>&\6NBM%P<`^H!?Q@KZ>E3*^WLH%@+I__68O]P\?_X];4--JNT;H,K/WH$@I
+MI8FFK6T1SP$"D,CTEJIGVX(HXFT``#F:SBJE2($FY8)'`22MD41)(!)?UV/W
+MAR(^>G=_3)?ZKB//D#^BZPV@@^/V*Y"BHU[^?3^`((B!($#MNUZCN=$(4@`8
+MC(:=A4ZSF_[C?_Z_>?$JCK;6AH87MV];[>:_[Z/_5^WF>]G*<#]HU,R!I0I@
+M62H69%%!-(OV;Z@H[IM7PYL___5>-0#VJ^@D`J"U5C@%N4YCH-0+@:254JI>
+M'(T$`L'YLJS8>0X!?)``R&!0*:K1!$<(.,\<N+:>A^.E?1W#<:2.\T=__;%N
+M(SP".$--`H5CO[8CV#8P3LU:ZK*"!!3`].-O=6:*W,[-+UU^X-'MK5&KL?*6
+MAS]X[?E]&'>_Y</_Q6SCK`J][?7AV5/MPX."R#&402R#,.@@L814..(:[R7X
+M5<M[/)[X/WG&80W7/WI74YM5`*W44=]V^@>H'IYJU*8>9T`-V>?`WCIGO0)4
+MHFK7&1(D(`$49"(%(MXZ;P/(%$!2O_(WO">4W^-D^UJY$>(?YNW_,1UJO_OB
+MJ0;>&[I-H9XA`5#=F`30@AQ$")0VQ4@8&Y7S#Y[^P*G51RK><WGYQ,53YTX\
+MY(LT[R-8OS0_N[F1*\T"E8"O(=+"Q*R9(Q$`='^<;[/&$B&B]_[_W]X5+;EM
+MP\`%2*>3OF7Z_]_8AT[2Q!:P?0`HRY;E)A?ZI&2X+YE3Y+.H6X($L`"ER=%#
+M9.ET.!5:X@"'K+(5<\*]BE8M56IF,`B?2%Z*5CC=[/+UVW2VDQ91Y:+__2YX
+MKRUV*F;RW0(1%,N:B1*E/)D4JJXHH4I5`%[H<!BKJ!3]LZ">__YZTM.I_B7B
+MY5.=_CF)?:BL*.7+Y\_E9*1-?HE#K)UE\FHF=%@$0.\G7&0#U[-S*YK_?+QR
+M-Z5EKN%NT;3FNT8I8Z%!!*=2:3Q_N]C9_$)%@6%"'#6M`")_?;9SUM91:JV2
+M34Y_F$-OLSI;V,T:W2$S<5Y<J[A`+/6KF`@6%'&"19SBE?91]`]</@*1,E%Z
+MIJF=$TF'D^)2W*-0KH#BXM>UZUUV#`\ABWV8$B7%HZE1*B&]48T^%,M52@&G
+M*N%SUFZW0=SCY33:EF',F3@QS(U*U;T(BJBX7DYN$(-,V6:*`A2XE';<H:-8
+M'LP5DF)GI%B@Y`>GD"7KBS&U^N"K==F>QZ_U<99?:6=W,PI5-6*59H2E!7K\
+M<(\<R?=T[]?8S1K-`H'EC_04F$3:S8J@-6,]15L\>B@!@'1P#>I")2S61!(F
+M'G(^%(<8&!T2():U5:LGV>LE@'JY&(PNH8561LDJ6625"`?0-EM'PSO3Z/IJ
+MPD<3:85NZ<=1:-EZ-54Q0@CH$[U$%X!V?X3\+72I41^3YEX\UK@\;B'$XY;6
+MB,T'?,R>G[5#SRFY)H"&!IPB35N$=H;=];<M4N]RJY3'WG8H<(B]T4+E;5E4
+M'$WUPD<3$98HYM-VG&!^#M&T99ZC=$ITM&;$[E+#NA3UI9)U_NI]QQ[QQOG!
+MKJ-[4IYQ/(.T`XV6K^=6^Q;U7__"*:)AAVA"J4I$$F-2P=SP'"$"<Q!*C1[6
+M!A>*2X03XBNR9EQ9LS-?>XI;#O79#W'EHVV-/6-H+?8\TRGK=O+R;;2TF:(<
+MO;S%EWP%]K=&-YLD<8D@29;$%Y$"1'NZ>&4M8Y55%G$&MQNB\X:FF^;S#9K5
+MO=FF.+]Q[T%?<=,X6J[_;#TDQ>65N?JWX?5QH^^8Y>V5&2C(&19Q%FU;8F.J
+M3V^M^;64!XLDKP*PY3I&:=5YZILDZC.GO[]`H"VKMKK4QM_&<O]!N3-171[\
+MI["_-;J#QXF2R_3F`G>Z[U:CF!=N&/)HRKKXV[3&`\]Q.!HA'?G,_U\/G%C?
+M%QOS90?]NV[Z-_=RUVS!;XXCTBBP+-+%(ZDN;HW3YF;B2#NAWQ7'I1'62]C_
+M77G^OP.OPT%I].3/ORQ+?7+_]I6QMO7'X5S'A33Q!S[RABL#'7$X&CW$<Q*L
+M-0]/ME`#K\#A%K7'<::Y&SJVLE;/EZJQD+T6OX8U&C@X!HT&.F#0:*`#!HT&
+M.F#0:*`#!HT&.F#0:*`#!HT&.F#0:*`#!HT&.F#0:*`#!HT&.F#0:*`#!HT&
+M.F#0:*`#!HT&.F#0:*`#_@-[KTG4PJ-,"`````]T15AT2E!%1RU1=6%L:71Y
+M`#@U62`I7P```!%T15AT2E!%1RU#;VQO<G-P86-E`#*!#2$D````(71%6'1*
+M4$5'+5-A;7!L:6YG+69A8W1O<G,`,G@R+#%X,2PQ>#'E4=NX`````$E%3D2N
+#0F""
+`
+end
--- kdelibs-3.5.7.orig/debian/launchpad.png.uu
+++ kdelibs-3.5.7/debian/launchpad.png.uu
@@ -0,0 +1,19 @@
+begin 644 launchpad.png
+MB5!.1PT*&@H````-24A$4@```!`````0"`8````?\_]A````!F)+1T0`_P#_
+M`/^@O:>3````"7!(67,```L3```+$P$`FIP8````!W1)344'U0H%$#(2\:9)
+MY@```CQ)1$%4.,N5D]]+4V$<QC_OV=G.W-AR.ZZQ3#%+,;&@"[6P+H*BNE&B
+MJ,O`_H`HBH0@*,B\R(J"(.I"HB[R(HHN%+I+N\A@1771_(FDKC/GJC6W'7>V
+MTT6;M(F97WAX^<+[?'@>>%_!.B=PZ:6EMMS6>J!./1I9-/QB/>9]-P;W'F]4
+M>_=L\397J2X>OIV]*?^/T7.QGXXZWX63.]3N@'>#[+3;3"V>9C`T_VP5@$GS
+M]<']]:K2\%%+CVZO4':>VN7KJ?2Z)$EQF+JNB^&)Z+O)6'ID!<#7]5R<:'Q]
+MJ[T^<,9AE9C\OH13L5*ENG$Y'=FDKEOF8G'CZ:?Y<^'N=F,%P&.7C\B2:!J:
+M>G,YD5'B59[JGK9M#7:WTV'HF8P\N_`K]^1#I&OH_*%A@&6`.54#N43GB';-
+MU>P?"PFX`@@MN=&83C[0%5NM$IQ>H"^H71W^FN@M^&1SO,**H)5<H@DXW.(?
+M"P`J$`=<?D=$EE*G>12\F_25>1QN1<K-]W0L)Y80U`.[@1H@"LP!X;QB@.$K
+MB_8/C&8[J]TV*MW6AK\KRX#(7\ZLHA1P/YVEW,0DELJ&BP'"U#!%`;!4<F:`
+M'\#[EDW..Y\CZ=D7H9^W2Q/H)0F,/,#([]^V]-T+U'E3[H'Q>%NXNWVF&"!E
+M$V3ET@J%!!KP>#%CC[TZ>_#8G[;%(P#,&;=`MSI!J$!%7BH0%%NC7_[US&4`
+ML3ENFE,DR*H9A"@DB&"QA-;Z)T693!.8\,I(P@4D1>V"OA;@-X&[W^ASVHPX
+,`````$E%3D2N0F""
+`
+end